[coreboot] New patch to review for coreboot: 7bd0eb8 Flag mainboards with CACHE_AS_RAM and BIG_BOOTBLOCK

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Mon Oct 24 11:43:56 CEST 2011 

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/333

-gerrit

commit 7bd0eb85e60408ec0a672222a1a647d97559dfa2
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sun Oct 23 21:11:38 2011 +0300

    Flag mainboards with CACHE_AS_RAM and BIG_BOOTBLOCK
    
    For some reason, these boards have not changed to use tiny bootblock
    even though they use Cache-As-Ram already. Either they didn't work
    or the developer had difficulties understanding all the associated
    Kconfig entries :]
    
    Tiny bootblock requires prefix fallback and optionally
    may boot with prefix normal. If I read correctly, with big bootblock,
    any prefix was possible. Therefore, silently changing this would break
    setups that used any other prefix than fallback. Even the other
    default prefix of normal might not work.
    
    The prefix doesn't reset to fallback if one pulls this from git, right?
    
    Suggested use: remove USES_BIG_BOOTBLOCK tags as soon as there is
    confirmation we do not introduce regression.
    
    As a quick test, after this patchset abuild -C creates functionally
    equivalent config.h files for all mainboards.
    
    Change-Id: I8fa2200340ccf0df0b3eaf776d2609ee52f11412
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/Kconfig                                  |    2 +-
 src/arch/x86/Kconfig                         |   27 ++++++++++++++++++++++++-
 src/arch/x86/Makefile.inc                    |    7 ++---
 src/cpu/amd/car/cache_as_ram.inc             |    2 +-
 src/cpu/intel/car/cache_as_ram.inc           |    2 +-
 src/cpu/intel/model_106cx/cache_as_ram.inc   |    2 +-
 src/cpu/intel/model_6ex/cache_as_ram.inc     |    2 +-
 src/cpu/intel/model_6fx/cache_as_ram.inc     |    2 +-
 src/cpu/via/car/cache_as_ram.inc             |    2 +-
 src/mainboard/aaeon/pfm-540i_revb/Kconfig    |    2 +-
 src/mainboard/amd/db800/Kconfig              |    2 +-
 src/mainboard/amd/norwich/Kconfig            |    2 +-
 src/mainboard/amd/rumba/Kconfig              |    2 +-
 src/mainboard/artecgroup/dbe61/Kconfig       |    2 +-
 src/mainboard/asus/a8v-e_deluxe/Kconfig      |    2 +-
 src/mainboard/asus/a8v-e_se/Kconfig          |    2 +-
 src/mainboard/asus/mew-am/Kconfig            |    2 +-
 src/mainboard/asus/mew-vm/Kconfig            |    2 +-
 src/mainboard/bcom/winnetp680/Kconfig        |    2 +-
 src/mainboard/digitallogic/msm800sev/Kconfig |    2 +-
 src/mainboard/ecs/p6iwp-fe/Kconfig           |    2 +-
 src/mainboard/emulation/qemu-x86/Kconfig     |    1 +
 src/mainboard/hp/e_vectra_p2706t/Kconfig     |    2 +-
 src/mainboard/iei/pcisa-lx-800-r10/Kconfig   |    2 +-
 src/mainboard/intel/eagleheights/Kconfig     |    2 +-
 src/mainboard/intel/mtarvon/Kconfig          |    2 +-
 src/mainboard/jetway/j7f24/Kconfig           |    2 +-
 src/mainboard/lenovo/x60/Kconfig             |    2 +-
 src/mainboard/lippert/frontrunner/Kconfig    |    2 +-
 src/mainboard/lippert/hurricane-lx/Kconfig   |    2 +-
 src/mainboard/lippert/literunner-lx/Kconfig  |    2 +-
 src/mainboard/lippert/roadrunner-lx/Kconfig  |    2 +-
 src/mainboard/lippert/spacerunner-lx/Kconfig |    2 +-
 src/mainboard/mitac/6513wu/Kconfig           |    2 +-
 src/mainboard/msi/ms6178/Kconfig             |    2 +-
 src/mainboard/nec/powermate2000/Kconfig      |    2 +-
 src/mainboard/pcengines/alix1c/Kconfig       |    2 +-
 src/mainboard/pcengines/alix2d/Kconfig       |    2 +-
 src/mainboard/roda/rk886ex/Kconfig           |    2 +-
 src/mainboard/traverse/geos/Kconfig          |    2 +-
 src/mainboard/tyan/s2735/Kconfig             |    2 +-
 src/mainboard/via/epia-cn/Kconfig            |    2 +-
 src/mainboard/via/epia-m700/Kconfig          |    2 +-
 src/mainboard/via/pc2500e/Kconfig            |    2 +-
 src/mainboard/winent/pl6064/Kconfig          |    2 +-
 src/mainboard/wyse/s50/Kconfig               |    2 +-
 46 files changed, 72 insertions(+), 49 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index 525d452..f823d7b 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -881,7 +881,7 @@ config ENABLE_APIC_EXT_ID
 
 config WARNINGS_ARE_ERRORS
 	bool
