diff options
Diffstat (limited to 'src/cpu/amd')
| -rw-r--r-- | src/cpu/amd/car/cache_as_ram.inc | 2 | ||||
| -rw-r--r-- | src/cpu/amd/car/post_cache_as_ram.c | 3 | ||||
| -rw-r--r-- | src/cpu/amd/model_10xxx/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/amd/model_10xxx/init_cpus.c | 9 | ||||
| -rw-r--r-- | src/cpu/amd/model_fxx/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/amd/model_fxx/init_cpus.c | 5 | ||||
| -rw-r--r-- | src/cpu/amd/socket_AM2r2/Config.lb | 3 | ||||
| -rw-r--r-- | src/cpu/amd/socket_AM2r2/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/amd/socket_F_1207/Config.lb | 3 | ||||
| -rw-r--r-- | src/cpu/amd/socket_F_1207/Kconfig | 1 |
10 files changed, 3 insertions, 26 deletions
diff --git a/src/cpu/amd/car/cache_as_ram.inc b/src/cpu/amd/car/cache_as_ram.inc index 55209c57e5..fa595f94e5 100644 --- a/src/cpu/amd/car/cache_as_ram.inc +++ b/src/cpu/amd/car/cache_as_ram.inc @@ -24,7 +24,7 @@ /* leave some space for global variable to pass to RAM stage */ #define GlobalVarSize CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE -/* for CONFIG_CAR_FAM10 */ +/* for CAR with FAM10 */ #define CacheSizeAPStack 0x400 /* 1K */ #define MSR_FAM10 0xC001102A diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c index 147a56d618..5b3737123a 100644 --- a/src/cpu/amd/car/post_cache_as_ram.c +++ b/src/cpu/amd/car/post_cache_as_ram.c @@ -103,9 +103,6 @@ static void post_cache_as_ram(void) // dump_mem((CONFIG_RAMTOP) - 0x8000, (CONFIG_RAMTOP) - 0x7c00); -#ifndef CONFIG_MEM_TRAIN_SEQ -#define CONFIG_MEM_TRAIN_SEQ 0 -#endif set_sysinfo_in_ram(1); // So other core0 could start to train mem #if CONFIG_MEM_TRAIN_SEQ == 1 diff --git a/src/cpu/amd/model_10xxx/Kconfig b/src/cpu/amd/model_10xxx/Kconfig index 3f80baf9e6..e1fc1a436a 100644 --- a/src/cpu/amd/model_10xxx/Kconfig +++ b/src/cpu/amd/model_10xxx/Kconfig @@ -1,6 +1,5 @@ config CPU_AMD_MODEL_10XXX bool - select HAVE_INIT_TIMER select HAVE_MOVNTI select USE_PRINTK_IN_CAR select USE_DCACHE_RAM diff --git a/src/cpu/amd/model_10xxx/init_cpus.c b/src/cpu/amd/model_10xxx/init_cpus.c index 66959839c2..defbce2571 100644 --- a/src/cpu/amd/model_10xxx/init_cpus.c +++ b/src/cpu/amd/model_10xxx/init_cpus.c @@ -306,11 +306,6 @@ static void STOP_CAR_AND_CPU() stop_this_cpu(); } - -#ifndef CONFIG_MEM_TRAIN_SEQ -#define CONFIG_MEM_TRAIN_SEQ 0 -#endif - #if RAMINIT_SYSINFO == 1 static u32 init_cpus(u32 cpu_init_detectedx ,struct sys_info *sysinfo) #else @@ -478,8 +473,8 @@ static void start_node(u8 node) /* Enable routing table */ printk_debug("Start node %02x", node); -#if CONFIG_CAR_FAM10 == 1 - /* For CONFIG_CAR_FAM10 support, we need to set Dram base/limit for the new node */ +#if CONFIG_NORTHBRIDGE_AMD_AMDFAM10 + /* For FAM10 support, we need to set Dram base/limit for the new node */ pci_write_config32(NODE_MP(node), 0x44, 0); pci_write_config32(NODE_MP(node), 0x40, 3); #endif diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig index b291b646e5..e6d94151aa 100644 --- a/src/cpu/amd/model_fxx/Kconfig +++ b/src/cpu/amd/model_fxx/Kconfig @@ -1,6 +1,5 @@ config CPU_AMD_MODEL_FXX bool - select HAVE_INIT_TIMER select HAVE_MOVNTI select USE_PRINTK_IN_CAR select USE_DCACHE_RAM diff --git a/src/cpu/amd/model_fxx/init_cpus.c b/src/cpu/amd/model_fxx/init_cpus.c index a0ff1d73bc..483399c0c0 100644 --- a/src/cpu/amd/model_fxx/init_cpus.c +++ b/src/cpu/amd/model_fxx/init_cpus.c @@ -215,11 +215,6 @@ static void STOP_CAR_AND_CPU(void) stop_this_cpu(); // inline, it will stop all cores except node0/core0 the bsp .... } -#ifndef CONFIG_MEM_TRAIN_SEQ -#define CONFIG_MEM_TRAIN_SEQ 0 -#endif - - #if CONFIG_MEM_TRAIN_SEQ == 1 static inline void train_ram_on_node(unsigned nodeid, unsigned coreid, struct sys_info *sysinfo, unsigned retcall); #endif diff --git a/src/cpu/amd/socket_AM2r2/Config.lb b/src/cpu/amd/socket_AM2r2/Config.lb index 28d9ba9f5e..2d3d12e834 100644 --- a/src/cpu/amd/socket_AM2r2/Config.lb +++ b/src/cpu/amd/socket_AM2r2/Config.lb @@ -27,7 +27,6 @@ uses CONFIG_CPU_SOCKET_TYPE uses CONFIG_CBB uses CONFIG_CDB uses CONFIG_PCI_BUS_SEGN_BITS -uses CONFIG_CAR_FAM10 config chip.h @@ -39,8 +38,6 @@ default CONFIG_EXT_CONF_SUPPORT=0 default CONFIG_DIMM_SUPPORT=0x0104 #DDR2 and REG default CONFIG_CPU_SOCKET_TYPE=0x11 -default CONFIG_CAR_FAM10=1 - if CONFIG_EXT_RT_TBL_SUPPORT default CONFIG_CBB=0xff default CONFIG_CDB=0 diff --git a/src/cpu/amd/socket_AM2r2/Kconfig b/src/cpu/amd/socket_AM2r2/Kconfig index eb67bb1b51..e9989ef4ee 100644 --- a/src/cpu/amd/socket_AM2r2/Kconfig +++ b/src/cpu/amd/socket_AM2r2/Kconfig @@ -2,7 +2,6 @@ config CPU_AMD_SOCKET_AM2R2 bool select CPU_AMD_MODEL_10XXX select HT3_SUPPORT - select CAR_FAM10 config CPU_SOCKET_TYPE hex diff --git a/src/cpu/amd/socket_F_1207/Config.lb b/src/cpu/amd/socket_F_1207/Config.lb index 5c0147af7e..447b6cbd56 100644 --- a/src/cpu/amd/socket_F_1207/Config.lb +++ b/src/cpu/amd/socket_F_1207/Config.lb @@ -27,7 +27,6 @@ uses CONFIG_CPU_SOCKET_TYPE uses CONFIG_CBB uses CONFIG_CDB uses CONFIG_PCI_BUS_SEGN_BITS -uses CONFIG_CAR_FAM10 config chip.h @@ -39,8 +38,6 @@ default CONFIG_EXT_CONF_SUPPORT=0 default CONFIG_DIMM_SUPPORT=0x0104 #DDR2 and REG default CONFIG_CPU_SOCKET_TYPE=0x10 -default CONFIG_CAR_FAM10=1 - if CONFIG_EXT_RT_TBL_SUPPORT default CONFIG_CBB=0xff default CONFIG_CDB=0 diff --git a/src/cpu/amd/socket_F_1207/Kconfig b/src/cpu/amd/socket_F_1207/Kconfig index ae7d87a210..643827ca52 100644 --- a/src/cpu/amd/socket_F_1207/Kconfig +++ b/src/cpu/amd/socket_F_1207/Kconfig @@ -2,7 +2,6 @@ config CPU_AMD_SOCKET_F_1207 bool select CPU_AMD_MODEL_10XXX select PCI_IO_CFG_EXT - select CAR_FAM10 config CPU_SOCKET_TYPE hex |