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 <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5682 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

documentation/LinuxBIOS-AMD64.tex

@@ -1533,14 +1533,6 @@ There are two big additions to the build process and, furthermore, more than two
 
 Set to \texttt{1} to use Cache As Ram (CAR). Defaults to \texttt{0}
 
-\item \begin{verbatim}CONFIG_USE_INIT\end{verbatim}
-
-Set to \texttt{1} to figure this out. Defaults to \texttt{0}
-
-\item \begin{verbatim}CONFIG_USE_PRINTK_IN_CAR\end{verbatim}
-
-Set to \texttt{1} to use printk, instead of the primitive print functions, in CAR. Defaults to \texttt{0}
-
 \end{itemize}
 
 Before going over the new image types, derived from v3, we will quickly review the standard v2 image types. We are hoping this review will
@@ -1646,41 +1638,6 @@ There is a make variable, INIT-OBJECTS, that for all our other targets is empty.
 No significant change from romcc code.
 \subsubsection{boot sequence}
 No significant change from romcc code, except that the CAR code has to set up a stack.
-\subsection{car + CONFIG\_USE\_PRINTK\_IN\_CAR images}
-When CONFIG\_USE\_PRINTK\_IN\_CAR is set, the CAR code can use printk instead of the primitive print functions. This config variable is used in one of two ways. If CONFIG\_USE\_INIT is 0, then different .c files just include other .c files, as in console.c:
-\begin{verbatim}
-#if CONFIG_USE_PRINTK_IN_CAR == 0
-static void __console_tx_byte(unsigned char byte)
-{
-        uart_tx_byte(byte);
-}
-
-#include "console_print.c"
-
-#else
-/* CONFIG_USE_PRINTK_IN_CAR == 1 */
-
-#include "console_printk.c"
-
-#if CONFIG_USE_INIT == 0
-// do_printk
-#include "../../../console/vtxprintf.c"
-#include "printk_init.c"
-#endif
-
-#endif /* CONFIG_USE_PRINTK_IN_CAR */
-
-\end{verbatim}\footnote{yuck!}
-
-If CONFIG\_USE\_INIT is 1, then the Config.lb is configured differently:
-\begin{verbatim}
-if CONFIG_USE_INIT
-        if CONFIG_USE_PRINTK_IN_CAR
-                initobject printk_init.o
-        end
-end
-
-\end{verbatim}\footnote{see previous footnote}
 
 \subsubsection{layout}
 No significant change from romcc code.

src/Kconfig

@@ -140,10 +140,6 @@ config HEAP_SIZE
 	hex
 	default 0x4000
 
-config USE_PRINTK_IN_CAR
-	bool
-	default n
-
 config MAX_CPUS
 	int
 	default 1

src/cpu/amd/model_10xxx/Kconfig

@@ -1,6 +1,5 @@
 config CPU_AMD_MODEL_10XXX
 	bool
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select SSE
 	select SSE2

src/cpu/amd/model_fxx/Kconfig

@@ -1,6 +1,5 @@
 config CPU_AMD_MODEL_FXX
 	bool
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select MMX
 	select SSE

src/cpu/intel/socket_FC_PGA370/Kconfig

@@ -23,7 +23,6 @@ config CPU_INTEL_SOCKET_FC_PGA370
 	select CPU_INTEL_MODEL_68X
 	select MMX
 	select SSE
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select TINY_BOOTBLOCK
 

src/cpu/via/model_c7/Kconfig

@@ -3,7 +3,6 @@ config CPU_VIA_C7
 	select UDELAY_TSC
 	select MMX
 	select SSE2
-	select USE_PRINTK_IN_CAR
 
 config DCACHE_RAM_BASE
 	hex

src/include/assert.h

@@ -20,7 +20,7 @@
 #ifndef __ASSERT_H__
 #define __ASSERT_H__
 
-#if defined(__PRE_RAM__) && !CONFIG_USE_PRINTK_IN_CAR
+#if defined(__PRE_RAM__) && !CONFIG_USE_DCACHE_RAM
 
 /* ROMCC versions */
 #define ASSERT(x) {						\