-	default y
+	default n
 
 config ID_SECTION_OFFSET
 	hex
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 01c98d3..7c3fe9b 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -38,6 +38,23 @@ config MAYBE_CACHE_AS_RAM
 	bool
 	default n
 
+config USES_BIG_BOOTBLOCK
+	bool
+	default n
+
+config SWITCH_TO_TINY_BOOTBLOCK
+	bool "Switch setup to tiny bootblock (experimental)"
+	default n
+	depends on EXPERT
+	depends on USES_BIG_BOOTBLOCK
+	help
+           Your mainboard has been converted to use Cache-As-Ram, but
+           for some reason it still uses big bootblock.
+           Make sure you have CBFS_PREFIX=fallback. While other
+           prefixes worked for big bootblock, they don't for tiny one.
+
+	   Beware: This may leave your system non-bootable!
+
 config CACHE_AS_RAM_OVERRIDE
 	bool "Enable Cache-As-Ram (experimental)"
 	default n
@@ -47,6 +64,7 @@ config CACHE_AS_RAM_OVERRIDE
 	   Your mainboard has been converted to use Cache-As-Ram, but
 	   we have not yet received any confirmation that it actually
 	   works for this setup.
+
 	   Beware: This may leave your system non-bootable!
 
 config CACHE_AS_RAM
@@ -58,16 +76,20 @@ config CACHE_AS_RAM
 
 config BIG_BOOTBLOCK
 	bool
+	default n if BOARD_EMULATION_QEMU_X86
+	default n if SWITCH_TO_TINY_BOOTBLOCK
+	default y if USES_BIG_BOOTBLOCK
 	default n if CACHE_AS_RAM
 	default y
 
+if !BIG_BOOTBLOCK
+
 # We had to rename the choice options under arch/ because otherwise
 # the options would conflict between different architectures despite
 # the if ARCH_xxx guarding the arch/xxx/Kconfig sourcing.
 choice
 	prompt "Bootblock behaviour"
 	default X86_BOOTBLOCK_SIMPLE
-	depends on CACHE_AS_RAM
 
 config X86_BOOTBLOCK_SIMPLE
 	bool "Always load fallback"
@@ -85,13 +107,14 @@ config BOOTBLOCK_SOURCE
 config UPDATE_IMAGE
 	bool "Update existing coreboot.rom image"
 	default n
-	depends on CACHE_AS_RAM
 	help
 	  If this option is enabled, no new coreboot.rom file
 	  is created. Instead it is expected that there already
 	  is a suitable file for further processing.
 	  The bootblock will not be modified.
 
+endif
+
 config PC80_SYSTEM
 	bool
 	default y
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 9659ace..64ae445 100755
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -198,7 +198,6 @@ ifeq ($(CONFIG_SSE),y)
 crt0s += $(src)/cpu/x86/sse_enable.inc
 endif
 
-
 # When some mainboards with a specific socket have been converted
 # to cache-as-ram, but others haven't, cache_as_ram.inc is
 # included only conditionally
@@ -283,10 +282,10 @@ ifeq ($(CONFIG_HAVE_BUS_CONFIG),y)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c
 endif
 
