We call this cache as ram everywhere, so let's call it the same in Kconfig

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>

Index: include/assert.h
===================================================================
--- include/assert.h	(revision 5749)
+++ include/assert.h	(working copy)
@@ -20,7 +20,7 @@
 #ifndef __ASSERT_H__
 #define __ASSERT_H__
 
-#if defined(__PRE_RAM__) && !CONFIG_USE_DCACHE_RAM
+#if defined(__PRE_RAM__) && !CONFIG_CACHE_AS_RAM
 
 /* ROMCC versions */
 #define ASSERT(x) {						\
Index: include/cpu/x86/bist.h
===================================================================
--- include/cpu/x86/bist.h	(revision 5749)
+++ include/cpu/x86/bist.h	(working copy)
@@ -4,7 +4,7 @@
 static void report_bist_failure(u32 bist)
 {
 	if (bist != 0) {
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
                 printk(BIOS_EMERG, "BIST failed: %08x", bist);
 #else
 		print_emerg("BIST failed: ");
Index: cpu/Kconfig
===================================================================
--- cpu/Kconfig	(revision 5749)
+++ cpu/Kconfig	(working copy)
@@ -3,7 +3,7 @@
 source src/cpu/via/Kconfig
 source src/cpu/x86/Kconfig
 
-config USE_DCACHE_RAM
+config CACHE_AS_RAM
 	bool
 	default !ROMCC
 
Index: cpu/amd/model_gx2/syspreinit.c
===================================================================
--- cpu/amd/model_gx2/syspreinit.c	(revision 5749)
+++ cpu/amd/model_gx2/syspreinit.c	(working copy)
@@ -16,7 +16,7 @@
 void SystemPreInit(void)
 {
 	/* they want a jump ... */
-#ifndef CONFIG_USE_DCACHE_RAM
+#ifndef CONFIG_CACHE_AS_RAM
 	__asm__ __volatile__("jmp .+2\ninvd\njmp .+2\n");
 #endif
 	StartTimer1();
Index: cpu/amd/model_fxx/Kconfig
===================================================================
--- cpu/amd/model_fxx/Kconfig	(revision 5749)
+++ cpu/amd/model_fxx/Kconfig	(working copy)
@@ -1,6 +1,6 @@
 config CPU_AMD_MODEL_FXX
 	bool
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select MMX
 	select SSE
 	select SSE2
Index: cpu/amd/model_lx/syspreinit.c
===================================================================
--- cpu/amd/model_lx/syspreinit.c	(revision 5749)
+++ cpu/amd/model_lx/syspreinit.c	(working copy)
@@ -39,7 +39,7 @@
 {
 
 	/* they want a jump ... */
-#ifndef CONFIG_USE_DCACHE_RAM
+#ifndef CONFIG_CACHE_AS_RAM
 	__asm__ __volatile__("jmp .+2\ninvd\njmp .+2\n");
 #endif
 	StartTimer1();
Index: cpu/amd/model_10xxx/Kconfig
===================================================================
--- cpu/amd/model_10xxx/Kconfig	(revision 5749)
+++ cpu/amd/model_10xxx/Kconfig	(working copy)
@@ -1,6 +1,6 @@
 config CPU_AMD_MODEL_10XXX
 	bool
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select SSE
 	select SSE2
 
Index: cpu/x86/mtrr/earlymtrr.c
===================================================================
--- cpu/x86/mtrr/earlymtrr.c	(revision 5749)
+++ cpu/x86/mtrr/earlymtrr.c	(working copy)
@@ -62,7 +62,7 @@
 	enable_cache();
 }
 
-#if !defined(CONFIG_USE_DCACHE_RAM) || (CONFIG_USE_DCACHE_RAM == 0)
+#if !defined(CONFIG_CACHE_AS_RAM) || (CONFIG_CACHE_AS_RAM == 0)
 /* the fixed and variable MTTRs are power-up with random values,
  * clear them to MTRR_TYPE_UNCACHEABLE for safty.
  */
Index: cpu/intel/socket_FC_PGA370/Kconfig
===================================================================
--- cpu/intel/socket_FC_PGA370/Kconfig	(revision 5749)
+++ cpu/intel/socket_FC_PGA370/Kconfig	(working copy)
@@ -23,7 +23,7 @@
 	select CPU_INTEL_MODEL_68X
 	select MMX
 	select SSE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select TINY_BOOTBLOCK
 
 config DCACHE_RAM_BASE
Index: mainboard/iwill/dk8_htx/Kconfig
===================================================================
--- mainboard/iwill/dk8_htx/Kconfig	(revision 5754)
+++ mainboard/iwill/dk8_htx/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
Index: mainboard/iwill/dk8s2/Kconfig
===================================================================
--- mainboard/iwill/dk8s2/Kconfig	(revision 5754)
+++ mainboard/iwill/dk8s2/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
Index: mainboard/iwill/dk8x/Kconfig
===================================================================
--- mainboard/iwill/dk8x/Kconfig	(revision 5754)
+++ mainboard/iwill/dk8x/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
Index: mainboard/asrock/939a785gmh/Kconfig
===================================================================
--- mainboard/asrock/939a785gmh/Kconfig	(revision 5754)
+++ mainboard/asrock/939a785gmh/Kconfig	(working copy)
@@ -18,7 +18,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_BUS_CONFIG
 	select LIFT_BSP_APIC_ID
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_1024
Index: mainboard/getac/p470/Kconfig
===================================================================
--- mainboard/getac/p470/Kconfig	(revision 5754)
+++ mainboard/getac/p470/Kconfig	(working copy)
@@ -42,7 +42,7 @@
 	select UDELAY_LAPIC
 	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_1024
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select GFXUMA
 	select TINY_BOOTBLOCK
 
Index: mainboard/broadcom/blast/Kconfig
===================================================================
--- mainboard/broadcom/blast/Kconfig	(revision 5754)
+++ mainboard/broadcom/blast/Kconfig	(working copy)
@@ -13,7 +13,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
Index: mainboard/thomson/ip1000/Kconfig
===================================================================
--- mainboard/thomson/ip1000/Kconfig	(revision 5754)
+++ mainboard/thomson/ip1000/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select HAVE_MAINBOARD_RESOURCES
 	select HAVE_SMI_HANDLER
 	select GFXUMA
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select TINY_BOOTBLOCK
 
 config MAINBOARD_DIR
Index: mainboard/wyse/s50/Kconfig
===================================================================
--- mainboard/wyse/s50/Kconfig	(revision 5754)
+++ mainboard/wyse/s50/Kconfig	(working copy)
@@ -25,7 +25,7 @@
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select BOARD_ROMSIZE_KB_256
Index: mainboard/supermicro/h8dmr/Kconfig
===================================================================
--- mainboard/supermicro/h8dmr/Kconfig	(revision 5754)
+++ mainboard/supermicro/h8dmr/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_1024
Index: mainboard/supermicro/h8dme/Kconfig
===================================================================
--- mainboard/supermicro/h8dme/Kconfig	(revision 5754)
+++ mainboard/supermicro/h8dme/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	#select AP_CODE_IN_CAR
 	select LIFT_BSP_APIC_ID
Index: mainboard/supermicro/h8dmr_fam10/Kconfig
===================================================================
--- mainboard/supermicro/h8dmr_fam10/Kconfig	(revision 5754)
+++ mainboard/supermicro/h8dmr_fam10/Kconfig	(working copy)
@@ -11,7 +11,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select AMDMCT
Index: mainboard/supermicro/h8qme_fam10/Kconfig
===================================================================
--- mainboard/supermicro/h8qme_fam10/Kconfig	(revision 5754)
+++ mainboard/supermicro/h8qme_fam10/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select AMDMCT
Index: mainboard/kontron/986lcd-m/Kconfig
===================================================================
--- mainboard/kontron/986lcd-m/Kconfig	(revision 5754)
+++ mainboard/kontron/986lcd-m/Kconfig	(working copy)
@@ -19,7 +19,7 @@
 	select MMCONF_SUPPORT
 	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_1024
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select GFXUMA
 	select TINY_BOOTBLOCK
 
Index: mainboard/kontron/kt690/Kconfig
===================================================================
--- mainboard/kontron/kt690/Kconfig	(revision 5754)
+++ mainboard/kontron/kt690/Kconfig	(working copy)
@@ -16,7 +16,7 @@
 	select HAVE_MP_TABLE
 	select HAVE_MAINBOARD_RESOURCES
 	select GFXUMA
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_1024
Index: mainboard/gigabyte/m57sli/Kconfig
===================================================================
--- mainboard/gigabyte/m57sli/Kconfig	(revision 5754)
+++ mainboard/gigabyte/m57sli/Kconfig	(working copy)
@@ -13,7 +13,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select HAVE_ACPI_TABLES
Index: mainboard/gigabyte/ma78gm/Kconfig
===================================================================
--- mainboard/gigabyte/ma78gm/Kconfig	(revision 5754)
+++ mainboard/gigabyte/ma78gm/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select GENERATE_PIRQ_TABLE
 	select GENERATE_MP_TABLE
 	select HAVE_MAINBOARD_RESOURCES
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select LIFT_BSP_APIC_ID
Index: mainboard/gigabyte/ga_2761gxdk/Kconfig
===================================================================
--- mainboard/gigabyte/ga_2761gxdk/Kconfig	(revision 5754)
+++ mainboard/gigabyte/ga_2761gxdk/Kconfig	(working copy)
@@ -11,7 +11,7 @@
 	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select K8_REV_F_SUPPORT
Index: mainboard/gigabyte/ma785gmt/Kconfig
===================================================================
--- mainboard/gigabyte/ma785gmt/Kconfig	(revision 5754)
+++ mainboard/gigabyte/ma785gmt/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select GENERATE_PIRQ_TABLE
 	select GENERATE_MP_TABLE
 	select HAVE_MAINBOARD_RESOURCES
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select LIFT_BSP_APIC_ID
Index: mainboard/traverse/geos/Kconfig
===================================================================
--- mainboard/traverse/geos/Kconfig	(revision 5754)
+++ mainboard/traverse/geos/Kconfig	(working copy)
@@ -9,7 +9,7 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_1024
 
 config MAINBOARD_DIR
Index: mainboard/digitallogic/msm800sev/Kconfig
===================================================================
--- mainboard/digitallogic/msm800sev/Kconfig	(revision 5754)
+++ mainboard/digitallogic/msm800sev/Kconfig	(working copy)
@@ -10,7 +10,7 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: mainboard/digitallogic/adl855pc/Kconfig
===================================================================
--- mainboard/digitallogic/adl855pc/Kconfig	(revision 5754)
+++ mainboard/digitallogic/adl855pc/Kconfig	(working copy)
@@ -11,7 +11,7 @@
 	select HAVE_PIRQ_TABLE
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_1024
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select TINY_BOOTBLOCK
 
 config MAINBOARD_DIR
Index: mainboard/olpc/btest/Kconfig
===================================================================
--- mainboard/olpc/btest/Kconfig	(revision 5754)
+++ mainboard/olpc/btest/Kconfig	(working copy)
@@ -7,7 +7,7 @@
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 
Index: mainboard/olpc/rev_a/Kconfig
===================================================================
--- mainboard/olpc/rev_a/Kconfig	(revision 5754)
+++ mainboard/olpc/rev_a/Kconfig	(working copy)
@@ -7,7 +7,7 @@
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 
Index: mainboard/amd/mahogany/Kconfig
===================================================================
--- mainboard/amd/mahogany/Kconfig	(revision 5754)
+++ mainboard/amd/mahogany/Kconfig	(working copy)
@@ -17,7 +17,7 @@
 	select HAVE_MAINBOARD_RESOURCES
 	select HAVE_BUS_CONFIG
 	select LIFT_BSP_APIC_ID
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_1024
Index: mainboard/amd/pistachio/Kconfig
===================================================================
--- mainboard/amd/pistachio/Kconfig	(revision 5754)
+++ mainboard/amd/pistachio/Kconfig	(working copy)
@@ -13,7 +13,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
Index: mainboard/amd/dbm690t/Kconfig
===================================================================
--- mainboard/amd/dbm690t/Kconfig	(revision 5754)
+++ mainboard/amd/dbm690t/Kconfig	(working copy)
@@ -16,7 +16,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_MAINBOARD_RESOURCES
 	select HAVE_BUS_CONFIG
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_1024
Index: mainboard/amd/rumba/Kconfig
===================================================================
--- mainboard/amd/rumba/Kconfig	(revision 5754)
+++ mainboard/amd/rumba/Kconfig	(working copy)
@@ -25,7 +25,7 @@
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 
Index: mainboard/amd/serengeti_cheetah/Kconfig
===================================================================
--- mainboard/amd/serengeti_cheetah/Kconfig	(revision 5754)
+++ mainboard/amd/serengeti_cheetah/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	#select AP_CODE_IN_CAR
Index: mainboard/amd/mahogany_fam10/Kconfig
===================================================================
--- mainboard/amd/mahogany_fam10/Kconfig	(revision 5754)
+++ mainboard/amd/mahogany_fam10/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select GENERATE_PIRQ_TABLE
 	select GENERATE_MP_TABLE
 	select HAVE_MAINBOARD_RESOURCES
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select LIFT_BSP_APIC_ID
Index: mainboard/amd/tilapia_fam10/Kconfig
===================================================================
--- mainboard/amd/tilapia_fam10/Kconfig	(revision 5754)
+++ mainboard/amd/tilapia_fam10/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select GENERATE_PIRQ_TABLE
 	select GENERATE_MP_TABLE
 	select HAVE_MAINBOARD_RESOURCES
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select LIFT_BSP_APIC_ID
Index: mainboard/amd/norwich/Kconfig
===================================================================
--- mainboard/amd/norwich/Kconfig	(revision 5754)
+++ mainboard/amd/norwich/Kconfig	(working copy)
@@ -9,7 +9,7 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: mainboard/amd/serengeti_cheetah_fam10/Kconfig
===================================================================
--- mainboard/amd/serengeti_cheetah_fam10/Kconfig	(revision 5754)
+++ mainboard/amd/serengeti_cheetah_fam10/Kconfig	(working copy)
@@ -13,7 +13,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select SERIAL_CPU_INIT
Index: mainboard/amd/db800/Kconfig
===================================================================
--- mainboard/amd/db800/Kconfig	(revision 5754)
+++ mainboard/amd/db800/Kconfig	(working copy)
@@ -10,7 +10,7 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: mainboard/rca/rm4100/Kconfig
===================================================================
--- mainboard/rca/rm4100/Kconfig	(revision 5754)
+++ mainboard/rca/rm4100/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select HAVE_MAINBOARD_RESOURCES
 	select HAVE_SMI_HANDLER
 	select GFXUMA
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select TINY_BOOTBLOCK
 
 config MAINBOARD_DIR
Index: mainboard/iei/pcisa-lx-800-r10/Kconfig
===================================================================
--- mainboard/iei/pcisa-lx-800-r10/Kconfig	(revision 5754)
+++ mainboard/iei/pcisa-lx-800-r10/Kconfig	(working copy)
@@ -9,7 +9,7 @@
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: mainboard/hp/dl145_g3/Kconfig
===================================================================
--- mainboard/hp/dl145_g3/Kconfig	(revision 5754)
+++ mainboard/hp/dl145_g3/Kconfig	(working copy)
@@ -13,7 +13,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_512
Index: mainboard/artecgroup/dbe61/Kconfig
===================================================================
--- mainboard/artecgroup/dbe61/Kconfig	(revision 5754)
+++ mainboard/artecgroup/dbe61/Kconfig	(working copy)
@@ -9,7 +9,7 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_256
 
 config MAINBOARD_DIR
Index: mainboard/pcengines/alix1c/Kconfig
===================================================================
--- mainboard/pcengines/alix1c/Kconfig	(revision 5754)
+++ mainboard/pcengines/alix1c/Kconfig	(working copy)
@@ -10,7 +10,7 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: mainboard/pcengines/alix2d3/Kconfig
===================================================================
--- mainboard/pcengines/alix2d3/Kconfig	(revision 5754)
+++ mainboard/pcengines/alix2d3/Kconfig	(working copy)
@@ -9,7 +9,7 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: mainboard/tyan/s2912/Kconfig
===================================================================
--- mainboard/tyan/s2912/Kconfig	(revision 5754)
+++ mainboard/tyan/s2912/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select K8_REV_F_SUPPORT
Index: mainboard/tyan/s2735/Kconfig
===================================================================
--- mainboard/tyan/s2735/Kconfig	(revision 5754)
+++ mainboard/tyan/s2735/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select HAVE_MP_TABLE
 	select UDELAY_TSC
 	select HAVE_OPTION_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select USE_WATCHDOG_ON_BOOT
 	select BOARD_ROMSIZE_KB_512
 
Index: mainboard/tyan/s4880/Kconfig
===================================================================
--- mainboard/tyan/s4880/Kconfig	(revision 5754)
+++ mainboard/tyan/s4880/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
Index: mainboard/tyan/s4882/Kconfig
===================================================================
--- mainboard/tyan/s4882/Kconfig	(revision 5754)
+++ mainboard/tyan/s4882/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
Index: mainboard/tyan/s2912_fam10/Kconfig
===================================================================
--- mainboard/tyan/s2912_fam10/Kconfig	(revision 5754)
+++ mainboard/tyan/s2912_fam10/Kconfig	(working copy)
@@ -11,7 +11,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_1024
Index: mainboard/lippert/roadrunner-lx/Kconfig
===================================================================
--- mainboard/lippert/roadrunner-lx/Kconfig	(revision 5754)
+++ mainboard/lippert/roadrunner-lx/Kconfig	(working copy)
@@ -10,7 +10,7 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: mainboard/lippert/frontrunner/Kconfig
===================================================================
--- mainboard/lippert/frontrunner/Kconfig	(revision 5754)
+++ mainboard/lippert/frontrunner/Kconfig	(working copy)
@@ -7,7 +7,7 @@
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5535
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_PIRQ_TABLE
 	select BOARD_ROMSIZE_KB_256
 
Index: mainboard/lippert/spacerunner-lx/Kconfig
===================================================================
--- mainboard/lippert/spacerunner-lx/Kconfig	(revision 5754)
+++ mainboard/lippert/spacerunner-lx/Kconfig	(working copy)
@@ -11,7 +11,7 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: mainboard/via/vt8454c/Kconfig
===================================================================
--- mainboard/via/vt8454c/Kconfig	(revision 5754)
+++ mainboard/via/vt8454c/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select HAVE_HARD_RESET
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select TINY_BOOTBLOCK
 
 config MAINBOARD_DIR
Index: mainboard/lanner/em8510/Kconfig
===================================================================
--- mainboard/lanner/em8510/Kconfig	(revision 5754)
+++ mainboard/lanner/em8510/Kconfig	(working copy)
@@ -11,7 +11,7 @@
 	select HAVE_PIRQ_TABLE
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select TINY_BOOTBLOCK
 
 config MAINBOARD_DIR
Index: mainboard/ibase/mb899/Kconfig
===================================================================
--- mainboard/ibase/mb899/Kconfig	(revision 5754)
+++ mainboard/ibase/mb899/Kconfig	(working copy)
@@ -19,7 +19,7 @@
 	select MMCONF_SUPPORT
 	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_512
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select GFXUMA
 	select TINY_BOOTBLOCK
 
Index: mainboard/msi/ms7135/Kconfig
===================================================================
--- mainboard/msi/ms7135/Kconfig	(revision 5754)
+++ mainboard/msi/ms7135/Kconfig	(working copy)
@@ -13,7 +13,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: mainboard/msi/ms9282/Kconfig
===================================================================
--- mainboard/msi/ms9282/Kconfig	(revision 5754)
+++ mainboard/msi/ms9282/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
Index: mainboard/msi/ms9185/Kconfig
===================================================================
--- mainboard/msi/ms9185/Kconfig	(revision 5754)
+++ mainboard/msi/ms9185/Kconfig	(working copy)
@@ -13,7 +13,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_512
Index: mainboard/msi/ms9652_fam10/Kconfig
===================================================================
--- mainboard/msi/ms9652_fam10/Kconfig	(revision 5754)
+++ mainboard/msi/ms9652_fam10/Kconfig	(working copy)
@@ -10,7 +10,7 @@
 	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_OPTION_TABLE
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
Index: mainboard/msi/ms7260/Kconfig
===================================================================
--- mainboard/msi/ms7260/Kconfig	(revision 5754)
+++ mainboard/msi/ms7260/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select K8_REV_F_SUPPORT
Index: mainboard/arima/hdama/Kconfig
===================================================================
--- mainboard/arima/hdama/Kconfig	(revision 5754)
+++ mainboard/arima/hdama/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_512
Index: mainboard/sunw/ultra40/Kconfig
===================================================================
--- mainboard/sunw/ultra40/Kconfig	(revision 5754)
+++ mainboard/sunw/ultra40/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_1024
 
Index: mainboard/newisys/khepri/Kconfig
===================================================================
--- mainboard/newisys/khepri/Kconfig	(revision 5754)
+++ mainboard/newisys/khepri/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
Index: mainboard/jetway/pa78vm5/Kconfig
===================================================================
--- mainboard/jetway/pa78vm5/Kconfig	(revision 5754)
+++ mainboard/jetway/pa78vm5/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select GENERATE_PIRQ_TABLE
 	select GENERATE_MP_TABLE
 	select HAVE_MAINBOARD_RESOURCES
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select LIFT_BSP_APIC_ID
Index: mainboard/technexion/tim8690/Kconfig
===================================================================
--- mainboard/technexion/tim8690/Kconfig	(revision 5754)
+++ mainboard/technexion/tim8690/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
Index: mainboard/technexion/tim5690/Kconfig
===================================================================
--- mainboard/technexion/tim5690/Kconfig	(revision 5754)
+++ mainboard/technexion/tim5690/Kconfig	(working copy)
@@ -14,7 +14,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select HAVE_ACPI_TABLES
Index: mainboard/winent/pl6064/Kconfig
===================================================================
--- mainboard/winent/pl6064/Kconfig	(revision 5754)
+++ mainboard/winent/pl6064/Kconfig	(working copy)
@@ -10,7 +10,7 @@
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select UDELAY_TSC
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: mainboard/ibm/e326/Kconfig
===================================================================
--- mainboard/ibm/e326/Kconfig	(revision 5754)
+++ mainboard/ibm/e326/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
Index: mainboard/ibm/e325/Kconfig
===================================================================
--- mainboard/ibm/e325/Kconfig	(revision 5754)
+++ mainboard/ibm/e325/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
Index: mainboard/nvidia/l1_2pvv/Kconfig
===================================================================
--- mainboard/nvidia/l1_2pvv/Kconfig	(revision 5754)
+++ mainboard/nvidia/l1_2pvv/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select LIFT_BSP_APIC_ID
 	select K8_REV_F_SUPPORT
Index: mainboard/intel/d945gclf/Kconfig
===================================================================
--- mainboard/intel/d945gclf/Kconfig	(revision 5754)
+++ mainboard/intel/d945gclf/Kconfig	(working copy)
@@ -41,7 +41,7 @@
 	select HAVE_ACPI_TABLES
 	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_512
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select GFXUMA
 	select TINY_BOOTBLOCK
 
Index: mainboard/intel/mtarvon/Kconfig
===================================================================
--- mainboard/intel/mtarvon/Kconfig	(revision 5755)
+++ mainboard/intel/mtarvon/Kconfig	(working copy)
@@ -7,7 +7,7 @@
 	select NORTHBRIDGE_INTEL_I3100
 	select SOUTHBRIDGE_INTEL_I3100
 	select SUPERIO_INTEL_I3100
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
Index: mainboard/asus/a8v-e_se/Kconfig
===================================================================
--- mainboard/asus/a8v-e_se/Kconfig	(revision 5754)
+++ mainboard/asus/a8v-e_se/Kconfig	(working copy)
@@ -10,7 +10,7 @@
 	select SOUTHBRIDGE_VIA_VT8237R
 	select SOUTHBRIDGE_VIA_K8T890
 	select SUPERIO_WINBOND_W83627EHG
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_TABLES
 	select HAVE_MP_TABLE
Index: mainboard/asus/a8n_e/Kconfig
===================================================================
--- mainboard/asus/a8n_e/Kconfig	(revision 5754)
+++ mainboard/asus/a8n_e/Kconfig	(working copy)
@@ -12,7 +12,7 @@
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
 
Index: mainboard/asus/m2v-mx_se/Kconfig
===================================================================
--- mainboard/asus/m2v-mx_se/Kconfig	(revision 5754)
+++ mainboard/asus/m2v-mx_se/Kconfig	(working copy)
@@ -27,7 +27,7 @@
 	select SOUTHBRIDGE_VIA_VT8237R
 	select SOUTHBRIDGE_VIA_K8M890
 	select SUPERIO_ITE_IT8712F
-	select USE_DCACHE_RAM
+	select CACHE_AS_RAM
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
Index: console/Makefile.inc
===================================================================
--- console/Makefile.inc	(revision 5749)
+++ console/Makefile.inc	(working copy)
@@ -7,7 +7,7 @@
 smmobj-y += vtxprintf.o
 
 initobj-y += vtxprintf.o
-initobj-$(CONFIG_USE_DCACHE_RAM) += console.o
+initobj-$(CONFIG_CACHE_AS_RAM) += console.o
 
 driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.o
 driver-$(CONFIG_USBDEBUG) += usbdebug_console.o
Index: lib/usbdebug.c
===================================================================
--- lib/usbdebug.c	(revision 5749)
+++ lib/usbdebug.c	(working copy)
@@ -22,7 +22,7 @@
 #if !defined(__ROMCC__)
 #include <console/console.h>
 #else
-#if CONFIG_USE_DCACHE_RAM==0
+#if CONFIG_CACHE_AS_RAM==0
 #define printk(BIOS_DEBUG, fmt, arg...)   do {} while(0)
 #endif
 #endif
Index: lib/generic_sdram.c
===================================================================
--- lib/generic_sdram.c	(revision 5749)
+++ lib/generic_sdram.c	(working copy)
@@ -6,7 +6,7 @@
 
 static inline void print_debug_sdram_8(const char *strval, uint32_t val)
 {
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
         printk(BIOS_DEBUG, "%s%02x\n", strval, val);
 #else
         print_debug(strval); print_debug_hex8(val); print_debug("\n");
Index: lib/ramtest.c
===================================================================
--- lib/ramtest.c	(revision 5749)
+++ lib/ramtest.c	(working copy)
@@ -51,7 +51,7 @@
 	/*
 	 * Fill.
 	 */
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
 	printk(BIOS_DEBUG, "%08lx\nDRAM filled\n", addr);
 #else
 	print_debug_hex32(addr);
@@ -88,7 +88,7 @@
 	/*
 	 * Verify.
 	 */
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
 				printk(BIOS_DEBUG, "Aborting.\n");
 #else
 				print_debug("Aborting.\n");
@@ -132,14 +132,14 @@
 		}
 	}
 	/* Display final address */
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
 	printk(BIOS_DEBUG, "%08lx", addr);
 #else
 	print_debug_hex32(addr);
 #endif
 
 	if (i) {
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
 	printk(BIOS_DEBUG, "Done.\n");
 #else
 	print_debug("Done.\n");
Index: northbridge/intel/e7501/debug.c
===================================================================
--- northbridge/intel/e7501/debug.c	(revision 5749)
+++ northbridge/intel/e7501/debug.c	(working copy)
@@ -39,7 +39,7 @@
 	for(i = 0; i < 256; i++) {
 		unsigned char val;
 		if ((i & 0x0f) == 0) {
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
 					printk(BIOS_DEBUG, "\n%02x: ", j);
 #else
 					print_debug("\n");
@@ -126,7 +126,7 @@
 					break;
 				}
 				byte = status & 0xff;
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
                                         printk(BIOS_DEBUG, "\n%02x: ", j);
 #else
 					print_debug("\n");
@@ -163,7 +163,7 @@
 					break;
 				}
 				byte = status & 0xff;
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
 		printk(BIOS_DEBUG, "smbus: %02x", device);
 #else
                 print_debug("smbus: ");
@@ -195,7 +195,7 @@
 				break;
                         }
                         if ((j & 0xf) == 0) {
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
 				printk(BIOS_DEBUG, "\n%02x: ",j);
 #else
                 	        print_debug("\n");
@@ -204,7 +204,7 @@
 #endif
                         }
                         byte = status & 0xff;
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
                         printk(BIOS_DEBUG, "%02x ", byte);
 #else
                         print_debug_hex8(byte);
@@ -219,7 +219,7 @@
 {
 
 	int i;
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
 			printk(BIOS_DEBUG, "%02x:", i);
 #else
                         print_debug_hex8(i);
@@ -236,7 +236,7 @@
 #endif
                 }
                 val = inb(port);
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_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_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
 			printk(BIOS_DEBUG, "\n%08x:", i);
 #else
 			print_debug("\n");
@@ -263,7 +263,7 @@
 			print_debug(":");
 #endif
 		}
-#if CONFIG_USE_DCACHE_RAM
+#if CONFIG_CACHE_AS_RAM
 		printk(BIOS_DEBUG, " %02x", (unsigned char)*((unsigned char *)i));
 #else
 		print_debug(" ");
Index: northbridge/intel/i3100/raminit.c
===================================================================
--- northbridge/intel/i3100/raminit.c	(revision 5749)
+++ northbridge/intel/i3100/raminit.c	(working copy)
@@ -1212,7 +1212,7 @@
 	pci_write_config16(ctrl->f0, MCHSCRB, data16);
 
 	/* The memory is now setup, use it */
-#if CONFIG_USE_DCACHE_RAM == 0
+#if CONFIG_CACHE_AS_RAM == 0
 	cache_lbmem(MTRR_TYPE_WRBACK);
 #endif
 }
