===================================================================
@@ -140,10 +140,6 @@
hex
default 0x4000
-config USE_PRINTK_IN_CAR
- bool
- default n
-
config MAX_CPUS
int
default 1
===================================================================
@@ -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: ");
===================================================================
@@ -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) { \
===================================================================
@@ -3,7 +3,6 @@
select UDELAY_TSC
select MMX
select SSE2
- select USE_PRINTK_IN_CAR
config DCACHE_RAM_BASE
hex
===================================================================
@@ -1,6 +1,5 @@
config CPU_AMD_MODEL_FXX
bool
- select USE_PRINTK_IN_CAR
select USE_DCACHE_RAM
select MMX
select SSE
===================================================================
@@ -1,6 +1,5 @@
config CPU_AMD_MODEL_10XXX
bool
- select USE_PRINTK_IN_CAR
select USE_DCACHE_RAM
select SSE
select SSE2
===================================================================
@@ -23,7 +23,6 @@
select CPU_INTEL_MODEL_68X
select MMX
select SSE
- select USE_PRINTK_IN_CAR
select USE_DCACHE_RAM
select TINY_BOOTBLOCK
===================================================================
@@ -12,7 +12,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -16,7 +16,6 @@
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 @@
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
===================================================================
@@ -37,7 +37,6 @@
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
===================================================================
@@ -11,7 +11,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -25,7 +25,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -9,7 +9,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -15,7 +15,6 @@
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
===================================================================
@@ -14,7 +14,6 @@
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
===================================================================
@@ -9,7 +9,6 @@
select PIRQ_ROUTE
select UDELAY_TSC
select USE_DCACHE_RAM
- select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_256
config MAINBOARD_DIR
===================================================================
@@ -9,7 +9,6 @@
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
===================================================================
@@ -8,7 +8,6 @@
select PIRQ_ROUTE
select UDELAY_TSC
select USE_DCACHE_RAM
- select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_1024
config MAINBOARD_DIR
===================================================================
@@ -11,7 +11,6 @@
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
===================================================================
@@ -9,7 +9,6 @@
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
===================================================================
@@ -6,7 +6,6 @@
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
===================================================================
@@ -6,7 +6,6 @@
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
===================================================================
@@ -15,7 +15,6 @@
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
===================================================================
@@ -11,7 +11,6 @@
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
===================================================================
@@ -14,7 +14,6 @@
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
===================================================================
@@ -25,7 +25,6 @@
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
===================================================================
@@ -12,7 +12,6 @@
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
===================================================================
@@ -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"
@@ -65,11 +63,7 @@
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
train_ram(id.nodeid, sysinfo, sysinfox);
===================================================================
@@ -11,7 +11,6 @@
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
===================================================================
@@ -11,7 +11,6 @@
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
===================================================================
@@ -8,7 +8,6 @@
select PIRQ_ROUTE
select UDELAY_TSC
select USE_DCACHE_RAM
- select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_256
config MAINBOARD_DIR
===================================================================
@@ -11,7 +11,6 @@
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
===================================================================
@@ -9,7 +9,6 @@
select PIRQ_ROUTE
select UDELAY_TSC
select USE_DCACHE_RAM
- select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_256
config MAINBOARD_DIR
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -8,7 +8,6 @@
select HAVE_PIRQ_TABLE
select PIRQ_ROUTE
select USE_DCACHE_RAM
- select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_256
config MAINBOARD_DIR
===================================================================
@@ -11,7 +11,6 @@
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
===================================================================
@@ -8,7 +8,6 @@
select PIRQ_ROUTE
select UDELAY_TSC
select USE_DCACHE_RAM
- select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_256
config MAINBOARD_DIR
===================================================================
@@ -9,7 +9,6 @@
select PIRQ_ROUTE
select UDELAY_TSC
select USE_DCACHE_RAM
- select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_512
config MAINBOARD_DIR
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -15,7 +15,6 @@
select USE_DCACHE_RAM
select USE_WATCHDOG_ON_BOOT
select BOARD_ROMSIZE_KB_512
- select USE_PRINTK_IN_CAR
config MAINBOARD_DIR
string
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -9,7 +9,6 @@
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
===================================================================
@@ -9,7 +9,6 @@
select PIRQ_ROUTE
select UDELAY_TSC
select USE_DCACHE_RAM
- select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_512
config MAINBOARD_DIR
===================================================================
@@ -6,7 +6,6 @@
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
===================================================================
@@ -9,7 +9,6 @@
select PIRQ_ROUTE
select UDELAY_TSC
select USE_DCACHE_RAM
- select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_512
config MAINBOARD_DIR
===================================================================
@@ -15,7 +15,6 @@
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
===================================================================
@@ -13,7 +13,6 @@
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
===================================================================
@@ -12,7 +12,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -11,7 +11,6 @@
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
===================================================================
@@ -8,7 +8,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -12,7 +12,6 @@
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
===================================================================
@@ -12,7 +12,6 @@
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
===================================================================
@@ -9,7 +9,6 @@
select PIRQ_ROUTE
select UDELAY_TSC
select USE_DCACHE_RAM
- select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_512
config MAINBOARD_DIR
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -37,7 +37,6 @@
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
===================================================================
@@ -13,7 +13,6 @@
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
===================================================================
@@ -8,7 +8,6 @@
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
===================================================================
@@ -10,7 +10,6 @@
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
===================================================================
@@ -26,7 +26,6 @@
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
===================================================================
@@ -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
===================================================================
@@ -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");
===================================================================
@@ -51,7 +51,7 @@
/*
* 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 @@
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 @@
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 @@
/*
* 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 @@
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 @@
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 @@
#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 @@
}
}
/* 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 @@
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 @@
* 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 @@
/* 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");
===================================================================
@@ -39,7 +39,7 @@
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 @@
#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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#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 @@
{
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 @@
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 @@
#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 @@
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 @@
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(" ");
===================================================================
@@ -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 @@
}
#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)
===================================================================
@@ -1533,14 +1533,6 @@
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,42 +1638,7 @@
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.
\subsubsection{boot sequence}
See patch. 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>