-ifeq ($(CONFIG_BIG_BOOTBLOCK),n)
-include $(src)/arch/x86/Makefile.bootblock.inc
-else
+ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
 include $(src)/arch/x86/Makefile.bigbootblock.inc
+else
+include $(src)/arch/x86/Makefile.bootblock.inc
 endif
 
 seabios:
diff --git a/src/cpu/amd/car/cache_as_ram.inc b/src/cpu/amd/car/cache_as_ram.inc
index 0f3f464..d625112 100644
--- a/src/cpu/amd/car/cache_as_ram.inc
+++ b/src/cpu/amd/car/cache_as_ram.inc
@@ -281,7 +281,7 @@ clear_fixed_var_mtrr_out:
 
 #if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
 
-#if CONFIG_CACHE_AS_RAM
+#if !CONFIG_BIG_BOOTBLOCK
 #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
 #else
 #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
diff --git a/src/cpu/intel/car/cache_as_ram.inc b/src/cpu/intel/car/cache_as_ram.inc
index de98719..55cb534 100644
--- a/src/cpu/intel/car/cache_as_ram.inc
+++ b/src/cpu/intel/car/cache_as_ram.inc
@@ -231,7 +231,7 @@ clear_fixed_var_mtrr_out:
 
 #if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
 
-#if CONFIG_CACHE_AS_RAM
+#if !CONFIG_BIG_BOOTBLOCK
 #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
 #else
 #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
diff --git a/src/cpu/intel/model_106cx/cache_as_ram.inc b/src/cpu/intel/model_106cx/cache_as_ram.inc
index bbb4856..db658fa 100644
--- a/src/cpu/intel/model_106cx/cache_as_ram.inc
+++ b/src/cpu/intel/model_106cx/cache_as_ram.inc
@@ -102,7 +102,7 @@ clear_mtrrs:
 	/* Enable cache for our code in Flash because we do XIP here */
 	movl	$MTRRphysBase_MSR(1), %ecx
 	xorl	%edx, %edx
-#if CONFIG_CACHE_AS_RAM
+#if !CONFIG_BIG_BOOTBLOCK
 #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
 #else
 #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
diff --git a/src/cpu/intel/model_6ex/cache_as_ram.inc b/src/cpu/intel/model_6ex/cache_as_ram.inc
index 5dac9ca..10ba812 100644
--- a/src/cpu/intel/model_6ex/cache_as_ram.inc
+++ b/src/cpu/intel/model_6ex/cache_as_ram.inc
@@ -102,7 +102,7 @@ clear_mtrrs:
 	/* Enable cache for our code in Flash because we do XIP here */
 	movl	$MTRRphysBase_MSR(1), %ecx
 	xorl	%edx, %edx
-#if CONFIG_CACHE_AS_RAM
+#if !CONFIG_BIG_BOOTBLOCK
 #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
 #else
 #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
diff --git a/src/cpu/intel/model_6fx/cache_as_ram.inc b/src/cpu/intel/model_6fx/cache_as_ram.inc
index 8930df2..ce2718b 100644
--- a/src/cpu/intel/model_6fx/cache_as_ram.inc
+++ b/src/cpu/intel/model_6fx/cache_as_ram.inc
@@ -109,7 +109,7 @@ clear_mtrrs:
 	/* Enable cache for our code in Flash because we do XIP here */
 	movl	$MTRRphysBase_MSR(1), %ecx
 	xorl	%edx, %edx
-#if CONFIG_CACHE_AS_RAM
+#if !CONFIG_BIG_BOOTBLOCK
 #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
 #else
 #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
diff --git a/src/cpu/via/car/cache_as_ram.inc b/src/cpu/via/car/cache_as_ram.inc
index 23bd78d..04d5941 100644
--- a/src/cpu/via/car/cache_as_ram.inc
+++ b/src/cpu/via/car/cache_as_ram.inc
@@ -110,7 +110,7 @@ clear_fixed_var_mtrr_out:
 	movl	$(~(CacheSize - 1) | MTRRphysMaskValid), %eax
 	wrmsr
 
-#if CONFIG_CACHE_AS_RAM
+#if !CONFIG_BIG_BOOTBLOCK
 #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
 #else
 #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
