From 953253f093302ccee1cc634772a4561ffbe32355 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 22 Apr 2009 08:56:50 +0000 Subject: This patch unifies the socket_mPGA604_800Mhz and socket_mPGA604_533Mhz to a combined socket_mPGA604. No other sockets come with clock rates, and there is no difference in code, except for the number of microcode patches included in a build. Signed-off-by: Stefan Reinauer Acked-by: Carl-Daniel Hailfinger git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4169 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/intel/socket_mPGA604/Config.lb | 5 +++++ src/cpu/intel/socket_mPGA604/chip.h | 4 ++++ src/cpu/intel/socket_mPGA604/socket_mPGA604.c | 7 +++++++ src/cpu/intel/socket_mPGA604_533Mhz/Config.lb | 3 --- src/cpu/intel/socket_mPGA604_533Mhz/chip.h | 4 ---- src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c | 7 ------- src/cpu/intel/socket_mPGA604_800Mhz/Config.lb | 4 ---- src/cpu/intel/socket_mPGA604_800Mhz/chip.h | 4 ---- src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c | 7 ------- src/mainboard/dell/s1850/Config.lb | 4 ++-- src/mainboard/intel/jarrell/Config.lb | 4 ++-- src/mainboard/intel/xe7501devkit/Config.lb | 4 ++-- src/mainboard/supermicro/x6dai_g/Config.lb | 4 ++-- src/mainboard/supermicro/x6dhe_g/Config.lb | 4 ++-- src/mainboard/supermicro/x6dhe_g2/Config.lb | 4 ++-- src/mainboard/supermicro/x6dhr_ig/Config.lb | 4 ++-- src/mainboard/supermicro/x6dhr_ig2/Config.lb | 4 ++-- src/mainboard/tyan/s2735/Config.lb | 4 ++-- 18 files changed, 34 insertions(+), 47 deletions(-) create mode 100644 src/cpu/intel/socket_mPGA604/Config.lb create mode 100644 src/cpu/intel/socket_mPGA604/chip.h create mode 100644 src/cpu/intel/socket_mPGA604/socket_mPGA604.c delete mode 100644 src/cpu/intel/socket_mPGA604_533Mhz/Config.lb delete mode 100644 src/cpu/intel/socket_mPGA604_533Mhz/chip.h delete mode 100644 src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c delete mode 100644 src/cpu/intel/socket_mPGA604_800Mhz/Config.lb delete mode 100644 src/cpu/intel/socket_mPGA604_800Mhz/chip.h delete mode 100644 src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c (limited to 'src') diff --git a/src/cpu/intel/socket_mPGA604/Config.lb b/src/cpu/intel/socket_mPGA604/Config.lb new file mode 100644 index 0000000000..21276eb455 --- /dev/null +++ b/src/cpu/intel/socket_mPGA604/Config.lb @@ -0,0 +1,5 @@ +config chip.h +object socket_mPGA604.o +dir /cpu/intel/model_f2x +dir /cpu/intel/model_f3x +dir /cpu/intel/model_f4x diff --git a/src/cpu/intel/socket_mPGA604/chip.h b/src/cpu/intel/socket_mPGA604/chip.h new file mode 100644 index 0000000000..b181737c18 --- /dev/null +++ b/src/cpu/intel/socket_mPGA604/chip.h @@ -0,0 +1,4 @@ +extern struct chip_operations cpu_intel_socket_mPGA604_800Mhz_ops; + +struct cpu_intel_socket_mPGA604_800Mhz_config { +}; diff --git a/src/cpu/intel/socket_mPGA604/socket_mPGA604.c b/src/cpu/intel/socket_mPGA604/socket_mPGA604.c new file mode 100644 index 0000000000..1d0d4fb084 --- /dev/null +++ b/src/cpu/intel/socket_mPGA604/socket_mPGA604.c @@ -0,0 +1,7 @@ +#include +#include "chip.h" + + +struct chip_operations cpu_intel_socket_mPGA604_800Mhz_ops = { + CHIP_NAME("Socket mPGA604 CPU") +}; diff --git a/src/cpu/intel/socket_mPGA604_533Mhz/Config.lb b/src/cpu/intel/socket_mPGA604_533Mhz/Config.lb deleted file mode 100644 index 986e70b9a9..0000000000 --- a/src/cpu/intel/socket_mPGA604_533Mhz/Config.lb +++ /dev/null @@ -1,3 +0,0 @@ -config chip.h -object socket_mPGA604_533Mhz.o -dir /cpu/intel/model_f2x diff --git a/src/cpu/intel/socket_mPGA604_533Mhz/chip.h b/src/cpu/intel/socket_mPGA604_533Mhz/chip.h deleted file mode 100644 index bf5cbc70eb..0000000000 --- a/src/cpu/intel/socket_mPGA604_533Mhz/chip.h +++ /dev/null @@ -1,4 +0,0 @@ -extern struct chip_operations cpu_intel_socket_mPGA604_533Mhz_ops; - -struct cpu_intel_socket_mPGA604_533Mhz_config { -}; diff --git a/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c b/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c deleted file mode 100644 index 68f35b780f..0000000000 --- a/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include "chip.h" - - -struct chip_operations cpu_intel_socket_mPGA604_533Mhz_ops = { - CHIP_NAME("Socket mPGA604 533Mhz CPU") -}; diff --git a/src/cpu/intel/socket_mPGA604_800Mhz/Config.lb b/src/cpu/intel/socket_mPGA604_800Mhz/Config.lb deleted file mode 100644 index 2637c86594..0000000000 --- a/src/cpu/intel/socket_mPGA604_800Mhz/Config.lb +++ /dev/null @@ -1,4 +0,0 @@ -config chip.h -object socket_mPGA604_800Mhz.o -dir /cpu/intel/model_f3x -dir /cpu/intel/model_f4x diff --git a/src/cpu/intel/socket_mPGA604_800Mhz/chip.h b/src/cpu/intel/socket_mPGA604_800Mhz/chip.h deleted file mode 100644 index b181737c18..0000000000 --- a/src/cpu/intel/socket_mPGA604_800Mhz/chip.h +++ /dev/null @@ -1,4 +0,0 @@ -extern struct chip_operations cpu_intel_socket_mPGA604_800Mhz_ops; - -struct cpu_intel_socket_mPGA604_800Mhz_config { -}; diff --git a/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c b/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c deleted file mode 100644 index 505965e70e..0000000000 --- a/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include "chip.h" - - -struct chip_operations cpu_intel_socket_mPGA604_800Mhz_ops = { - CHIP_NAME("Socket mPGA604 800Mhz CPU") -}; diff --git a/src/mainboard/dell/s1850/Config.lb b/src/mainboard/dell/s1850/Config.lb index a1946858f9..936552227f 100644 --- a/src/mainboard/dell/s1850/Config.lb +++ b/src/mainboard/dell/s1850/Config.lb @@ -193,10 +193,10 @@ chip northbridge/intel/e7520 # mch device pci 06.0 on end end device apic_cluster 0 on - chip cpu/intel/socket_mPGA604_800Mhz # cpu 0 + chip cpu/intel/socket_mPGA604 # cpu 0 device apic 0 on end end - chip cpu/intel/socket_mPGA604_800Mhz # cpu 1 + chip cpu/intel/socket_mPGA604 # cpu 1 device apic 6 on end end end diff --git a/src/mainboard/intel/jarrell/Config.lb b/src/mainboard/intel/jarrell/Config.lb index 6e33f86267..07a5b39ad5 100644 --- a/src/mainboard/intel/jarrell/Config.lb +++ b/src/mainboard/intel/jarrell/Config.lb @@ -203,10 +203,10 @@ chip northbridge/intel/e7520 end end device apic_cluster 0 on - chip cpu/intel/socket_mPGA604_800Mhz # cpu 0 + chip cpu/intel/socket_mPGA604 # cpu 0 device apic 0 on end end - chip cpu/intel/socket_mPGA604_800Mhz # cpu 1 + chip cpu/intel/socket_mPGA604 # cpu 1 device apic 6 on end end end diff --git a/src/mainboard/intel/xe7501devkit/Config.lb b/src/mainboard/intel/xe7501devkit/Config.lb index 1a46ec9770..5f5c9b8078 100644 --- a/src/mainboard/intel/xe7501devkit/Config.lb +++ b/src/mainboard/intel/xe7501devkit/Config.lb @@ -212,10 +212,10 @@ chip northbridge/intel/e7501 end # SB end # PCI_DOMAIN device apic_cluster 0 on - chip cpu/intel/socket_mPGA604_533Mhz + chip cpu/intel/socket_mPGA604 device apic 0 on end end - chip cpu/intel/socket_mPGA604_533Mhz + chip cpu/intel/socket_mPGA604 device apic 6 on end end end diff --git a/src/mainboard/supermicro/x6dai_g/Config.lb b/src/mainboard/supermicro/x6dai_g/Config.lb index 82f990c75c..003e74b1e0 100644 --- a/src/mainboard/supermicro/x6dai_g/Config.lb +++ b/src/mainboard/supermicro/x6dai_g/Config.lb @@ -187,10 +187,10 @@ chip northbridge/intel/e7525 # mch device pci 08.0 on end end device apic_cluster 0 on - chip cpu/intel/socket_mPGA604_800Mhz # cpu0 + chip cpu/intel/socket_mPGA604 # cpu0 device apic 0 on end end - chip cpu/intel/socket_mPGA604_800Mhz # cpu1 + chip cpu/intel/socket_mPGA604 # cpu1 device apic 6 on end end end diff --git a/src/mainboard/supermicro/x6dhe_g/Config.lb b/src/mainboard/supermicro/x6dhe_g/Config.lb index 3176f51906..756ed4472b 100644 --- a/src/mainboard/supermicro/x6dhe_g/Config.lb +++ b/src/mainboard/supermicro/x6dhe_g/Config.lb @@ -210,10 +210,10 @@ chip northbridge/intel/e7520 # MCH end device apic_cluster 0 on - chip cpu/intel/socket_mPGA604_800Mhz # CPU 0 + chip cpu/intel/socket_mPGA604 # CPU 0 device apic 0 on end end - chip cpu/intel/socket_mPGA604_800Mhz # CPU 1 + chip cpu/intel/socket_mPGA604 # CPU 1 device apic 6 on end end end diff --git a/src/mainboard/supermicro/x6dhe_g2/Config.lb b/src/mainboard/supermicro/x6dhe_g2/Config.lb index 5c69af15ee..2b88e344a7 100644 --- a/src/mainboard/supermicro/x6dhe_g2/Config.lb +++ b/src/mainboard/supermicro/x6dhe_g2/Config.lb @@ -210,10 +210,10 @@ chip northbridge/intel/e7520 # MCH end device apic_cluster 0 on - chip cpu/intel/socket_mPGA604_800Mhz # CPU 0 + chip cpu/intel/socket_mPGA604 # CPU 0 device apic 0 on end end - chip cpu/intel/socket_mPGA604_800Mhz # CPU 1 + chip cpu/intel/socket_mPGA604 # CPU 1 device apic 6 on end end end diff --git a/src/mainboard/supermicro/x6dhr_ig/Config.lb b/src/mainboard/supermicro/x6dhr_ig/Config.lb index ce9c5385b9..5b83ab5ea4 100644 --- a/src/mainboard/supermicro/x6dhr_ig/Config.lb +++ b/src/mainboard/supermicro/x6dhr_ig/Config.lb @@ -206,10 +206,10 @@ chip northbridge/intel/e7520 # mch device pci 06.0 on end end device apic_cluster 0 on - chip cpu/intel/socket_mPGA604_800Mhz # cpu 0 + chip cpu/intel/socket_mPGA604 # cpu 0 device apic 0 on end end - chip cpu/intel/socket_mPGA604_800Mhz # cpu 1 + chip cpu/intel/socket_mPGA604 # cpu 1 device apic 6 on end end end diff --git a/src/mainboard/supermicro/x6dhr_ig2/Config.lb b/src/mainboard/supermicro/x6dhr_ig2/Config.lb index aa3d456bbb..61204b73df 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/Config.lb +++ b/src/mainboard/supermicro/x6dhr_ig2/Config.lb @@ -197,10 +197,10 @@ chip northbridge/intel/e7520 # mch device pci 06.0 on end end device apic_cluster 0 on - chip cpu/intel/socket_mPGA604_800Mhz # cpu 0 + chip cpu/intel/socket_mPGA604 # cpu 0 device apic 0 on end end - chip cpu/intel/socket_mPGA604_800Mhz # cpu 1 + chip cpu/intel/socket_mPGA604 # cpu 1 device apic 6 on end end end diff --git a/src/mainboard/tyan/s2735/Config.lb b/src/mainboard/tyan/s2735/Config.lb index 6ce8766065..88ba1db4a0 100644 --- a/src/mainboard/tyan/s2735/Config.lb +++ b/src/mainboard/tyan/s2735/Config.lb @@ -172,10 +172,10 @@ chip northbridge/intel/e7501 end # SB end # PCI_DOMAIN device apic_cluster 0 on - chip cpu/intel/socket_mPGA604_533Mhz + chip cpu/intel/socket_mPGA604 device apic 0 on end end - chip cpu/intel/socket_mPGA604_533Mhz + chip cpu/intel/socket_mPGA604 device apic 6 on end end end -- cgit v1.2.3