summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2009-04-22 08:56:50 +0000
committerStefan Reinauer <stepan@openbios.org>2009-04-22 08:56:50 +0000
commit953253f093302ccee1cc634772a4561ffbe32355 (patch)
treefc7672312a22bcff3acb19f6851b12beb9ee610d /src/cpu
parentda65fbf2082ae46b609c21d23ba39af45574be13 (diff)
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 <stepan@coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4169 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/intel/socket_mPGA604/Config.lb (renamed from src/cpu/intel/socket_mPGA604_800Mhz/Config.lb)3
-rw-r--r--src/cpu/intel/socket_mPGA604/chip.h (renamed from src/cpu/intel/socket_mPGA604_800Mhz/chip.h)0
-rw-r--r--src/cpu/intel/socket_mPGA604/socket_mPGA604.c (renamed from src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c)2
-rw-r--r--src/cpu/intel/socket_mPGA604_533Mhz/Config.lb3
-rw-r--r--src/cpu/intel/socket_mPGA604_533Mhz/chip.h4
-rw-r--r--src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c7
6 files changed, 3 insertions, 16 deletions
diff --git a/src/cpu/intel/socket_mPGA604_800Mhz/Config.lb b/src/cpu/intel/socket_mPGA604/Config.lb
index 2637c86594..21276eb455 100644
--- a/src/cpu/intel/socket_mPGA604_800Mhz/Config.lb
+++ b/src/cpu/intel/socket_mPGA604/Config.lb
@@ -1,4 +1,5 @@
config chip.h
-object socket_mPGA604_800Mhz.o
+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_800Mhz/chip.h b/src/cpu/intel/socket_mPGA604/chip.h
index b181737c18..b181737c18 100644
--- a/src/cpu/intel/socket_mPGA604_800Mhz/chip.h
+++ b/src/cpu/intel/socket_mPGA604/chip.h
diff --git a/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c b/src/cpu/intel/socket_mPGA604/socket_mPGA604.c
index 505965e70e..1d0d4fb084 100644
--- a/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c
+++ b/src/cpu/intel/socket_mPGA604/socket_mPGA604.c
@@ -3,5 +3,5 @@
struct chip_operations cpu_intel_socket_mPGA604_800Mhz_ops = {
- CHIP_NAME("Socket mPGA604 800Mhz CPU")
+ 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 <device/device.h>
-#include "chip.h"
-
-
-struct chip_operations cpu_intel_socket_mPGA604_533Mhz_ops = {
- CHIP_NAME("Socket mPGA604 533Mhz CPU")
-};