diff --git a/src/mainboard/aaeon/pfm-540i_revb/Kconfig b/src/mainboard/aaeon/pfm-540i_revb/Kconfig
index b3b4d59..1b5b62b 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/Kconfig
+++ b/src/mainboard/aaeon/pfm-540i_revb/Kconfig
@@ -3,7 +3,7 @@ if BOARD_AAEON_PFM_540I_REVB
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/amd/db800/Kconfig b/src/mainboard/amd/db800/Kconfig
index ad97fab..780b56e 100644
--- a/src/mainboard/amd/db800/Kconfig
+++ b/src/mainboard/amd/db800/Kconfig
@@ -3,7 +3,7 @@ if BOARD_AMD_DB800
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/amd/norwich/Kconfig b/src/mainboard/amd/norwich/Kconfig
index 87fe29b..84c2c33 100644
--- a/src/mainboard/amd/norwich/Kconfig
+++ b/src/mainboard/amd/norwich/Kconfig
@@ -3,7 +3,7 @@ if BOARD_AMD_NORWICH
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig
index 283e823..d87e182 100644
--- a/src/mainboard/amd/rumba/Kconfig
+++ b/src/mainboard/amd/rumba/Kconfig
@@ -21,7 +21,7 @@ if BOARD_AMD_RUMBA
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_GX2
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/artecgroup/dbe61/Kconfig b/src/mainboard/artecgroup/dbe61/Kconfig
index 40676d0..8f871d0 100644
--- a/src/mainboard/artecgroup/dbe61/Kconfig
+++ b/src/mainboard/artecgroup/dbe61/Kconfig
@@ -3,7 +3,7 @@ if BOARD_ARTECGROUP_DBE61
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/asus/a8v-e_deluxe/Kconfig b/src/mainboard/asus/a8v-e_deluxe/Kconfig
index 379f036..8ae0e89 100644
--- a/src/mainboard/asus/a8v-e_deluxe/Kconfig
+++ b/src/mainboard/asus/a8v-e_deluxe/Kconfig
@@ -3,7 +3,7 @@ if BOARD_ASUS_A8V_E_DELUXE
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_SOCKET_939
 	select K8_HT_FREQ_1G_SUPPORT
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index d81cee4..c0e8218 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -3,7 +3,7 @@ if BOARD_ASUS_A8V_E_SE
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_SOCKET_939
 	select K8_HT_FREQ_1G_SUPPORT
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig
index a6ab36c..16c708f 100644
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/Kconfig
@@ -21,7 +21,7 @@ if BOARD_ASUS_MEW_AM
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig
index 58916e0..78228f7 100644
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/Kconfig
@@ -21,7 +21,7 @@ if BOARD_ASUS_MEW_VM
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/bcom/winnetp680/Kconfig b/src/mainboard/bcom/winnetp680/Kconfig
index 010b63d..9ad5325 100644
--- a/src/mainboard/bcom/winnetp680/Kconfig
+++ b/src/mainboard/bcom/winnetp680/Kconfig
@@ -3,7 +3,7 @@ if BOARD_BCOM_WINNETP680
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/digitallogic/msm800sev/Kconfig b/src/mainboard/digitallogic/msm800sev/Kconfig
index df5bc34..4aa0807 100644
--- a/src/mainboard/digitallogic/msm800sev/Kconfig
+++ b/src/mainboard/digitallogic/msm800sev/Kconfig
@@ -3,7 +3,7 @@ if BOARD_DIGITALLOGIC_MSM800SEV
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/ecs/p6iwp-fe/Kconfig b/src/mainboard/ecs/p6iwp-fe/Kconfig
index b377168..4830072 100644
--- a/src/mainboard/ecs/p6iwp-fe/Kconfig
+++ b/src/mainboard/ecs/p6iwp-fe/Kconfig
@@ -22,7 +22,7 @@ if BOARD_ECS_P6IWP_FE
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig
index b9598b0..a11be06 100644
--- a/src/mainboard/emulation/qemu-x86/Kconfig
+++ b/src/mainboard/emulation/qemu-x86/Kconfig
@@ -3,6 +3,7 @@ if BOARD_EMULATION_QEMU_X86
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select NO_CACHE_AS_RAM
 	select SOUTHBRIDGE_INTEL_I82371EB
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig b/src/mainboard/hp/e_vectra_p2706t/Kconfig
index 606a9fd..122f40d 100644
--- a/src/mainboard/hp/e_vectra_p2706t/Kconfig
+++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig
@@ -25,7 +25,7 @@ if BOARD_HP_E_VECTRA_P2706T
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
index d20a1dc..4b1e2c4 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
+++ b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
@@ -3,7 +3,7 @@ if BOARD_IEI_PCISA_LX_800_R10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig
index eecd0ac..e9421ae 100644
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -3,7 +3,7 @@ if BOARD_INTEL_EAGLEHEIGHTS
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select NO_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_BGA956
 	select NORTHBRIDGE_INTEL_I3100
 	select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig
