From b30d7ed8f09d4d5d75bf68f3ba74674fe65c4b4f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Oct 2015 14:24:06 -0500 Subject: [PATCH] cpu/amd: Move model_10xxx to family_10h-family_15h Change-Id: I34501d3fc68b71db7781dad11d5b883868932a60 Signed-off-by: Timothy Pearson Reviewed-on: http://review.coreboot.org/11965 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/cpu/amd/Kconfig | 2 +- src/cpu/amd/{model_10xxx => family_10h-family_15h}/Kconfig | 0 src/cpu/amd/{model_10xxx => family_10h-family_15h}/Makefile.inc | 0 src/cpu/amd/{model_10xxx => family_10h-family_15h}/defaults.h | 0 src/cpu/amd/{model_10xxx => family_10h-family_15h}/fidvid.c | 0 src/cpu/amd/{model_10xxx => family_10h-family_15h}/init_cpus.c | 0 .../{model_10xxx => family_10h-family_15h}/model_10xxx_init.c | 0 .../{model_10xxx => family_10h-family_15h}/monotonic_timer.c | 0 .../amd/{model_10xxx => family_10h-family_15h}/powernow_acpi.c | 0 .../amd/{model_10xxx => family_10h-family_15h}/processor_name.c | 0 src/cpu/amd/{model_10xxx => family_10h-family_15h}/ram_calc.c | 0 src/cpu/amd/{model_10xxx => family_10h-family_15h}/ram_calc.h | 0 .../{model_10xxx => family_10h-family_15h}/update_microcode.c | 0 src/cpu/amd/socket_AM2r2/Makefile.inc | 2 +- src/cpu/amd/socket_AM3/Makefile.inc | 2 +- src/cpu/amd/socket_ASB2/Makefile.inc | 2 +- src/cpu/amd/socket_C32/Makefile.inc | 2 +- src/cpu/amd/socket_F_1207/Makefile.inc | 2 +- src/cpu/amd/socket_G34/Makefile.inc | 2 +- src/mainboard/advansus/a785e-i/romstage.c | 2 +- src/mainboard/amd/bimini_fam10/romstage.c | 2 +- src/mainboard/amd/mahogany_fam10/romstage.c | 2 +- src/mainboard/amd/serengeti_cheetah_fam10/romstage.c | 2 +- src/mainboard/amd/tilapia_fam10/romstage.c | 2 +- src/mainboard/asus/kfsn4-dre/romstage.c | 2 +- src/mainboard/asus/kgpe-d16/romstage.c | 2 +- src/mainboard/asus/m4a78-em/romstage.c | 2 +- src/mainboard/asus/m4a785-m/romstage.c | 2 +- src/mainboard/asus/m5a88-v/romstage.c | 2 +- src/mainboard/avalue/eax-785e/romstage.c | 2 +- src/mainboard/gigabyte/ma785gm/romstage.c | 2 +- src/mainboard/gigabyte/ma785gmt/romstage.c | 2 +- src/mainboard/gigabyte/ma78gm/romstage.c | 2 +- src/mainboard/hp/dl165_g6_fam10/romstage.c | 2 +- src/mainboard/iei/kino-780am2-fam10/romstage.c | 2 +- src/mainboard/jetway/pa78vm5/romstage.c | 2 +- src/mainboard/msi/ms9652_fam10/romstage.c | 2 +- src/mainboard/supermicro/h8dmr_fam10/romstage.c | 2 +- src/mainboard/supermicro/h8qme_fam10/romstage.c | 2 +- src/mainboard/supermicro/h8scm_fam10/romstage.c | 2 +- src/mainboard/tyan/s2912_fam10/romstage.c | 2 +- src/northbridge/amd/amdfam10/northbridge.c | 2 +- 42 files changed, 30 insertions(+), 30 deletions(-) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/Kconfig (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/Makefile.inc (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/defaults.h (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/fidvid.c (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/init_cpus.c (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/model_10xxx_init.c (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/monotonic_timer.c (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/powernow_acpi.c (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/processor_name.c (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/ram_calc.c (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/ram_calc.h (100%) rename src/cpu/amd/{model_10xxx => family_10h-family_15h}/update_microcode.c (100%) diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig index 3a02043848..8abc98432e 100644 --- a/src/cpu/amd/Kconfig +++ b/src/cpu/amd/Kconfig @@ -12,7 +12,7 @@ source src/cpu/amd/socket_F_1207/Kconfig source src/cpu/amd/socket_S1G1/Kconfig source src/cpu/amd/model_fxx/Kconfig -source src/cpu/amd/model_10xxx/Kconfig +source src/cpu/amd/family_10h-family_15h/Kconfig source src/cpu/amd/geode_gx2/Kconfig source src/cpu/amd/geode_lx/Kconfig diff --git a/src/cpu/amd/model_10xxx/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig similarity index 100% rename from src/cpu/amd/model_10xxx/Kconfig rename to src/cpu/amd/family_10h-family_15h/Kconfig diff --git a/src/cpu/amd/model_10xxx/Makefile.inc b/src/cpu/amd/family_10h-family_15h/Makefile.inc similarity index 100% rename from src/cpu/amd/model_10xxx/Makefile.inc rename to src/cpu/amd/family_10h-family_15h/Makefile.inc diff --git a/src/cpu/amd/model_10xxx/defaults.h b/src/cpu/amd/family_10h-family_15h/defaults.h similarity index 100% rename from src/cpu/amd/model_10xxx/defaults.h rename to src/cpu/amd/family_10h-family_15h/defaults.h diff --git a/src/cpu/amd/model_10xxx/fidvid.c b/src/cpu/amd/family_10h-family_15h/fidvid.c similarity index 100% rename from src/cpu/amd/model_10xxx/fidvid.c rename to src/cpu/amd/family_10h-family_15h/fidvid.c diff --git a/src/cpu/amd/model_10xxx/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c similarity index 100% rename from src/cpu/amd/model_10xxx/init_cpus.c rename to src/cpu/amd/family_10h-family_15h/init_cpus.c diff --git a/src/cpu/amd/model_10xxx/model_10xxx_init.c b/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c similarity index 100% rename from src/cpu/amd/model_10xxx/model_10xxx_init.c rename to src/cpu/amd/family_10h-family_15h/model_10xxx_init.c diff --git a/src/cpu/amd/model_10xxx/monotonic_timer.c b/src/cpu/amd/family_10h-family_15h/monotonic_timer.c similarity index 100% rename from src/cpu/amd/model_10xxx/monotonic_timer.c rename to src/cpu/amd/family_10h-family_15h/monotonic_timer.c diff --git a/src/cpu/amd/model_10xxx/powernow_acpi.c b/src/cpu/amd/family_10h-family_15h/powernow_acpi.c similarity index 100% rename from src/cpu/amd/model_10xxx/powernow_acpi.c rename to src/cpu/amd/family_10h-family_15h/powernow_acpi.c diff --git a/src/cpu/amd/model_10xxx/processor_name.c b/src/cpu/amd/family_10h-family_15h/processor_name.c similarity index 100% rename from src/cpu/amd/model_10xxx/processor_name.c rename to src/cpu/amd/family_10h-family_15h/processor_name.c diff --git a/src/cpu/amd/model_10xxx/ram_calc.c b/src/cpu/amd/family_10h-family_15h/ram_calc.c similarity index 100% rename from src/cpu/amd/model_10xxx/ram_calc.c rename to src/cpu/amd/family_10h-family_15h/ram_calc.c diff --git a/src/cpu/amd/model_10xxx/ram_calc.h b/src/cpu/amd/family_10h-family_15h/ram_calc.h similarity index 100% rename from src/cpu/amd/model_10xxx/ram_calc.h rename to src/cpu/amd/family_10h-family_15h/ram_calc.h diff --git a/src/cpu/amd/model_10xxx/update_microcode.c b/src/cpu/amd/family_10h-family_15h/update_microcode.c similarity index 100% rename from src/cpu/amd/model_10xxx/update_microcode.c rename to src/cpu/amd/family_10h-family_15h/update_microcode.c diff --git a/src/cpu/amd/socket_AM2r2/Makefile.inc b/src/cpu/amd/socket_AM2r2/Makefile.inc index 3675af4b32..6917441967 100644 --- a/src/cpu/amd/socket_AM2r2/Makefile.inc +++ b/src/cpu/amd/socket_AM2r2/Makefile.inc @@ -1,4 +1,4 @@ -subdirs-y += ../model_10xxx +subdirs-y += ../family_10h-family_15h subdirs-y += ../quadcore subdirs-y += ../mtrr subdirs-y += ../microcode diff --git a/src/cpu/amd/socket_AM3/Makefile.inc b/src/cpu/amd/socket_AM3/Makefile.inc index 3675af4b32..6917441967 100644 --- a/src/cpu/amd/socket_AM3/Makefile.inc +++ b/src/cpu/amd/socket_AM3/Makefile.inc @@ -1,4 +1,4 @@ -subdirs-y += ../model_10xxx +subdirs-y += ../family_10h-family_15h subdirs-y += ../quadcore subdirs-y += ../mtrr subdirs-y += ../microcode diff --git a/src/cpu/amd/socket_ASB2/Makefile.inc b/src/cpu/amd/socket_ASB2/Makefile.inc index 3675af4b32..6917441967 100644 --- a/src/cpu/amd/socket_ASB2/Makefile.inc +++ b/src/cpu/amd/socket_ASB2/Makefile.inc @@ -1,4 +1,4 @@ -subdirs-y += ../model_10xxx +subdirs-y += ../family_10h-family_15h subdirs-y += ../quadcore subdirs-y += ../mtrr subdirs-y += ../microcode diff --git a/src/cpu/amd/socket_C32/Makefile.inc b/src/cpu/amd/socket_C32/Makefile.inc index 3675af4b32..6917441967 100644 --- a/src/cpu/amd/socket_C32/Makefile.inc +++ b/src/cpu/amd/socket_C32/Makefile.inc @@ -1,4 +1,4 @@ -subdirs-y += ../model_10xxx +subdirs-y += ../family_10h-family_15h subdirs-y += ../quadcore subdirs-y += ../mtrr subdirs-y += ../microcode diff --git a/src/cpu/amd/socket_F_1207/Makefile.inc b/src/cpu/amd/socket_F_1207/Makefile.inc index b74862e3e5..ece8d9ae98 100644 --- a/src/cpu/amd/socket_F_1207/Makefile.inc +++ b/src/cpu/amd/socket_F_1207/Makefile.inc @@ -1,4 +1,4 @@ -subdirs-y += ../model_10xxx +subdirs-y += ../family_10h-family_15h subdirs-y += ../quadcore subdirs-y += ../mtrr subdirs-y += ../microcode diff --git a/src/cpu/amd/socket_G34/Makefile.inc b/src/cpu/amd/socket_G34/Makefile.inc index a8e1333d9b..de33cd32d4 100644 --- a/src/cpu/amd/socket_G34/Makefile.inc +++ b/src/cpu/amd/socket_G34/Makefile.inc @@ -1,5 +1,5 @@ ramstage-y += socket_G34.c -subdirs-y += ../model_10xxx +subdirs-y += ../family_10h-family_15h subdirs-y += ../quadcore subdirs-y += ../mtrr subdirs-y += ../microcode diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c index f828f0fef1..3509befb86 100644 --- a/src/mainboard/advansus/a785e-i/romstage.c +++ b/src/mainboard/advansus/a785e-i/romstage.c @@ -64,7 +64,7 @@ static int spd_read_byte(u32 device, u32 address) #include "resourcemap.c" #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include "spd.h" #include diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c index c39e7aa763..3649e84f91 100644 --- a/src/mainboard/amd/bimini_fam10/romstage.c +++ b/src/mainboard/amd/bimini_fam10/romstage.c @@ -61,7 +61,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c index 2e937b6f1e..e9f240c2e4 100644 --- a/src/mainboard/amd/mahogany_fam10/romstage.c +++ b/src/mainboard/amd/mahogany_fam10/romstage.c @@ -64,7 +64,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c index 87d7dbf6c0..6bd548bf49 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c @@ -83,7 +83,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" static const u8 spd_addr[] = { diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c index d9404942ca..d49ed577a9 100644 --- a/src/mainboard/amd/tilapia_fam10/romstage.c +++ b/src/mainboard/amd/tilapia_fam10/romstage.c @@ -63,7 +63,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c index c129ac7b16..3abf27def6 100644 --- a/src/mainboard/asus/kfsn4-dre/romstage.c +++ b/src/mainboard/asus/kfsn4-dre/romstage.c @@ -70,7 +70,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "southbridge/nvidia/ck804/early_setup_car.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #define GPIO3_DEV PNP_DEV(0x2e, W83627THG_GPIO3) diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c index e5092684b1..8020b5ea6a 100644 --- a/src/mainboard/asus/kgpe-d16/romstage.c +++ b/src/mainboard/asus/kgpe-d16/romstage.c @@ -62,7 +62,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" /* diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c index b8bdaa96c1..d2d098b889 100644 --- a/src/mainboard/asus/m4a78-em/romstage.c +++ b/src/mainboard/asus/m4a78-em/romstage.c @@ -64,7 +64,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c index 602ac838e8..bfed77e5cd 100644 --- a/src/mainboard/asus/m4a785-m/romstage.c +++ b/src/mainboard/asus/m4a785-m/romstage.c @@ -64,7 +64,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c index 67bde0b878..91e2dead07 100644 --- a/src/mainboard/asus/m5a88-v/romstage.c +++ b/src/mainboard/asus/m5a88-v/romstage.c @@ -62,7 +62,7 @@ static int spd_read_byte(u32 device, u32 address) #include "resourcemap.c" #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include "spd.h" #include diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c index 9f5224b6e9..d4e398074e 100644 --- a/src/mainboard/avalue/eax-785e/romstage.c +++ b/src/mainboard/avalue/eax-785e/romstage.c @@ -65,7 +65,7 @@ static int spd_read_byte(u32 device, u32 address) #include "resourcemap.c" #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include "spd.h" #include diff --git a/src/mainboard/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c index 420cc6e3b0..0166fb39d4 100644 --- a/src/mainboard/gigabyte/ma785gm/romstage.c +++ b/src/mainboard/gigabyte/ma785gm/romstage.c @@ -60,7 +60,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c index 062d1ce471..4b8c6ca221 100644 --- a/src/mainboard/gigabyte/ma785gmt/romstage.c +++ b/src/mainboard/gigabyte/ma785gmt/romstage.c @@ -60,7 +60,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c index 3738b5a8d2..69f6d3aeb2 100644 --- a/src/mainboard/gigabyte/ma78gm/romstage.c +++ b/src/mainboard/gigabyte/ma78gm/romstage.c @@ -64,7 +64,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c index 850db82a09..e93301cafe 100644 --- a/src/mainboard/hp/dl165_g6_fam10/romstage.c +++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c @@ -74,7 +74,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" static const u8 spd_addr[] = { diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c index cdba3ae7b0..417452f1a2 100644 --- a/src/mainboard/iei/kino-780am2-fam10/romstage.c +++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c @@ -63,7 +63,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c index 6524d68f0a..c3a1839352 100644 --- a/src/mainboard/jetway/pa78vm5/romstage.c +++ b/src/mainboard/jetway/pa78vm5/romstage.c @@ -68,7 +68,7 @@ static int spd_read_byte(u32 device, u32 address) #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c index 31edab3f92..de90d86908 100644 --- a/src/mainboard/msi/ms9652_fam10/romstage.c +++ b/src/mainboard/msi/ms9652_fam10/romstage.c @@ -70,7 +70,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "southbridge/nvidia/mcp55/early_setup_car.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" static void sio_setup(void) diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c index 43e1d34589..9e32e53542 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c +++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c @@ -62,7 +62,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "southbridge/nvidia/mcp55/early_setup_car.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" static void sio_setup(void) diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c index ac6c3103cb..f369b33b50 100644 --- a/src/mainboard/supermicro/h8qme_fam10/romstage.c +++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c @@ -69,7 +69,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "southbridge/nvidia/mcp55/early_setup_car.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" static void sio_setup(void) diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c index 8d7711cc3c..ff40e69250 100644 --- a/src/mainboard/supermicro/h8scm_fam10/romstage.c +++ b/src/mainboard/supermicro/h8scm_fam10/romstage.c @@ -61,7 +61,7 @@ static int spd_read_byte(u32 device, u32 address) #include "resourcemap.c" #include "cpu/amd/quadcore/quadcore.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" #include diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c index 9f652085fd..9bb09ac7aa 100644 --- a/src/mainboard/tyan/s2912_fam10/romstage.c +++ b/src/mainboard/tyan/s2912_fam10/romstage.c @@ -70,7 +70,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "southbridge/nvidia/mcp55/early_setup_car.c" #include -#include "cpu/amd/model_10xxx/init_cpus.c" +#include "cpu/amd/family_10h-family_15h/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" static void sio_setup(void) diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index 2e7fc3a990..a5f4140bbb 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #if CONFIG_LOGICAL_CPUS #include