summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorYinghai Lu <yinghailu@gmail.com>2004-10-22 18:45:36 +0000
committerYinghai Lu <yinghailu@gmail.com>2004-10-22 18:45:36 +0000
commitccf0bc01aa00a026d136685b0f5f95109f6c85df (patch)
tree9c636208d9c2b11f9037095b28c6e8aa39b08ced /src/cpu
parenta1653cfea55c82ab12f46e14d7ecd7e7ca5e89a8 (diff)
downloadcoreboot-ccf0bc01aa00a026d136685b0f5f95109f6c85df.tar.xz
s2735 half update
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1705 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/intel/model_f2x/Config.lb2
-rw-r--r--src/cpu/intel/model_f2x/model_f2x_init.c4
-rw-r--r--src/cpu/intel/socket_mPGA604_533Mhz/chip.h2
-rw-r--r--src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/cpu/intel/model_f2x/Config.lb b/src/cpu/intel/model_f2x/Config.lb
index 76544328e6..508e1da172 100644
--- a/src/cpu/intel/model_f2x/Config.lb
+++ b/src/cpu/intel/model_f2x/Config.lb
@@ -7,4 +7,4 @@ dir /cpu/x86/lapic
dir /cpu/x86/cache
dir /cpu/intel/microcode
dir /cpu/intel/hyperthreading
-driver model_f1x_init.o
+driver model_f2x_init.o
diff --git a/src/cpu/intel/model_f2x/model_f2x_init.c b/src/cpu/intel/model_f2x/model_f2x_init.c
index db8dc184e3..4f69d81d2a 100644
--- a/src/cpu/intel/model_f2x/model_f2x_init.c
+++ b/src/cpu/intel/model_f2x/model_f2x_init.c
@@ -30,7 +30,7 @@ static uint32_t microcode_updates[] = {
};
-static void model_f2x_init(device_t dev)
+static void model_f2x_init(device_t cpu)
{
/* Turn on caching if we haven't already */
x86_enable_cache();
@@ -48,7 +48,7 @@ static void model_f2x_init(device_t dev)
};
static struct device_operations cpu_dev_ops = {
- .init = model_f1x_init,
+ .init = model_f2x_init,
};
static struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0f22 },
diff --git a/src/cpu/intel/socket_mPGA604_533Mhz/chip.h b/src/cpu/intel/socket_mPGA604_533Mhz/chip.h
index f08d8eef50..bf5cbc70eb 100644
--- a/src/cpu/intel/socket_mPGA604_533Mhz/chip.h
+++ b/src/cpu/intel/socket_mPGA604_533Mhz/chip.h
@@ -1,4 +1,4 @@
-extern struct chip_operations cpu_intel_socket_mPGA604_533Mhz_control;
+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
index aba9cd3ec4..0831ac09c0 100644
--- a/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c
+++ b/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c
@@ -2,6 +2,6 @@
#include "chip.h"
-struct chip_operations cpu_intel_socket_mPGA604_533Mhz_control = {
+struct chip_operations cpu_intel_socket_mPGA604_533Mhz_ops = {
.name = "socket mPGA604_533Mhz",
};