index 4e520b2..62e1748 100644
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -3,7 +3,7 @@ if BOARD_INTEL_MTARVON
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA479M
 	select NORTHBRIDGE_INTEL_I3100
 	select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/jetway/j7f24/Kconfig b/src/mainboard/jetway/j7f24/Kconfig
index 69f300b..f64b04a 100644
--- a/src/mainboard/jetway/j7f24/Kconfig
+++ b/src/mainboard/jetway/j7f24/Kconfig
@@ -4,7 +4,7 @@ if BOARD_JETWAY_J7F24
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
index b02fcca..b3691a9 100644
--- a/src/mainboard/lenovo/x60/Kconfig
+++ b/src/mainboard/lenovo/x60/Kconfig
@@ -3,7 +3,7 @@ if BOARD_LENOVO_X60
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select NO_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MFCPGA478
 	select NORTHBRIDGE_INTEL_I945GM
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/lippert/frontrunner/Kconfig b/src/mainboard/lippert/frontrunner/Kconfig
index 27c8b60..3c1e2f1 100644
--- a/src/mainboard/lippert/frontrunner/Kconfig
+++ b/src/mainboard/lippert/frontrunner/Kconfig
@@ -3,7 +3,7 @@ if BOARD_LIPPERT_FRONTRUNNER
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_GX2
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5535
diff --git a/src/mainboard/lippert/hurricane-lx/Kconfig b/src/mainboard/lippert/hurricane-lx/Kconfig
index cac1186..ac7dfa0 100644
--- a/src/mainboard/lippert/hurricane-lx/Kconfig
+++ b/src/mainboard/lippert/hurricane-lx/Kconfig
@@ -3,7 +3,7 @@ if BOARD_LIPPERT_HURRICANE_LX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/literunner-lx/Kconfig b/src/mainboard/lippert/literunner-lx/Kconfig
index 4218a7f..ab5f912 100644
--- a/src/mainboard/lippert/literunner-lx/Kconfig
+++ b/src/mainboard/lippert/literunner-lx/Kconfig
@@ -3,7 +3,7 @@ if BOARD_LIPPERT_LITERUNNER_LX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/roadrunner-lx/Kconfig b/src/mainboard/lippert/roadrunner-lx/Kconfig
index 3a0a689..3a0a5fc 100644
--- a/src/mainboard/lippert/roadrunner-lx/Kconfig
+++ b/src/mainboard/lippert/roadrunner-lx/Kconfig
@@ -3,7 +3,7 @@ if BOARD_LIPPERT_ROADRUNNER_LX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/spacerunner-lx/Kconfig b/src/mainboard/lippert/spacerunner-lx/Kconfig
index e99f47d..a7c1e43 100644
--- a/src/mainboard/lippert/spacerunner-lx/Kconfig
+++ b/src/mainboard/lippert/spacerunner-lx/Kconfig
@@ -3,7 +3,7 @@ if BOARD_LIPPERT_SPACERUNNER_LX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/mitac/6513wu/Kconfig b/src/mainboard/mitac/6513wu/Kconfig
index a1fa602..91ebe98 100644
--- a/src/mainboard/mitac/6513wu/Kconfig
+++ b/src/mainboard/mitac/6513wu/Kconfig
@@ -21,7 +21,7 @@ if BOARD_MITAC_6513WU
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig
index e5696ae..f8e9283 100644
--- a/src/mainboard/msi/ms6178/Kconfig
+++ b/src/mainboard/msi/ms6178/Kconfig
@@ -21,7 +21,7 @@ if BOARD_MSI_MS_6178
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig
index 244b543..4100865 100644
--- a/src/mainboard/nec/powermate2000/Kconfig
+++ b/src/mainboard/nec/powermate2000/Kconfig
@@ -21,7 +21,7 @@ if BOARD_NEC_POWERMATE_2000
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/pcengines/alix1c/Kconfig b/src/mainboard/pcengines/alix1c/Kconfig
index b0758fa..d18d02b 100644
--- a/src/mainboard/pcengines/alix1c/Kconfig
+++ b/src/mainboard/pcengines/alix1c/Kconfig
@@ -3,7 +3,7 @@ if BOARD_PCENGINES_ALIX1C
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/pcengines/alix2d/Kconfig b/src/mainboard/pcengines/alix2d/Kconfig
index 4cc8c94..b5d0f1f 100644
--- a/src/mainboard/pcengines/alix2d/Kconfig
+++ b/src/mainboard/pcengines/alix2d/Kconfig
@@ -3,7 +3,7 @@ if BOARD_PCENGINES_ALIX2D
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig
index cf1d8ed..d40b5c9 100644
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -3,7 +3,7 @@ if BOARD_RODA_RK886EX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select NO_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MFCPGA478
 	select NORTHBRIDGE_INTEL_I945GM
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/traverse/geos/Kconfig b/src/mainboard/traverse/geos/Kconfig
index 3210ec6..3a907ff 100644
--- a/src/mainboard/traverse/geos/Kconfig
+++ b/src/mainboard/traverse/geos/Kconfig
@@ -3,7 +3,7 @@ if BOARD_TRAVERSE_GEOS
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/tyan/s2735/Kconfig b/src/mainboard/tyan/s2735/Kconfig
index a076bd6..9073b5f 100644
--- a/src/mainboard/tyan/s2735/Kconfig
+++ b/src/mainboard/tyan/s2735/Kconfig
@@ -3,7 +3,7 @@ if BOARD_TYAN_S2735
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select NO_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7501
 	select SOUTHBRIDGE_INTEL_I82870
