aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-08-03 15:42:29 +0000
committerStefan Reinauer <stepan@openbios.org>2010-08-03 15:42:29 +0000
commit8c4f31b3b5f6c3b7ba0ece39cd7df6273ff70a7e (patch)
tree8389a39faee37e90aa602aac197e44566f33f562
parent0362c6d6a7da2fb1ce23da544587bb1aa406e67e (diff)
downloadcoreboot-8c4f31b3b5f6c3b7ba0ece39cd7df6273ff70a7e.tar.gz
coreboot-8c4f31b3b5f6c3b7ba0ece39cd7df6273ff70a7e.tar.xz
coreboot-8c4f31b3b5f6c3b7ba0ece39cd7df6273ff70a7e.zip
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
-rw-r--r--documentation/LinuxBIOS-AMD64.tex43
-rw-r--r--src/Kconfig4
-rw-r--r--src/cpu/amd/model_10xxx/Kconfig1
-rw-r--r--src/cpu/amd/model_fxx/Kconfig1
-rw-r--r--src/cpu/intel/socket_FC_PGA370/Kconfig1
-rw-r--r--src/cpu/via/model_c7/Kconfig1
-rw-r--r--src/include/assert.h2
-rw-r--r--src/include/cpu/x86/bist.h2
-rw-r--r--src/lib/generic_sdram.c2
-rw-r--r--src/lib/ramtest.c24
-rw-r--r--src/lib/usbdebug.c2
-rw-r--r--src/mainboard/amd/db800/Kconfig1
-rw-r--r--src/mainboard/amd/dbm690t/Kconfig1
-rw-r--r--src/mainboard/amd/mahogany/Kconfig1
-rw-r--r--src/mainboard/amd/mahogany_fam10/Kconfig1
-rw-r--r--src/mainboard/amd/norwich/Kconfig1
-rw-r--r--src/mainboard/amd/pistachio/Kconfig1
-rw-r--r--src/mainboard/amd/rumba/Kconfig1
-rw-r--r--src/mainboard/amd/serengeti_cheetah/Kconfig1
-rw-r--r--src/mainboard/amd/serengeti_cheetah/ap_romstage.c24
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/Kconfig1
-rw-r--r--src/mainboard/amd/tilapia_fam10/Kconfig1
-rw-r--r--src/mainboard/arima/hdama/Kconfig1
-rw-r--r--src/mainboard/artecgroup/dbe61/Kconfig1
-rw-r--r--src/mainboard/asrock/939a785gmh/Kconfig6
-rw-r--r--src/mainboard/asus/a8n_e/Kconfig1
-rw-r--r--src/mainboard/asus/a8v-e_se/Kconfig1
-rw-r--r--src/mainboard/asus/m2v-mx_se/Kconfig1
-rw-r--r--src/mainboard/broadcom/blast/Kconfig1
-rw-r--r--src/mainboard/digitallogic/adl855pc/Kconfig1
-rw-r--r--src/mainboard/digitallogic/msm800sev/Kconfig1
-rw-r--r--src/mainboard/getac/p470/Kconfig1
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/Kconfig1
-rw-r--r--src/mainboard/gigabyte/m57sli/Kconfig1
-rw-r--r--src/mainboard/hp/dl145_g3/Kconfig1
-rw-r--r--src/mainboard/ibase/mb899/Kconfig1
-rw-r--r--src/mainboard/ibm/e325/Kconfig1
-rw-r--r--src/mainboard/ibm/e326/Kconfig1
-rw-r--r--src/mainboard/iei/pcisa-lx-800-r10/Kconfig1
-rw-r--r--src/mainboard/intel/d945gclf/Kconfig1
-rw-r--r--src/mainboard/intel/eagleheights/Kconfig1
-rw-r--r--src/mainboard/iwill/dk8_htx/Kconfig1
-rw-r--r--src/mainboard/iwill/dk8s2/Kconfig1
-rw-r--r--src/mainboard/iwill/dk8x/Kconfig1
-rw-r--r--src/mainboard/kontron/986lcd-m/Kconfig1
-rw-r--r--src/mainboard/kontron/kt690/Kconfig1
-rw-r--r--src/mainboard/lippert/frontrunner/Kconfig1
-rw-r--r--src/mainboard/lippert/roadrunner-lx/Kconfig1
-rw-r--r--src/mainboard/lippert/spacerunner-lx/Kconfig1
-rw-r--r--src/mainboard/msi/ms7135/Kconfig1
-rw-r--r--src/mainboard/msi/ms7260/Kconfig1
-rw-r--r--src/mainboard/msi/ms9185/Kconfig1
-rw-r--r--src/mainboard/msi/ms9282/Kconfig1
-rw-r--r--src/mainboard/msi/ms9652_fam10/Kconfig1
-rw-r--r--src/mainboard/newisys/khepri/Kconfig1
-rw-r--r--src/mainboard/nvidia/l1_2pvv/Kconfig1
-rw-r--r--src/mainboard/olpc/btest/Kconfig1
-rw-r--r--src/mainboard/olpc/rev_a/Kconfig1
-rw-r--r--src/mainboard/pcengines/alix1c/Kconfig1
-rw-r--r--src/mainboard/rca/rm4100/Kconfig1
-rw-r--r--src/mainboard/roda/rk886ex/Kconfig1
-rw-r--r--src/mainboard/sunw/ultra40/Kconfig1
-rw-r--r--src/mainboard/supermicro/h8dme/Kconfig1
-rw-r--r--src/mainboard/supermicro/h8dmr/Kconfig1
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/Kconfig1
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/Kconfig1
-rw-r--r--src/mainboard/technexion/tim5690/Kconfig1
-rw-r--r--src/mainboard/technexion/tim8690/Kconfig1
-rw-r--r--src/mainboard/thomson/ip1000/Kconfig1
-rw-r--r--src/mainboard/traverse/geos/Kconfig1
-rw-r--r--src/mainboard/tyan/s2735/Kconfig1
-rw-r--r--src/mainboard/tyan/s2912/Kconfig1
-rw-r--r--src/mainboard/tyan/s2912_fam10/Kconfig1
-rw-r--r--src/mainboard/tyan/s4880/Kconfig1
-rw-r--r--src/mainboard/tyan/s4882/Kconfig1
-rw-r--r--src/mainboard/winent/pl6064/Kconfig1
-rw-r--r--src/mainboard/wyse/s50/Kconfig1
-rw-r--r--src/northbridge/intel/e7501/debug.c32
-rw-r--r--src/pc80/serial.c4
79 files changed, 43 insertions, 170 deletions
diff --git a/documentation/LinuxBIOS-AMD64.tex b/documentation/LinuxBIOS-AMD64.tex
index 2ee057e42..19a6f5901 100644
--- a/documentation/LinuxBIOS-AMD64.tex
+++ b/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.
diff --git a/src/Kconfig b/src/Kconfig
index 61135c0d5..c86b6684a 100644
--- a/src/Kconfig
+++ b/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
diff --git a/src/cpu/amd/model_10xxx/Kconfig b/src/cpu/amd/model_10xxx/Kconfig
index 6dcdd87af..6c66ebaf1 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 USE_PRINTK_IN_CAR
select USE_DCACHE_RAM
select SSE
select SSE2
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig
index 539171c6b..4f59b6d08 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 USE_PRINTK_IN_CAR
select USE_DCACHE_RAM
select MMX
select SSE
diff --git a/src/cpu/intel/socket_FC_PGA370/Kconfig b/src/cpu/intel/socket_FC_PGA370/Kconfig
index c9ce39efd..7116f32e0 100644
--- a/src/cpu/intel/socket_FC_PGA370/Kconfig
+++ b/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
diff --git a/src/cpu/via/model_c7/Kconfig b/src/cpu/via/model_c7/Kconfig
index 7790b95ee..57fe4e95e 100644
--- a/src/cpu/via/model_c7/Kconfig
+++ b/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
diff --git a/src/include/assert.h b/src/include/assert.h
index 718f72ebf..0b21c2ae8 100644
--- a/src/include/assert.h
+++ b/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) { \
diff --git a/src/include/cpu/x86/bist.h b/src/include/cpu/x86/bist.h
index 7dbd18b12..8232b9c68 100644
--- a/src/include/cpu/x86/bist.h
+++ b/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: ");
diff --git a/src/lib/generic_sdram.c b/src/lib/generic_sdram.c
index 8a0625217..be3499fd0 100644
--- a/src/lib/generic_sdram.c
+++ b/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");
diff --git a/src/lib/ramtest.c b/src/lib/ramtest.c
index 98872a47d..a7944e4ea 100644
--- a/src/lib/ramtest.c
+++ b/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");
diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c
index d5372d9e2..801cfdbca 100644
--- a/src/lib/usbdebug.c
+++ b/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
diff --git a/src/mainboard/amd/db800/Kconfig b/src/mainboard/amd/db800/Kconfig
index e25af727e..9b33ed82e 100644
--- a/src/mainboard/amd/db800/Kconfig
+++ b/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
diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig
index 0a3981722..a60cc1668 100644
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/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
diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig
index f159ad325..508292848 100644
--- a/src/mainboard/amd/mahogany/Kconfig
+++ b/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
diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig
index 8c66e4663..10a308fb7 100644
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/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
diff --git a/src/mainboard/amd/norwich/Kconfig b/src/mainboard/amd/norwich/Kconfig
index 2dd968882..3d70ad18f 100644
--- a/src/mainboard/amd/norwich/Kconfig
+++ b/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
diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig
index a15163db2..932f22381 100644
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/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
diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig
index 3a76969a5..d02fe3900 100644
--- a/src/mainboard/amd/rumba/Kconfig
+++ b/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
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index 2640d231f..da15172ee 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 3d7a514de..5a9d7049d 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 <arch/registers.h>
@@ -96,4 +91,3 @@ void x86_exception(struct eregs *info)
} while(1);
}
-
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index a25bac4ae..6b222677d 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/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
diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig
index ca527b578..22813c133 100644
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/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
diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig
index 6b2e5947d..14ab6efc7 100644
--- a/src/mainboard/arima/hdama/Kconfig
+++ b/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
diff --git a/src/mainboard/artecgroup/dbe61/Kconfig b/src/mainboard/artecgroup/dbe61/Kconfig
index dfb82c695..54847cec8 100644
--- a/src/mainboard/artecgroup/dbe61/Kconfig
+++ b/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
diff --git a/src/mainboard/asrock/939a785gmh/Kconfig b/src/mainboard/asrock/939a785gmh/Kconfig
index 2ff4a43a6..ce43fc0f5 100644
--- a/src/mainboard/asrock/939a785gmh/Kconfig
+++ b/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
diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig
index a624e2b01..73ec106d0 100644
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/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
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index f794b2a9f..11f36ab3a 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/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
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index 70dbb0733..822790054 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/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
diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig
index bd9573411..37e2ea3e3 100644
--- a/src/mainboard/broadcom/blast/Kconfig
+++ b/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
diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig b/src/mainboard/digitallogic/adl855pc/Kconfig
index 31b27ed17..dd17ca00a 100644
--- a/src/mainboard/digitallogic/adl855pc/Kconfig
+++ b/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
diff --git a/src/mainboard/digitallogic/msm800sev/Kconfig b/src/mainboard/digitallogic/msm800sev/Kconfig
index 4e89beb39..e3248df76 100644
--- a/src/mainboard/digitallogic/msm800sev/Kconfig
+++ b/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
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index fb117b316..13ae2765b 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/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
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
index 549dbfea7..85519085b 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/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
diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig
index 6f7635ef0..5e77631cf 100644
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/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
diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig
index ee7bca4e9..956aaffde 100644
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/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
diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig
index 77c0eb177..0795db601 100644
--- a/src/mainboard/ibase/mb899/Kconfig
+++ b/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
diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig
index e8c068965..b23d60142 100644
--- a/src/mainboard/ibm/e325/Kconfig
+++ b/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
diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig
index e1b53ec3a..7f6c9a2e7 100644
--- a/src/mainboard/ibm/e326/Kconfig
+++ b/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
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
index c1116343e..db05e0434 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
+++ b/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
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index 61b7340db..cad2ecf3e 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/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
diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig
index dbb7d164e..e00c7a532 100644
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/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
diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig
index bf5cb81a8..1b425f6b6 100644
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/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
diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig
index 6f35928a8..10d525acf 100644
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/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
diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig
index 87ee7ea04..184edc062 100644
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/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
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 645637bf5..ac45c8c38 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/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
diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index 933b87af2..a8acc3a59 100644
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/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
diff --git a/src/mainboard/lippert/frontrunner/Kconfig b/src/mainboard/lippert/frontrunner/Kconfig
index fdf507d6a..f9e555e45 100644
--- a/src/mainboard/lippert/frontrunner/Kconfig
+++ b/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
diff --git a/src/mainboard/lippert/roadrunner-lx/Kconfig b/src/mainboard/lippert/roadrunner-lx/Kconfig
index 24ab417dc..9f20930ac 100644
--- a/src/mainboard/lippert/roadrunner-lx/Kconfig
+++ b/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
diff --git a/src/mainboard/lippert/spacerunner-lx/Kconfig b/src/mainboard/lippert/spacerunner-lx/Kconfig
index dda7ecc14..e1c989c7e 100644
--- a/src/mainboard/lippert/spacerunner-lx/Kconfig
+++ b/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
diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index 9f8529381..2ccca0fe1 100644
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/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
diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig
index 1c1694bdb..13c54e4d6 100644
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/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
diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig
index 602ba183b..b80a03c63 100644
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/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
diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig
index c72e49134..81e4548b2 100644
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/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
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 434bbb46e..b355dc9f3 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/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
diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig
index 92b759c78..4d480adaf 100644
--- a/src/mainboard/newisys/khepri/Kconfig
+++ b/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
diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig b/src/mainboard/nvidia/l1_2pvv/Kconfig
index 5794521b3..d6a5c12ac 100644
--- a/src/mainboard/nvidia/l1_2pvv/Kconfig
+++ b/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
diff --git a/src/mainboard/olpc/btest/Kconfig b/src/mainboard/olpc/btest/Kconfig
index 3b95a8ba5..520d6097f 100644
--- a/src/mainboard/olpc/btest/Kconfig
+++ b/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
diff --git a/src/mainboard/olpc/rev_a/Kconfig b/src/mainboard/olpc/rev_a/Kconfig
index 6c097c113..c2b391152 100644
--- a/src/mainboard/olpc/rev_a/Kconfig
+++ b/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
diff --git a/src/mainboard/pcengines/alix1c/Kconfig b/src/mainboard/pcengines/alix1c/Kconfig
index 4535588e4..0b815d807 100644
--- a/src/mainboard/pcengines/alix1c/Kconfig
+++ b/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
diff --git a/src/mainboard/rca/rm4100/Kconfig b/src/mainboard/rca/rm4100/Kconfig
index fbcf9070f..c0d13c9e2 100644
--- a/src/mainboard/rca/rm4100/Kconfig
+++ b/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
diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig
index 7bb448c00..a4ac792e2 100644
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/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
diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig
index a218b0a08..937a8c8bc 100644
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/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
diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index 76684b2f5..9b8702256 100644
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/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
diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig
index a0a06655c..810d2a602 100644
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/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
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index a3670737a..b6d665183 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/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
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index 9259b0b6f..4f8499c85 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/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
diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig
index 35b33ace7..03dc66628 100644
--- a/src/mainboard/technexion/tim5690/Kconfig
+++ b/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
diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig
index 21609decc..85d3f5b37 100644
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/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
diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig
index 33e40ede2..74f221408 100644
--- a/src/mainboard/thomson/ip1000/Kconfig
+++ b/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
diff --git a/src/mainboard/traverse/geos/Kconfig b/src/mainboard/traverse/geos/Kconfig
index 4147b37ba..c04ba0310 100644
--- a/src/mainboard/traverse/geos/Kconfig
+++ b/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
diff --git a/src/mainboard/tyan/s2735/Kconfig b/src/mainboard/tyan/s2735/Kconfig
index a387d1a4b..30fe9ebbb 100644
--- a/src/mainboard/tyan/s2735/Kconfig
+++ b/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
diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig
index 533525afb..233f2aede 100644
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/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
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index f5b30059f..564a37847 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/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
diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig
index 695d7584b..749c79a5a 100644
--- a/src/mainboard/tyan/s4880/Kconfig
+++ b/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
diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig
index 6993d1226..4dcbbaa04 100644
--- a/src/mainboard/tyan/s4882/Kconfig
+++ b/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
diff --git a/src/mainboard/winent/pl6064/Kconfig b/src/mainboard/winent/pl6064/Kconfig
index a85956333..09ad88aad 100644
--- a/src/mainboard/winent/pl6064/Kconfig
+++ b/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
diff --git a/src/mainboard/wyse/s50/Kconfig b/src/mainboard/wyse/s50/Kconfig
index 21d3eccf4..020465519 100644
--- a/src/mainboard/wyse/s50/Kconfig
+++ b/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
diff --git a/src/northbridge/intel/e7501/debug.c b/src/northbridge/intel/e7501/debug.c
index c116cb629..ed5fff140 100644
--- a/src/northbridge/intel/e7501/debug.c
+++ b/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(" ");
diff --git a/src/pc80/serial.c b/src/pc80/serial.c
index f7e457822..449f0bada 100644
--- a/src/pc80/serial.c
+++ b/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)