Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/618
-gerrit
commit 929b6ee50329b5850f4f0b9a1bc8010cc682f534 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Fri Feb 10 13:32:13 2012 +0200
Intel cpus: apply un-written naming rules
Kconfig directives to select chip drivers for compile literally match the chip directory names capitalized and underscored.
Note: CPU_INTEL_CORE2 was used on both model_6fx and model_1067x.
Change-Id: I8fa5ba71b14dcce79ab2a2c1c69b3bc36edbdea0 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/cpu/intel/Kconfig | 2 +- src/cpu/intel/Makefile.inc | 2 +- src/cpu/intel/bga956/Kconfig | 3 --- src/cpu/intel/bga956/Makefile.inc | 12 ------------ src/cpu/intel/bga956/bga956.c | 7 ------- src/cpu/intel/bga956/chip.h | 4 ---- src/cpu/intel/model_1067x/Kconfig | 2 +- src/cpu/intel/model_6ex/Kconfig | 2 +- src/cpu/intel/model_6fx/Kconfig | 2 +- src/cpu/intel/socket_BGA956/Kconfig | 3 +++ src/cpu/intel/socket_BGA956/Makefile.inc | 12 ++++++++++++ src/cpu/intel/socket_BGA956/chip.h | 4 ++++ src/cpu/intel/socket_BGA956/socket_BGA956.c | 6 ++++++ src/cpu/intel/socket_LGA771/Kconfig | 1 - src/cpu/intel/socket_mFCPGA478/Kconfig | 4 ++-- src/mainboard/intel/eagleheights/devicetree.cb | 2 +- 16 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig index 31c701c..81a834c 100644 --- a/src/cpu/intel/Kconfig +++ b/src/cpu/intel/Kconfig @@ -16,9 +16,9 @@ source src/cpu/intel/model_f3x/Kconfig source src/cpu/intel/model_f4x/Kconfig source src/cpu/intel/ep80579/Kconfig # Sockets/Slots -source src/cpu/intel/bga956/Kconfig source src/cpu/intel/slot_2/Kconfig source src/cpu/intel/slot_1/Kconfig +source src/cpu/intel/socket_BGA956/Kconfig source src/cpu/intel/socket_FC_PGA370/Kconfig source src/cpu/intel/socket_mFCBGA479/Kconfig source src/cpu/intel/socket_mFCPGA478/Kconfig diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc index 274c101..05f947d 100644 --- a/src/cpu/intel/Makefile.inc +++ b/src/cpu/intel/Makefile.inc @@ -4,7 +4,7 @@ # Therefore: ONLY include Makefile.inc from socket directories!
subdirs-$(CONFIG_CPU_INTEL_SOCKET_441) += socket_441 -subdirs-$(CONFIG_CPU_INTEL_SOCKET_BGA956) += bga956 +subdirs-$(CONFIG_CPU_INTEL_SOCKET_BGA956) += socket_BGA956 subdirs-$(CONFIG_CPU_INTEL_EP80579) += ep80579 subdirs-$(CONFIG_CPU_INTEL_SOCKET_FC_PGA370) += socket_FC_PGA370 subdirs-$(CONFIG_CPU_INTEL_SOCKET_MFCBGA479) += socket_mFCBGA479 diff --git a/src/cpu/intel/bga956/Kconfig b/src/cpu/intel/bga956/Kconfig deleted file mode 100644 index e70c48b..0000000 --- a/src/cpu/intel/bga956/Kconfig +++ /dev/null @@ -1,3 +0,0 @@ -config CPU_INTEL_SOCKET_BGA956 - bool - select CPU_INTEL_CORE2 diff --git a/src/cpu/intel/bga956/Makefile.inc b/src/cpu/intel/bga956/Makefile.inc deleted file mode 100644 index a0ace12..0000000 --- a/src/cpu/intel/bga956/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -ramstage-y += bga956.c -subdirs-y += ../model_1067x -subdirs-y += ../../x86/tsc -subdirs-y += ../../x86/mtrr -subdirs-y += ../../x86/lapic -subdirs-y += ../../x86/cache -subdirs-y += ../../x86/smm -subdirs-y += ../microcode -subdirs-y += ../hyperthreading - -# Use Intel Core (not Core 2) code for CAR init, any CPU might be used. -cpu_incs += $(src)/cpu/intel/model_6ex/cache_as_ram.inc diff --git a/src/cpu/intel/bga956/bga956.c b/src/cpu/intel/bga956/bga956.c deleted file mode 100644 index 3469215..0000000 --- a/src/cpu/intel/bga956/bga956.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <device/device.h> -#include "chip.h" - - -struct chip_operations cpu_intel_bga956_ops = { - CHIP_NAME("BGA956 CPU") -}; diff --git a/src/cpu/intel/bga956/chip.h b/src/cpu/intel/bga956/chip.h deleted file mode 100644 index 0f32d33..0000000 --- a/src/cpu/intel/bga956/chip.h +++ /dev/null @@ -1,4 +0,0 @@ -extern struct chip_operations cpu_intel_bga956_ops; - -struct cpu_intel_bga956_config { -}; diff --git a/src/cpu/intel/model_1067x/Kconfig b/src/cpu/intel/model_1067x/Kconfig index 4ddba39..b079922 100644 --- a/src/cpu/intel/model_1067x/Kconfig +++ b/src/cpu/intel/model_1067x/Kconfig @@ -1,4 +1,4 @@ -config CPU_INTEL_CORE2 +config CPU_INTEL_MODEL_1067X bool select SMP select SSE2 diff --git a/src/cpu/intel/model_6ex/Kconfig b/src/cpu/intel/model_6ex/Kconfig index 89005b8..31d24bd 100644 --- a/src/cpu/intel/model_6ex/Kconfig +++ b/src/cpu/intel/model_6ex/Kconfig @@ -1,4 +1,4 @@ -config CPU_INTEL_CORE +config CPU_INTEL_MODEL_6EX bool select SMP select SSE2 diff --git a/src/cpu/intel/model_6fx/Kconfig b/src/cpu/intel/model_6fx/Kconfig index 2551057..851685c 100644 --- a/src/cpu/intel/model_6fx/Kconfig +++ b/src/cpu/intel/model_6fx/Kconfig @@ -1,4 +1,4 @@ -config CPU_INTEL_CORE2 +config CPU_INTEL_MODEL_6FX bool select SMP select SSE2 diff --git a/src/cpu/intel/socket_BGA956/Kconfig b/src/cpu/intel/socket_BGA956/Kconfig new file mode 100644 index 0000000..a764348 --- /dev/null +++ b/src/cpu/intel/socket_BGA956/Kconfig @@ -0,0 +1,3 @@ +config CPU_INTEL_SOCKET_BGA956 + bool + select CPU_INTEL_MODEL_1067X diff --git a/src/cpu/intel/socket_BGA956/Makefile.inc b/src/cpu/intel/socket_BGA956/Makefile.inc new file mode 100644 index 0000000..a290e69 --- /dev/null +++ b/src/cpu/intel/socket_BGA956/Makefile.inc @@ -0,0 +1,12 @@ +ramstage-y += socket_BGA956.c +subdirs-y += ../model_1067x +subdirs-y += ../../x86/tsc +subdirs-y += ../../x86/mtrr +subdirs-y += ../../x86/lapic +subdirs-y += ../../x86/cache +subdirs-y += ../../x86/smm +subdirs-y += ../microcode +subdirs-y += ../hyperthreading + +# Use Intel Core (not Core 2) code for CAR init, any CPU might be used. +cpu_incs += $(src)/cpu/intel/model_6ex/cache_as_ram.inc diff --git a/src/cpu/intel/socket_BGA956/chip.h b/src/cpu/intel/socket_BGA956/chip.h new file mode 100644 index 0000000..68ec1d2 --- /dev/null +++ b/src/cpu/intel/socket_BGA956/chip.h @@ -0,0 +1,4 @@ +extern struct chip_operations cpu_intel_socket_BGA956_ops; + +struct cpu_intel_socket_BGA956_config { +}; diff --git a/src/cpu/intel/socket_BGA956/socket_BGA956.c b/src/cpu/intel/socket_BGA956/socket_BGA956.c new file mode 100644 index 0000000..53667c1 --- /dev/null +++ b/src/cpu/intel/socket_BGA956/socket_BGA956.c @@ -0,0 +1,6 @@ +#include <device/device.h> +#include "chip.h" + +struct chip_operations cpu_intel_socket_BGA956_ops = { + CHIP_NAME("Socket BGA956 CPU") +}; diff --git a/src/cpu/intel/socket_LGA771/Kconfig b/src/cpu/intel/socket_LGA771/Kconfig index 0821c3e..62bd17b 100644 --- a/src/cpu/intel/socket_LGA771/Kconfig +++ b/src/cpu/intel/socket_LGA771/Kconfig @@ -1,7 +1,6 @@ config CPU_INTEL_SOCKET_LGA771 bool select CPU_INTEL_MODEL_6FX - select CPU_INTEL_CORE2 select SSE2 select MMX select AP_IN_SIPI_WAIT diff --git a/src/cpu/intel/socket_mFCPGA478/Kconfig b/src/cpu/intel/socket_mFCPGA478/Kconfig index 3f39303..2d241cf 100644 --- a/src/cpu/intel/socket_mFCPGA478/Kconfig +++ b/src/cpu/intel/socket_mFCPGA478/Kconfig @@ -5,8 +5,8 @@ if CPU_INTEL_SOCKET_MFCPGA478
config SOCKET_SPECIFIC_OPTIONS # dummy def_bool y - select CPU_INTEL_CORE - select CPU_INTEL_CORE2 + select CPU_INTEL_MODEL_6EX + select CPU_INTEL_MODEL_6FX select MMX select SSE select CACHE_AS_RAM diff --git a/src/mainboard/intel/eagleheights/devicetree.cb b/src/mainboard/intel/eagleheights/devicetree.cb index e628dda..9971264 100644 --- a/src/mainboard/intel/eagleheights/devicetree.cb +++ b/src/mainboard/intel/eagleheights/devicetree.cb @@ -65,7 +65,7 @@ chip northbridge/intel/i3100 end end device lapic_cluster 0 on - chip cpu/intel/bga956 + chip cpu/intel/socket_BGA956 device lapic 0 on end end end