From 8c4f31b3b5f6c3b7ba0ece39cd7df6273ff70a7e Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 3 Aug 2010 15:42:29 +0000 Subject: Drop the USE_PRINTK_IN_CAR option. It's a bogus decision to make for any user / board porter: printk should always be available in CAR mode. Also drop CONFIG_USE_INIT, it's only been selected on one ASROCK board but it's not been used there. Very odd. There is one usage of CONFIG_USE_INIT which was always off in src/cpu/intel/car/cache_as_ram.inc and we have to figure out what to do with those few lines. Signed-off-by: Stefan Reinauer Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5682 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/amd/serengeti_cheetah/Kconfig | 1 - src/mainboard/amd/serengeti_cheetah/ap_romstage.c | 24 +++++++++-------------- 2 files changed, 9 insertions(+), 16 deletions(-) (limited to 'src/mainboard/amd/serengeti_cheetah') diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index 2640d231ff..da15172ee4 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -12,7 +12,6 @@ config BOARD_AMD_SERENGETI_CHEETAH select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select USE_PRINTK_IN_CAR select USE_DCACHE_RAM select HAVE_HARD_RESET select LIFT_BSP_APIC_ID diff --git a/src/mainboard/amd/serengeti_cheetah/ap_romstage.c b/src/mainboard/amd/serengeti_cheetah/ap_romstage.c index 3d7a514dea..5a9d7049dd 100644 --- a/src/mainboard/amd/serengeti_cheetah/ap_romstage.c +++ b/src/mainboard/amd/serengeti_cheetah/ap_romstage.c @@ -32,8 +32,6 @@ #include "lib/delay.c" - -//#include "cpu/x86/lapic/boot_cpu.c" #include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/debug.c" @@ -58,33 +56,30 @@ static inline unsigned get_nodes(void) void hardwaremain(int ret_addr) { - struct sys_info *sysinfo = (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); // in CACHE - struct sys_info *sysinfox = ((CONFIG_RAMTOP) - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); // in RAM + struct sys_info *sysinfo = (CONFIG_DCACHE_RAM_BASE + + CONFIG_DCACHE_RAM_SIZE - + CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); // in CACHE + struct sys_info *sysinfox = ((CONFIG_RAMTOP) - + CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); // in RAM struct node_core_id id; id = get_node_core_id_x(); -#if CONFIG_USE_PRINTK_IN_CAR - printk(BIOS_DEBUG, "CODE IN CACHE ON NODE: %02x\n"); -#else - print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n"); -#endif + printk(BIOS_DEBUG, "CODE IN CACHE ON NODE: %02x\n", id.nodeid); train_ram(id.nodeid, sysinfo, sysinfox); /* - go back, but can not use stack any more, because we only keep ret_addr and can not restore esp, and ebp - */ + * go back, but can not use stack any more, because we + * only keep ret_addr and can not restore esp, and ebp. + */ __asm__ volatile ( "movl %0, %%edi\n\t" "jmp *%%edi\n\t" :: "a"(ret_addr) ); - - - } #include @@ -96,4 +91,3 @@ void x86_exception(struct eregs *info) } while(1); } - -- cgit v1.2.3