src/include/cpu/x86/bist.h

@@ -4,7 +4,7 @@
 static void report_bist_failure(u32 bist)
 {
 	if (bist != 0) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
                 printk(BIOS_EMERG, "BIST failed: %08x", bist);
 #else
 		print_emerg("BIST failed: ");

src/lib/generic_sdram.c

@@ -6,7 +6,7 @@
 
 static inline void print_debug_sdram_8(const char *strval, uint32_t val)
 {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
         printk(BIOS_DEBUG, "%s%02x\n", strval, val);
 #else
         print_debug(strval); print_debug_hex8(val); print_debug("\n");

src/lib/ramtest.c

@@ -51,7 +51,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
 	/*
 	 * Fill.
 	 */
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 	printk(BIOS_DEBUG, "DRAM fill: 0x%08lx-0x%08lx\n", start, stop);
 #else
 	print_debug("DRAM fill: ");
@@ -63,7 +63,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
 	for(addr = start; addr < stop ; addr += 4) {
 		/* Display address being filled */
 		if (!(addr & 0xfffff)) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 			printk(BIOS_DEBUG, "%08lx \r", addr);
 #else
 			print_debug_hex32(addr);
@@ -73,7 +73,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
 		write_phys(addr, (u32)addr);
 	};
 	/* Display final address */
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 	printk(BIOS_DEBUG, "%08lx\nDRAM filled\n", addr);
 #else
 	print_debug_hex32(addr);
@@ -88,7 +88,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
 	/*
 	 * Verify.
 	 */
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 	printk(BIOS_DEBUG, "DRAM verify: 0x%08lx-0x%08lx\n", start, stop);
 #else
 	print_debug("DRAM verify: ");
@@ -101,7 +101,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
 		unsigned long value;
 		/* Display address being tested */
 		if (!(addr & 0xfffff)) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 			printk(BIOS_DEBUG, "%08lx \r", addr);
 #else
 			print_debug_hex32(addr);
@@ -111,7 +111,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
 		value = read_phys(addr);
 		if (value != addr) {
 			/* Display address with error */
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 			printk(BIOS_ERR, "Fail: @0x%08lx Read value=0x%08lx\n", addr, value);
 #else
 			print_err("Fail: @0x");
@@ -122,7 +122,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
 #endif
 			i++;
 			if(i>256) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 				printk(BIOS_DEBUG, "Aborting.\n");
 #else
 				print_debug("Aborting.\n");
@@ -132,14 +132,14 @@ static void ram_verify(unsigned long start, unsigned long stop)
 		}
 	}
 	/* Display final address */
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 	printk(BIOS_DEBUG, "%08lx", addr);
 #else
 	print_debug_hex32(addr);
 #endif
 
 	if (i) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 		printk(BIOS_DEBUG, "\nDRAM did _NOT_ verify!\n");
 #else
 		print_debug("\nDRAM did _NOT_ verify!\n");
@@ -147,7 +147,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
 		die("DRAM ERROR");
 	}
 	else {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 		printk(BIOS_DEBUG, "\nDRAM range verified.\n");
 #else
 		print_debug("\nDRAM range verified.\n");
@@ -163,7 +163,7 @@ void ram_check(unsigned long start, unsigned long stop)
 	 * test than a "Is my DRAM faulty?" test.  Not all bits
 	 * are tested.   -Tyson
 	 */
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 	printk(BIOS_DEBUG, "Testing DRAM : %08lx - %08lx\n", start, stop);
 #else
 	print_debug("Testing DRAM : ");
@@ -176,7 +176,7 @@ void ram_check(unsigned long start, unsigned long stop)
 	/* Make sure we don't read before we wrote */
 	phys_memory_barrier();
 	ram_verify(start, stop);
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 	printk(BIOS_DEBUG, "Done.\n");
 #else
 	print_debug("Done.\n");

src/lib/usbdebug.c

@@ -22,7 +22,7 @@
 #if !defined(__ROMCC__)
 #include <console/console.h>
 #else
-#if CONFIG_USE_PRINTK_IN_CAR==0
+#if CONFIG_USE_DCACHE_RAM==0
 #define printk(BIOS_DEBUG, fmt, arg...)   do {} while(0)
 #endif
 #endif

src/mainboard/amd/db800/Kconfig

@@ -9,7 +9,6 @@ config BOARD_AMD_DB800
 	select PIRQ_ROUTE
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR

src/mainboard/amd/dbm690t/Kconfig

@@ -14,7 +14,6 @@ config BOARD_AMD_DBM690T
 	select HAVE_OPTION_TABLE
 	select HAVE_MAINBOARD_RESOURCES
 	select HAVE_BUS_CONFIG
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/amd/mahogany/Kconfig

@@ -15,7 +15,6 @@ config BOARD_AMD_MAHOGANY
 	select HAVE_MAINBOARD_RESOURCES
 	select HAVE_BUS_CONFIG
 	select LIFT_BSP_APIC_ID
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/amd/mahogany_fam10/Kconfig

@@ -11,7 +11,6 @@ config BOARD_AMD_MAHOGANY_FAM10
 	select HAVE_OPTION_TABLE
 	select GENERATE_PIRQ_TABLE
 	select GENERATE_MP_TABLE
-	select USE_PRINTK_IN_CAR
 	select HAVE_MAINBOARD_RESOURCES
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

src/mainboard/amd/norwich/Kconfig

@@ -8,7 +8,6 @@ config BOARD_AMD_NORWICH
 	select PIRQ_ROUTE
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR

src/mainboard/amd/pistachio/Kconfig

@@ -11,7 +11,6 @@ config BOARD_AMD_PISTACHIO
 	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 SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/amd/rumba/Kconfig

@@ -25,7 +25,6 @@ config BOARD_AMD_RUMBA
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 

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

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 *sysinfo = (CONFIG_DCACHE_RAM_BASE +
-        struct sys_info *sysinfox = ((CONFIG_RAMTOP) - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); // in RAM
+			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", id.nodeid);
-        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
 
 	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 <arch/registers.h>
@@ -96,4 +91,3 @@ void x86_exception(struct eregs *info)
         } while(1);
 }
 
