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>
Reviewed-on: http://review.coreboot.org/618
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig
index 31c701cfe2bc64baae1560335c66d3fc4db27ac3..81a834c5d5c7e17ce158eb1905daef0021eb96de 100644 (file)
--- 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 274c101fa4592b678767d2d484cb3961e609ba08..05f947dffbd850f88fea79f2654aded1b604d1b4 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 4ddba39c80da9956b9cbcf413fea470f76d7005b..b079922275b686e9b650dde2ffa534ddc1a29b4b 100644 (file)
--- 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 89005b818d77c7f7bd2dd165b1cf5d85ae8b01b1..31d24bd68fcff9889e5c244859a735a2ddc4f703 100644 (file)
--- 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 2551057e7b32325b82bfcd20f7c891412f9cc881..851685cb06c7b4ecf07d601076ba1cee6c7418b0 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 0821c3e2461da64b44e6d7f12c95da0166592e2e..62bd17b1fe7792ab621bd6a869fff0bf59abc4bf 100644 (file)
--- 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 3f39303065feea8ce7d63fbd8318d8b27ac47ff2..2d241cfac4c492d68dec79ba823d237172dd9008 100644 (file)
--- 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 e628ddab7b827979e96497d49008b7f75e5bc3d6..99712641691e0fdc4a71979d6dcf582fb16c70e9 100644 (file)
--- 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