Index: pc80/serial.c
===================================================================
--- pc80/serial.c	(revision 5749)
+++ pc80/serial.c	(working copy)
@@ -28,7 +28,7 @@
 #define UART_LCS	CONFIG_TTYS0_LCS
 
 
-#if CONFIG_USE_DCACHE_RAM == 0
+#if CONFIG_CACHE_AS_RAM == 0
 
 /* Data */
 #define UART_RBR 0x00
@@ -97,7 +97,7 @@
 }
 
 #else
-/* CONFIG_USE_DCACHE_RAM == 1 */
+/* CONFIG_CACHE_AS_RAM == 1 */
 
 extern void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs);
 void uart_init(void)
Index: pc80/Makefile.inc
===================================================================
--- pc80/Makefile.inc	(revision 5749)
+++ pc80/Makefile.inc	(working copy)
@@ -4,7 +4,7 @@
 obj-$(CONFIG_UDELAY_IO) += udelay_io.o
 obj-y += keyboard.o
 initobj-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.o
-initobj-$(CONFIG_USE_DCACHE_RAM) += serial.o
+initobj-$(CONFIG_CACHE_AS_RAM) += serial.o
 subdirs-y += vga
 
 $(obj)/pc80/mc146818rtc.o : $(OPTION_TABLE_H)