-

src/mainboard/amd/serengeti_cheetah_fam10/Kconfig

@@ -11,7 +11,6 @@ config BOARD_AMD_SERENGETI_CHEETAH_FAM10
 	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 SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/amd/tilapia_fam10/Kconfig

@@ -11,7 +11,6 @@ config BOARD_AMD_TILAPIA_FAM10
 	select HAVE_OPTION_TABLE
 	select GENERATE_PIRQ_TABLE
 	select GENERATE_MP_TABLE
-	select USE_PRINTK_IN_CAR
 	select HAVE_MAINBOARD_RESOURCES
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

src/mainboard/arima/hdama/Kconfig

@@ -10,7 +10,6 @@ config BOARD_ARIMA_HDAMA
 	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
 	select HAVE_MP_TABLE
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/artecgroup/dbe61/Kconfig

@@ -8,7 +8,6 @@ config BOARD_ARTECGROUP_DBE61
 	select PIRQ_ROUTE
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR

src/mainboard/asrock/939a785gmh/Kconfig

@@ -16,7 +16,6 @@ config BOARD_ASROCK_939A785GMH
 	select HAVE_OPTION_TABLE
 	select HAVE_BUS_CONFIG
 	select LIFT_BSP_APIC_ID
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
@@ -93,11 +92,6 @@ config HT_CHAIN_UNITID_BASE
 	default 0x0
 	depends on BOARD_ASROCK_939A785GMH
 
-config USE_INIT
-	bool
-	default n
-	depends on BOARD_ASROCK_939A785GMH
-
 config IRQ_SLOT_COUNT
 	int
 	default 11

src/mainboard/asus/a8n_e/Kconfig

@@ -10,7 +10,6 @@ config BOARD_ASUS_A8N_E
 	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 BOARD_ROMSIZE_KB_512

src/mainboard/asus/a8v-e_se/Kconfig