diff --git a/src/mainboard/via/epia-cn/Kconfig b/src/mainboard/via/epia-cn/Kconfig
index b16040d..c9c34cc 100644
--- a/src/mainboard/via/epia-cn/Kconfig
+++ b/src/mainboard/via/epia-cn/Kconfig
@@ -3,7 +3,7 @@ if BOARD_VIA_EPIA_CN
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig
index 56c6e12..5380c47 100644
--- a/src/mainboard/via/epia-m700/Kconfig
+++ b/src/mainboard/via/epia-m700/Kconfig
@@ -3,7 +3,7 @@ if BOARD_VIA_EPIA_M700
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_VX800
 	select SUPERIO_WINBOND_W83697HF
diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig
index 5c92942..cc7ee4a 100644
--- a/src/mainboard/via/pc2500e/Kconfig
+++ b/src/mainboard/via/pc2500e/Kconfig
@@ -3,7 +3,7 @@ if BOARD_VIA_PC2500E
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/winent/pl6064/Kconfig b/src/mainboard/winent/pl6064/Kconfig
index 1d1c04a..b075273 100644
--- a/src/mainboard/winent/pl6064/Kconfig
+++ b/src/mainboard/winent/pl6064/Kconfig
@@ -3,7 +3,7 @@ if BOARD_WINENT_PL6064
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/wyse/s50/Kconfig b/src/mainboard/wyse/s50/Kconfig
index 0700ff7..dd4ea96 100644
--- a/src/mainboard/wyse/s50/Kconfig
+++ b/src/mainboard/wyse/s50/Kconfig
@@ -21,7 +21,7 @@ if BOARD_WYSE_S50
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select MAYBE_CACHE_AS_RAM
+	select USES_BIG_BOOTBLOCK
 	select CPU_AMD_GX2
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536

More information about the coreboot mailing list