diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-11-22 23:40:29 +0100 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-11-23 17:16:45 +0100 |
| commit | 991f18475c951dcd728eb8550b10dd62938b1770 (patch) | |
| tree | 0b379c255f583f6a389dbffc5adbd935fc84fb43 /src/cpu | |
| parent | baa1acde7bb46a06e34404796aeaa1d5c7c6ec47 (diff) | |
cpu/amd: de-duplicate MSR include files
Change-Id: I8e01a4ab68b463efe02c27f589e0b4b719532eb5
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/12510
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/amd/dualcore/amd_sibling.c | 2 | ||||
| -rw-r--r-- | src/cpu/amd/dualcore/dualcore_id.c | 2 | ||||
| -rw-r--r-- | src/cpu/amd/family_10h-family_15h/model_10xxx_init.c | 2 | ||||
| -rw-r--r-- | src/cpu/amd/family_10h-family_15h/monotonic_timer.c | 2 | ||||
| -rw-r--r-- | src/cpu/amd/model_fxx/model_fxx_init.c | 2 | ||||
| -rw-r--r-- | src/cpu/amd/quadcore/amd_sibling.c | 2 | ||||
| -rw-r--r-- | src/cpu/amd/quadcore/quadcore_id.c | 2 | ||||
| -rw-r--r-- | src/cpu/amd/smm/smm_init.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/cpu/amd/dualcore/amd_sibling.c b/src/cpu/amd/dualcore/amd_sibling.c index d9942de410..e1d4d2e0e2 100644 --- a/src/cpu/amd/dualcore/amd_sibling.c +++ b/src/cpu/amd/dualcore/amd_sibling.c @@ -9,7 +9,7 @@ #include <pc80/mc146818rtc.h> #include <smp/spinlock.h> #include <cpu/x86/mtrr.h> -#include <cpu/amd/model_fxx_msr.h> +#include <cpu/amd/msr.h> #include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/cpu/amd/dualcore/dualcore_id.c b/src/cpu/amd/dualcore/dualcore_id.c index ba92396731..4fcedae0b1 100644 --- a/src/cpu/amd/dualcore/dualcore_id.c +++ b/src/cpu/amd/dualcore/dualcore_id.c @@ -3,7 +3,7 @@ #include <arch/cpu.h> #include <cpu/amd/multicore.h> #ifdef __PRE_RAM__ -#include <cpu/amd/model_fxx_msr.h> +#include <cpu/amd/msr.h> #endif //called by bus_cpu_scan too diff --git a/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c b/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c index fe9fb9cd0c..153fb10fff 100644 --- a/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c +++ b/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c @@ -31,7 +31,7 @@ #include <cpu/x86/cache.h> #include <cpu/x86/mtrr.h> #include <cpu/amd/multicore.h> -#include <cpu/amd/model_10xxx_msr.h> +#include <cpu/amd/msr.h> #define MCI_STATUS 0x401 diff --git a/src/cpu/amd/family_10h-family_15h/monotonic_timer.c b/src/cpu/amd/family_10h-family_15h/monotonic_timer.c index 53b4c30145..6bf046dedc 100644 --- a/src/cpu/amd/family_10h-family_15h/monotonic_timer.c +++ b/src/cpu/amd/family_10h-family_15h/monotonic_timer.c @@ -21,7 +21,7 @@ #include <device/pci_ids.h> #include <northbridge/amd/amdht/AsPsDefs.h> -#include <cpu/amd/model_10xxx_msr.h> +#include <cpu/amd/msr.h> static struct monotonic_counter { int initialized; diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c index 93fa07f961..1ef195d05c 100644 --- a/src/cpu/amd/model_fxx/model_fxx_init.c +++ b/src/cpu/amd/model_fxx/model_fxx_init.c @@ -26,7 +26,7 @@ #include <cpu/x86/mtrr.h> #include <cpu/x86/smm.h> #include <cpu/amd/multicore.h> -#include <cpu/amd/model_fxx_msr.h> +#include <cpu/amd/msr.h> #if CONFIG_WAIT_BEFORE_CPUS_INIT void cpus_ready_for_init(void) diff --git a/src/cpu/amd/quadcore/amd_sibling.c b/src/cpu/amd/quadcore/amd_sibling.c index dc3cdbba21..397a3ddb96 100644 --- a/src/cpu/amd/quadcore/amd_sibling.c +++ b/src/cpu/amd/quadcore/amd_sibling.c @@ -22,7 +22,7 @@ #include <pc80/mc146818rtc.h> #include <smp/spinlock.h> #include <cpu/x86/mtrr.h> -#include <cpu/amd/model_10xxx_msr.h> +#include <cpu/amd/msr.h> #include <cpu/amd/model_10xxx_rev.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/cpu/amd/quadcore/quadcore_id.c b/src/cpu/amd/quadcore/quadcore_id.c index 99e6d68be4..b89aac7e65 100644 --- a/src/cpu/amd/quadcore/quadcore_id.c +++ b/src/cpu/amd/quadcore/quadcore_id.c @@ -18,7 +18,7 @@ #include <arch/cpu.h> #include <cpu/amd/multicore.h> #ifdef __PRE_RAM__ -#include <cpu/amd/model_10xxx_msr.h> +#include <cpu/amd/msr.h> #endif //called by bus_cpu_scan too diff --git a/src/cpu/amd/smm/smm_init.c b/src/cpu/amd/smm/smm_init.c index fa81941cf9..c87b70109f 100644 --- a/src/cpu/amd/smm/smm_init.c +++ b/src/cpu/amd/smm/smm_init.c @@ -21,7 +21,7 @@ #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <cpu/amd/mtrr.h> -#include <cpu/amd/model_fxx_msr.h> +#include <cpu/amd/msr.h> #include <cpu/x86/cache.h> #include <cpu/x86/smm.h> #include <string.h> |