@@ -8,7 +8,6 @@ config BOARD_ASUS_A8V_E_SE
 	select SOUTHBRIDGE_VIA_VT8237R
 	select SOUTHBRIDGE_VIA_K8T890
 	select SUPERIO_WINBOND_W83627EHG
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_TABLES

src/mainboard/asus/m2v-mx_se/Kconfig

@@ -26,7 +26,6 @@ config BOARD_ASUS_M2V_MX_SE
 	select SOUTHBRIDGE_VIA_VT8237R
 	select SOUTHBRIDGE_VIA_K8M890
 	select SUPERIO_ITE_IT8712F
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_TABLES

src/mainboard/broadcom/blast/Kconfig

@@ -11,7 +11,6 @@ config BOARD_BROADCOM_BLAST
 	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 BOARD_ROMSIZE_KB_512

src/mainboard/digitallogic/adl855pc/Kconfig

@@ -9,7 +9,6 @@ config BOARD_DIGITALLOGIC_ADL855PC
 	select HAVE_PIRQ_TABLE
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_1024
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select TINY_BOOTBLOCK
 

src/mainboard/digitallogic/msm800sev/Kconfig

@@ -9,7 +9,6 @@ config BOARD_DIGITALLOGIC_MSM800SEV
 	select PIRQ_ROUTE
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR

src/mainboard/getac/p470/Kconfig

@@ -37,7 +37,6 @@ config BOARD_GETAC_P470
 	select HAVE_ACPI_SLIC
 	select HAVE_MAINBOARD_RESOURCES
 	select MMCONF_SUPPORT
-	select USE_PRINTK_IN_CAR
 	select AP_IN_SIPI_WAIT
 	select UDELAY_LAPIC
 	select HAVE_SMI_HANDLER

src/mainboard/gigabyte/ga_2761gxdk/Kconfig

@@ -9,7 +9,6 @@ config BOARD_GIGABYTE_GA_2761GXDK
 	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID

src/mainboard/gigabyte/m57sli/Kconfig

@@ -11,7 +11,6 @@ config BOARD_GIGABYTE_M57SLI
 	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

src/mainboard/hp/dl145_g3/Kconfig

@@ -11,7 +11,6 @@ config BOARD_HP_DL145_G3
 	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

src/mainboard/ibase/mb899/Kconfig

@@ -15,7 +15,6 @@ config BOARD_IBASE_MB899
 	select HAVE_ACPI_RESUME
 	select HAVE_MAINBOARD_RESOURCES
 	select MMCONF_SUPPORT
-	select USE_PRINTK_IN_CAR
 	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_512
 	select USE_DCACHE_RAM

src/mainboard/ibm/e325/Kconfig

@@ -10,7 +10,6 @@ config BOARD_IBM_E325
 	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 SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/ibm/e326/Kconfig

@@ -10,7 +10,6 @@ config BOARD_IBM_E326
 	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 SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/iei/pcisa-lx-800-r10/Kconfig

@@ -8,7 +8,6 @@ config BOARD_IEI_PCISA_LX_800_R10
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR

src/mainboard/intel/d945gclf/Kconfig

@@ -37,7 +37,6 @@ config BOARD_INTEL_D945GCLF
 	select HAVE_ACPI_RESUME
 	select HAVE_MAINBOARD_RESOURCES
 	select MMCONF_SUPPORT
-	select USE_PRINTK_IN_CAR
 	select HAVE_ACPI_TABLES
 	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_512

src/mainboard/intel/eagleheights/Kconfig

@@ -13,7 +13,6 @@ config BOARD_INTEL_EAGLEHEIGHTS
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select MMCONF_SUPPORT
-	select USE_PRINTK_IN_CAR
 	select UDELAY_TSC
 	select AP_IN_SIPI_WAIT
 	select HAVE_ACPI_TABLES

src/mainboard/iwill/dk8_htx/Kconfig

@@ -12,7 +12,6 @@ config BOARD_IWILL_DK8_HTX
 	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

src/mainboard/iwill/dk8s2/Kconfig

@@ -10,7 +10,6 @@ config BOARD_IWILL_DK8S2
 	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
 	select HAVE_MP_TABLE
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/iwill/dk8x/Kconfig

