summaryrefslogtreecommitdiff
path: root/src/cpu/amd
diff options
context:
space:
mode:
authorJonathan Kollasch <jakllsch@kollasch.net>2010-10-07 23:02:06 +0000
committerMyles Watson <mylesgw@gmail.com>2010-10-07 23:02:06 +0000
commite5b7507882d4ee042d9c4d03e2e763bb49774b43 (patch)
treeb4a01d7f719cf50cb4d440472b8a2a50025064c2 /src/cpu/amd
parenta3bd1b1b25bb3056a6cc092b7a17a383e119a21f (diff)
downloadcoreboot-e5b7507882d4ee042d9c4d03e2e763bb49774b43.tar.xz
Remove duplicate line from pci_ids.h.
Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net> Acked-by: Jonathan Kollasch <jakllsch@kollasch.net> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5920 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu/amd')
-rw-r--r--src/cpu/amd/model_10xxx/init_cpus.c4
-rw-r--r--src/cpu/amd/model_fxx/init_cpus.c2
-rw-r--r--src/cpu/amd/model_fxx/powernow_acpi.c10
-rw-r--r--src/cpu/amd/socket_754/Kconfig10
-rw-r--r--src/cpu/amd/socket_939/Kconfig9
-rw-r--r--src/cpu/amd/socket_940/Kconfig8
6 files changed, 13 insertions, 30 deletions
diff --git a/src/cpu/amd/model_10xxx/init_cpus.c b/src/cpu/amd/model_10xxx/init_cpus.c
index ae1da66967..e582ca8af3 100644
--- a/src/cpu/amd/model_10xxx/init_cpus.c
+++ b/src/cpu/amd/model_10xxx/init_cpus.c
@@ -257,7 +257,7 @@ static void STOP_CAR_AND_CPU(void)
stop_this_cpu();
}
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
static u32 init_cpus(u32 cpu_init_detectedx, struct sys_info *sysinfo)
#else
static u32 init_cpus(u32 cpu_init_detectedx)
@@ -918,7 +918,7 @@ static void finalize_node_setup(struct sys_info *sysinfo)
u8 nodes = get_nodes();
u32 reg;
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
/* read Node0 F0_0x64 bit [8:10] to find out SbLink # */
reg = pci_read_config32(NODE_HT(0), 0x64);
sysinfo->sblk = (reg >> 8) & 7;
diff --git a/src/cpu/amd/model_fxx/init_cpus.c b/src/cpu/amd/model_fxx/init_cpus.c
index fa0f8b4f3f..5672a6e8f1 100644
--- a/src/cpu/amd/model_fxx/init_cpus.c
+++ b/src/cpu/amd/model_fxx/init_cpus.c
@@ -209,7 +209,7 @@ static void STOP_CAR_AND_CPU(void)
stop_this_cpu();
}
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
static u32 init_cpus(u32 cpu_init_detectedx, struct sys_info *sysinfo)
#else
static u32 init_cpus(u32 cpu_init_detectedx)
diff --git a/src/cpu/amd/model_fxx/powernow_acpi.c b/src/cpu/amd/model_fxx/powernow_acpi.c
index 5339f3b5bf..b07dcb1a96 100644
--- a/src/cpu/amd/model_fxx/powernow_acpi.c
+++ b/src/cpu/amd/model_fxx/powernow_acpi.c
@@ -30,6 +30,7 @@
#include <cpu/amd/amdk8_sysconf.h>
#include <arch/cpu.h>
+#if CONFIG_K8_REV_F_SUPPORT
static int write_pstates_for_core(u8 pstate_num, u16 *pstate_feq, u8 *pstate_vid,
u8 *pstate_fid, u32 *pstate_power, int coreID,
u32 pcontrol_blk, u8 plen, u8 onlyBSP)
@@ -386,3 +387,12 @@ int amd_model_fxx_generate_powernow(u32 pcontrol_blk, u8 plen, u8 onlyBSP)
acpigen_patch_len(lens - 1);
return lens;
}
+
+#else
+
+int amd_model_fxx_generate_powernow(u32 pcontrol_blk, u8 plen, u8 onlyBSP)
+{
+ return 0;
+}
+
+#endif
diff --git a/src/cpu/amd/socket_754/Kconfig b/src/cpu/amd/socket_754/Kconfig
index d891cd237f..b6b8260f80 100644
--- a/src/cpu/amd/socket_754/Kconfig
+++ b/src/cpu/amd/socket_754/Kconfig
@@ -1,13 +1,3 @@
config CPU_AMD_SOCKET_754
bool
select CPU_AMD_MODEL_FXX
-
-config CPU_SOCKET_TYPE
- hex
- default 0x10
- depends on CPU_AMD_SOCKET_754
-
-config DIMM_SUPPORT
- hex
- default 0x108
- depends on CPU_AMD_SOCKET_754
diff --git a/src/cpu/amd/socket_939/Kconfig b/src/cpu/amd/socket_939/Kconfig
index ca8059d551..ff36a84849 100644
--- a/src/cpu/amd/socket_939/Kconfig
+++ b/src/cpu/amd/socket_939/Kconfig
@@ -2,12 +2,3 @@ config CPU_AMD_SOCKET_939
bool
select CPU_AMD_MODEL_FXX
-config CPU_SOCKET_TYPE
- hex
- default 0x0
- depends on CPU_AMD_SOCKET_939
-
-config DIMM_SUPPORT
- hex
- default 0x108
- depends on CPU_AMD_SOCKET_939
diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig
index 6c3a929f14..1dbf6526b7 100644
--- a/src/cpu/amd/socket_940/Kconfig
+++ b/src/cpu/amd/socket_940/Kconfig
@@ -9,14 +9,6 @@ config SOCKET_SPECIFIC_OPTIONS
select CPU_AMD_MODEL_FXX
select CACHE_AS_RAM
-config CPU_SOCKET_TYPE
- hex
- default 0x0
-
-config DIMM_SUPPORT
- hex
- default 0x108
-
config CPU_ADDR_BITS
int
default 40