@@ -10,7 +10,6 @@ config BOARD_IWILL_DK8X
 	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 SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/kontron/986lcd-m/Kconfig

@@ -15,7 +15,6 @@ config BOARD_KONTRON_986LCD_M
 	select HAVE_ACPI_RESUME
 	select HAVE_MAINBOARD_RESOURCES
 	select MMCONF_SUPPORT
-	select USE_PRINTK_IN_CAR
 	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_1024
 	select USE_DCACHE_RAM

src/mainboard/kontron/kt690/Kconfig

@@ -14,7 +14,6 @@ config BOARD_KONTRON_KT690
 	select HAVE_MP_TABLE
 	select HAVE_MAINBOARD_RESOURCES
 	select GFXUMA
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select HAVE_ACPI_TABLES

src/mainboard/lippert/frontrunner/Kconfig

@@ -6,7 +6,6 @@ config BOARD_LIPPERT_FRONTRUNNER
 	select SOUTHBRIDGE_AMD_CS5535
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 

src/mainboard/lippert/roadrunner-lx/Kconfig

@@ -9,7 +9,6 @@ config BOARD_LIPPERT_ROADRUNNER_LX
 	select PIRQ_ROUTE
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR

src/mainboard/lippert/spacerunner-lx/Kconfig

@@ -9,7 +9,6 @@ config BOARD_LIPPERT_SPACERUNNER_LX
 	select PIRQ_ROUTE
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR

src/mainboard/msi/ms7135/Kconfig

@@ -12,7 +12,6 @@ config BOARD_MSI_MS7135
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR

src/mainboard/msi/ms7260/Kconfig

@@ -10,7 +10,6 @@ config BOARD_MSI_MS7260
 	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

src/mainboard/msi/ms9185/Kconfig

@@ -11,7 +11,6 @@ config BOARD_MSI_MS9185
 	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

src/mainboard/msi/ms9282/Kconfig

@@ -10,7 +10,6 @@ config BOARD_MSI_MS9282
 	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 K8_REV_F_SUPPORT

src/mainboard/msi/ms9652_fam10/Kconfig

@@ -8,7 +8,6 @@ config BOARD_MSI_MS9652_FAM10
 	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_OPTION_TABLE
 	select HAVE_HARD_RESET

src/mainboard/newisys/khepri/Kconfig

@@ -10,7 +10,6 @@ config BOARD_NEWISYS_KHEPRI
 	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 BOARD_ROMSIZE_KB_512

src/mainboard/nvidia/l1_2pvv/Kconfig

@@ -10,7 +10,6 @@ config BOARD_NVIDIA_L1_2PVV
 	select HAVE_BUS_CONFIG
 	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

src/mainboard/olpc/btest/Kconfig

@@ -6,7 +6,6 @@ config BOARD_OLPC_BTEST
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 

src/mainboard/olpc/rev_a/Kconfig

@@ -6,7 +6,6 @@ config BOARD_OLPC_REV_A
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 

src/mainboard/pcengines/alix1c/Kconfig

@@ -9,7 +9,6 @@ config BOARD_PCENGINES_ALIX1C
 	select PIRQ_ROUTE
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR

src/mainboard/rca/rm4100/Kconfig

@@ -10,7 +10,6 @@ config BOARD_RCA_RM4100
 	select BOARD_ROMSIZE_KB_1024
 	select HAVE_HARD_RESET
 	select HAVE_MAINBOARD_RESOURCES
-	select USE_PRINTK_IN_CAR
 	select HAVE_SMI_HANDLER
 	select GFXUMA
 	select USE_DCACHE_RAM

src/mainboard/roda/rk886ex/Kconfig

@@ -13,7 +13,6 @@ config BOARD_RODA_RK886EX
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select MMCONF_SUPPORT
-	select USE_PRINTK_IN_CAR
 	select HAVE_SMI_HANDLER
 	select HAVE_ACPI_TABLES
 	select HAVE_ACPI_RESUME

src/mainboard/sunw/ultra40/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SUNW_ULTRA40
 	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_1024

src/mainboard/supermicro/h8dme/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SUPERMICRO_H8DME
 	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	#select AP_CODE_IN_CAR

src/mainboard/supermicro/h8dmr/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SUPERMICRO_H8DMR
 	select HAVE_BUS_CONFIG
 	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

src/mainboard/supermicro/h8dmr_fam10/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SUPERMICRO_H8DMR_FAM10
 	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

src/mainboard/supermicro/h8qme_fam10/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SUPERMICRO_H8QME_FAM10
 	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

src/mainboard/technexion/tim5690/Kconfig

@@ -12,7 +12,6 @@ config BOARD_TECHNEXION_TIM5690
 	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 SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/technexion/tim8690/Kconfig

@@ -12,7 +12,6 @@ config BOARD_TECHNEXION_TIM8690
 	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 SB_HT_CHAIN_UNITID_OFFSET_ONLY

src/mainboard/thomson/ip1000/Kconfig

@@ -10,7 +10,6 @@ config BOARD_THOMSON_IP1000
 	select BOARD_ROMSIZE_KB_512
 	select HAVE_HARD_RESET
 	select HAVE_MAINBOARD_RESOURCES
-	select USE_PRINTK_IN_CAR
 	select HAVE_SMI_HANDLER
 	select GFXUMA
 	select USE_DCACHE_RAM

src/mainboard/traverse/geos/Kconfig

@@ -8,7 +8,6 @@ config BOARD_TRAVERSE_GEOS
 	select PIRQ_ROUTE
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_1024
 
 config MAINBOARD_DIR

src/mainboard/tyan/s2735/Kconfig

@@ -15,7 +15,6 @@ config BOARD_TYAN_S2735
 	select USE_DCACHE_RAM
 	select USE_WATCHDOG_ON_BOOT
 	select BOARD_ROMSIZE_KB_512
-	select USE_PRINTK_IN_CAR
 
 config MAINBOARD_DIR
 	string

src/mainboard/tyan/s2912/Kconfig

@@ -10,7 +10,6 @@ config BOARD_TYAN_S2912
 	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

src/mainboard/tyan/s2912_fam10/Kconfig

@@ -9,7 +9,6 @@ config BOARD_TYAN_S2912_FAM10
 	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

src/mainboard/tyan/s4880/Kconfig

@@ -10,7 +10,6 @@ config BOARD_TYAN_S4880
 	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 BOARD_ROMSIZE_KB_512

src/mainboard/tyan/s4882/Kconfig

@@ -10,7 +10,6 @@ config BOARD_TYAN_S4882
 	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 BOARD_ROMSIZE_KB_512

src/mainboard/winent/pl6064/Kconfig

@@ -9,7 +9,6 @@ config BOARD_WINENT_PL6064
 	select PIRQ_ROUTE
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR

src/mainboard/wyse/s50/Kconfig

@@ -25,7 +25,6 @@ config BOARD_WYSE_S50
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
 	select USE_DCACHE_RAM
-	select USE_PRINTK_IN_CAR
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select BOARD_ROMSIZE_KB_256

src/northbridge/intel/e7501/debug.c

@@ -39,7 +39,7 @@ static void dump_pci_device(unsigned dev)
 	for(i = 0; i < 256; i++) {
 		unsigned char val;
 		if ((i & 0x0f) == 0) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
                         printk(BIOS_DEBUG, "\n%02x:",i);
 #else
 			print_debug("\n");
@@ -48,7 +48,7 @@ static void dump_pci_device(unsigned dev)
 #endif
 		}
 		val = pci_read_config8(dev, i);
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 		printk(BIOS_DEBUG, " %02x", val);
 #else
 		print_debug_char(' ');
@@ -101,7 +101,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
 		device = ctrl->channel0[i];
 		if (device) {
 			int j;
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 			printk(BIOS_DEBUG, "dimm: %02x.0: %02x", i, device);
 #else
 			print_debug("dimm: ");
@@ -113,7 +113,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
 				int status;
 				unsigned char byte;
 				if ((j & 0xf) == 0) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 					printk(BIOS_DEBUG, "\n%02x: ", j);
 #else
 					print_debug("\n");
@@ -126,7 +126,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
 					break;
 				}
 				byte = status & 0xff;
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 				printk(BIOS_DEBUG, "%02x ", byte);
 #else
 				print_debug_hex8(byte);
@@ -138,7 +138,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
 		device = ctrl->channel1[i];
 		if (device) {
 			int j;
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
                         printk(BIOS_DEBUG, "dimm: %02x.1: %02x", i, device);
 #else
 			print_debug("dimm: ");
@@ -150,7 +150,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
 				int status;
 				unsigned char byte;
 				if ((j & 0xf) == 0) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
                                         printk(BIOS_DEBUG, "\n%02x: ", j);
 #else
 					print_debug("\n");
@@ -163,7 +163,7 @@ static inline void dump_spd_registers(const struct mem_controller *ctrl)
 					break;
 				}
 				byte = status & 0xff;
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
                                 printk(BIOS_DEBUG, "%02x ", byte);
 #else
 				print_debug_hex8(byte);
@@ -181,7 +181,7 @@ static inline void dump_smbus_registers(void)
         for(device = 1; device < 0x80; device++) {
                 int j;
 		if( smbus_read_byte(device, 0) < 0 ) continue;
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 		printk(BIOS_DEBUG, "smbus: %02x", device);
 #else
                 print_debug("smbus: ");
@@ -195,7 +195,7 @@ static inline void dump_smbus_registers(void)
 				break;
                         }
                         if ((j & 0xf) == 0) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 				printk(BIOS_DEBUG, "\n%02x: ",j);
 #else
                 	        print_debug("\n");
@@ -204,7 +204,7 @@ static inline void dump_smbus_registers(void)
 #endif
                         }
                         byte = status & 0xff;
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
                         printk(BIOS_DEBUG, "%02x ", byte);
 #else
                         print_debug_hex8(byte);
@@ -219,7 +219,7 @@ static inline void dump_io_resources(unsigned port)
 {
 
 	int i;
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 	printk(BIOS_DEBUG, "%04x:\n", port);
 #else
         print_debug_hex16(port);
@@ -228,7 +228,7 @@ static inline void dump_io_resources(unsigned port)
         for(i=0;i<256;i++) {
                 uint8_t val;
                 if ((i & 0x0f) == 0) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 			printk(BIOS_DEBUG, "%02x:", i);
 #else
                         print_debug_hex8(i);
@@ -236,7 +236,7 @@ static inline void dump_io_resources(unsigned port)
 #endif
                 }
                 val = inb(port);
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 		printk(BIOS_DEBUG, " %02x",val);
 #else
                 print_debug_char(' ');
@@ -255,7 +255,7 @@ static inline void dump_mem(unsigned start, unsigned end)
 	print_debug("dump_mem:");
         for(i=start;i<end;i++) {
 		if((i & 0xf)==0) {
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 			printk(BIOS_DEBUG, "\n%08x:", i);
 #else
 			print_debug("\n");
@@ -263,7 +263,7 @@ static inline void dump_mem(unsigned start, unsigned end)
 			print_debug(":");
 #endif
 		}
-#if CONFIG_USE_PRINTK_IN_CAR
+#if CONFIG_USE_DCACHE_RAM
 		printk(BIOS_DEBUG, " %02x", (unsigned char)*((unsigned char *)i));
 #else
 		print_debug(" ");

src/pc80/serial.c

@@ -28,7 +28,7 @@
 #define UART_LCS	CONFIG_TTYS0_LCS
 
 
-#if CONFIG_USE_PRINTK_IN_CAR == 0
+#if CONFIG_USE_DCACHE_RAM == 0
 
 /* Data */
 #define UART_RBR 0x00
@@ -97,7 +97,7 @@ void uart_init(void)
 }
 
 #else
-/* CONFIG_USE_PRINTK_IN_CAR == 1 */
+/* CONFIG_USE_DCACHE_RAM == 1 */
 
 extern void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs);
 void uart_init(void)