[coreboot] Patch set updated for coreboot: 1231bc8 Add MAYBE_TINY_BOOTBLOCK

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Sat Oct 22 09:02:38 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/317

-gerrit

commit 1231bc87cfa315f729b489ebbfb04e3340daa48e
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sat Oct 22 00:44:39 2011 +0300

    Add MAYBE_TINY_BOOTBLOCK
    
    For every mainboard Kconfig with TINY_NO_BOOTBLOCK
    and its cpu/socket Kconfig with CACHE_AS_RAM:
       rename TINY_NO_BOOTBLOCK to MAYBE_TINY_BOOTBLOCK.
    
    Rename any remaining TINY_NO_BOOTBLOCK to NO_TINY_BOOTBLOCK.
    
    I had to manually fix supermicro/h8scm_fam10, I did not
    figure out how it selects TINY_BOOTBLOCK at the moment.
    
    With this patchset, default of TINY_BOOTBLOCK can be inverted.
    Any mainboard with MAYBE_TINY_BOOTBLOCK is a good candidate for
    conversion task, these likely have reference implementation already.
    
    As a quick test, abuild -C seemed to create equivalent .config for
    all mainboards after this patchset.
    
    Change-Id: I97de6b027872aebbb86b2a0312787fc1da7841de
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/mainboard/aaeon/pfm-540i_revb/Kconfig         |    2 +-
 src/mainboard/advantech/pcm-5820/Kconfig          |    2 +-
 src/mainboard/amd/db800/Kconfig                   |    2 +-
 src/mainboard/amd/norwich/Kconfig                 |    2 +-
 src/mainboard/amd/rumba/Kconfig                   |    2 +-
 src/mainboard/amd/serengeti_cheetah_fam10/Kconfig |    1 -
 src/mainboard/artecgroup/dbe61/Kconfig            |    2 +-
 src/mainboard/asi/mb_5blgp/Kconfig                |    2 +-
 src/mainboard/asi/mb_5blmp/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/axus/tc320/Kconfig                  |    2 +-
 src/mainboard/bcom/winnet100/Kconfig              |    2 +-
 src/mainboard/bcom/winnetp680/Kconfig             |    2 +-
 src/mainboard/dell/s1850/Kconfig                  |    2 +-
 src/mainboard/digitallogic/msm586seg/Kconfig      |    2 +-
 src/mainboard/digitallogic/msm800sev/Kconfig      |    2 +-
 src/mainboard/eaglelion/5bcm/Kconfig              |    2 +-
 src/mainboard/ecs/p6iwp-fe/Kconfig                |    2 +-
 src/mainboard/hp/dl165_g6_fam10/Kconfig           |    1 -
 src/mainboard/hp/e_vectra_p2706t/Kconfig          |    2 +-
 src/mainboard/iei/juki-511p/Kconfig               |    2 +-
 src/mainboard/iei/nova4899r/Kconfig               |    2 +-
 src/mainboard/iei/pcisa-lx-800-r10/Kconfig        |    2 +-
 src/mainboard/intel/d810e2cb/Kconfig              |    2 +-
 src/mainboard/intel/eagleheights/Kconfig          |    2 +-
 src/mainboard/intel/jarrell/Kconfig               |    2 +-
 src/mainboard/intel/mtarvon/Kconfig               |    2 +-
 src/mainboard/intel/truxton/Kconfig               |    2 +-
 src/mainboard/intel/xe7501devkit/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/msi/ms9652_fam10/Kconfig            |    1 -
 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/supermicro/h8dmr_fam10/Kconfig      |    1 -
 src/mainboard/supermicro/h8qme_fam10/Kconfig      |    1 -
 src/mainboard/supermicro/x6dai_g/Kconfig          |    2 +-
 src/mainboard/supermicro/x6dhe_g/Kconfig          |    2 +-
 src/mainboard/supermicro/x6dhe_g2/Kconfig         |    2 +-
 src/mainboard/supermicro/x6dhr_ig/Kconfig         |    2 +-
 src/mainboard/supermicro/x6dhr_ig2/Kconfig        |    2 +-
 src/mainboard/technologic/ts5300/Kconfig          |    2 +-
 src/mainboard/televideo/tc7020/Kconfig            |    2 +-
 src/mainboard/traverse/geos/Kconfig               |    2 +-
 src/mainboard/tyan/s2735/Kconfig                  |    2 +-
 src/mainboard/tyan/s2912_fam10/Kconfig            |    1 -
 src/mainboard/via/epia-cn/Kconfig                 |    2 +-
 src/mainboard/via/epia-m/Kconfig                  |    2 +-
 src/mainboard/via/epia-m700/Kconfig               |    2 +-
 src/mainboard/via/epia-n/Kconfig                  |    2 +-
 src/mainboard/via/epia/Kconfig                    |    2 +-
 src/mainboard/via/pc2500e/Kconfig                 |    2 +-
 src/mainboard/winent/pl6064/Kconfig               |    2 +-
 src/mainboard/wyse/s50/Kconfig                    |    2 +-
 66 files changed, 60 insertions(+), 66 deletions(-)

diff --git a/src/mainboard/aaeon/pfm-540i_revb/Kconfig b/src/mainboard/aaeon/pfm-540i_revb/Kconfig
index 0097f71..5e042f3 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/advantech/pcm-5820/Kconfig b/src/mainboard/advantech/pcm-5820/Kconfig
index 8eaf7e8..4d15053 100644
--- a/src/mainboard/advantech/pcm-5820/Kconfig
+++ b/src/mainboard/advantech/pcm-5820/Kconfig
@@ -21,7 +21,7 @@ if BOARD_ADVANTECH_PCM_5820
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/amd/db800/Kconfig b/src/mainboard/amd/db800/Kconfig
index 5a3bc15..fbd9cbb 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 383f3ed..182d9da 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 1a73486..d4d025b 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_AMD_GX2
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 3fd8359..3360672 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select RAMINIT_SYSINFO
 	select ENABLE_APIC_EXT_ID
 	select LIFT_BSP_APIC_ID
-	select TINY_BOOTBLOCK
 	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/artecgroup/dbe61/Kconfig b/src/mainboard/artecgroup/dbe61/Kconfig
index 0338ccb..3a9acb6 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/asi/mb_5blgp/Kconfig b/src/mainboard/asi/mb_5blgp/Kconfig
index 7b065c4..c1a07df 100644
--- a/src/mainboard/asi/mb_5blgp/Kconfig
+++ b/src/mainboard/asi/mb_5blgp/Kconfig
@@ -21,7 +21,7 @@ if BOARD_ASI_MB_5BLGP
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/asi/mb_5blmp/Kconfig b/src/mainboard/asi/mb_5blmp/Kconfig
index 9ceac1a..a5e0086 100644
--- a/src/mainboard/asi/mb_5blmp/Kconfig
+++ b/src/mainboard/asi/mb_5blmp/Kconfig
@@ -21,7 +21,7 @@ if BOARD_ASI_MB_5BLMP
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/asus/a8v-e_deluxe/Kconfig b/src/mainboard/asus/a8v-e_deluxe/Kconfig
index 2f26a78..c3c0e91 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 42a6479..da42165 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 cadeec7..1064313 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 58f8f5f..98dab9d 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/axus/tc320/Kconfig b/src/mainboard/axus/tc320/Kconfig
index 8d8a0fd..e9cba2d 100644
--- a/src/mainboard/axus/tc320/Kconfig
+++ b/src/mainboard/axus/tc320/Kconfig
@@ -21,7 +21,7 @@ if BOARD_AXUS_TC320
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/bcom/winnet100/Kconfig b/src/mainboard/bcom/winnet100/Kconfig
index 4297da1..9309518 100644
--- a/src/mainboard/bcom/winnet100/Kconfig
+++ b/src/mainboard/bcom/winnet100/Kconfig
@@ -21,7 +21,7 @@ if BOARD_BCOM_WINNET100
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/bcom/winnetp680/Kconfig b/src/mainboard/bcom/winnetp680/Kconfig
index 4eb1ad9..a8bb2bb 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig
index 424bb78..39ef51d 100644
--- a/src/mainboard/dell/s1850/Kconfig
+++ b/src/mainboard/dell/s1850/Kconfig
@@ -3,7 +3,7 @@ if BOARD_DELL_S1850
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_I82801EX
diff --git a/src/mainboard/digitallogic/msm586seg/Kconfig b/src/mainboard/digitallogic/msm586seg/Kconfig
index f9e8fb9..5312309 100644
--- a/src/mainboard/digitallogic/msm586seg/Kconfig
+++ b/src/mainboard/digitallogic/msm586seg/Kconfig
@@ -3,7 +3,7 @@ if BOARD_DIGITALLOGIC_MSM586SEG
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_SC520
 	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
diff --git a/src/mainboard/digitallogic/msm800sev/Kconfig b/src/mainboard/digitallogic/msm800sev/Kconfig
index f332f7e..1cebd1b 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/eaglelion/5bcm/Kconfig b/src/mainboard/eaglelion/5bcm/Kconfig
index 69db4ca..77f7a93 100644
--- a/src/mainboard/eaglelion/5bcm/Kconfig
+++ b/src/mainboard/eaglelion/5bcm/Kconfig
@@ -21,7 +21,7 @@ if BOARD_EAGLELION_5BCM
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/ecs/p6iwp-fe/Kconfig b/src/mainboard/ecs/p6iwp-fe/Kconfig
index 24f7136..25efbc6 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig b/src/mainboard/hp/dl165_g6_fam10/Kconfig
index 013d8ca..422a481 100644
--- a/src/mainboard/hp/dl165_g6_fam10/Kconfig
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig
@@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select RAMINIT_SYSINFO
 	select ENABLE_APIC_EXT_ID
 	select AMDMCT
-	select TINY_BOOTBLOCK
 	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig b/src/mainboard/hp/e_vectra_p2706t/Kconfig
index 55d5213..74117a3 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/iei/juki-511p/Kconfig b/src/mainboard/iei/juki-511p/Kconfig
index a837967..2efa6ce 100644
--- a/src/mainboard/iei/juki-511p/Kconfig
+++ b/src/mainboard/iei/juki-511p/Kconfig
@@ -21,7 +21,7 @@ if BOARD_IEI_JUKI_511P
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/iei/nova4899r/Kconfig b/src/mainboard/iei/nova4899r/Kconfig
index e36edce..09bbb92 100644
--- a/src/mainboard/iei/nova4899r/Kconfig
+++ b/src/mainboard/iei/nova4899r/Kconfig
@@ -21,7 +21,7 @@ if BOARD_IEI_NOVA_4899R
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
index f05290a..38cdb92 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/intel/d810e2cb/Kconfig b/src/mainboard/intel/d810e2cb/Kconfig
index a1c0050..f5b6da7 100644
--- a/src/mainboard/intel/d810e2cb/Kconfig
+++ b/src/mainboard/intel/d810e2cb/Kconfig
@@ -21,7 +21,7 @@ if BOARD_INTEL_D810E2CB
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_FC_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801BX
diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig
index 4f98068..8ef4e99 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 TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_BGA956
 	select NORTHBRIDGE_INTEL_I3100
 	select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/intel/jarrell/Kconfig b/src/mainboard/intel/jarrell/Kconfig
index 10c5ec4..e297e3b 100644
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -3,7 +3,7 @@ if BOARD_INTEL_JARRELL
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_PXHD
diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig
index 454c842..7ec8b92 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA479M
 	select NORTHBRIDGE_INTEL_I3100
 	select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig
index 22e5c30..130c642 100644
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -3,7 +3,7 @@ if BOARD_INTEL_TRUXTON
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_EP80579
 	select NORTHBRIDGE_INTEL_I3100
 	select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig
index c32d24a..e001250 100644
--- a/src/mainboard/intel/xe7501devkit/Kconfig
+++ b/src/mainboard/intel/xe7501devkit/Kconfig
@@ -3,7 +3,7 @@ if BOARD_INTEL_XE7501DEVKIT
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7501
 	select SOUTHBRIDGE_INTEL_I82870
diff --git a/src/mainboard/jetway/j7f24/Kconfig b/src/mainboard/jetway/j7f24/Kconfig
index 64afa9e..35cdeb6 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 4d136b5..291d084 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 TINY_NO_BOOTBLOCK
+	select NO_TINY_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 61a7904..bae2e75 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 b725971..b32c338 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 a84a78d..6afba94 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 5895b42..cbf3ea0 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 4a03f31..7781f06 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 d62146d..773b3c0 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 87f6506..7746341 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index cc99144..9dc1372 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select RAMINIT_SYSINFO
 	select ENABLE_APIC_EXT_ID
 	select AMDMCT
-	select TINY_BOOTBLOCK
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select QRANK_DIMM_SUPPORT
 
diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig
index 8da74da..3f3aab4 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 f9914bf..da620c0 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 6a1b18f..8c1a8e2 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 49277aa..8ab7b32 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 TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MFCPGA478
 	select NORTHBRIDGE_INTEL_I945GM
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index 90a6097..7dff5ce 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select AMDMCT
 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO
-	select TINY_BOOTBLOCK
 	select ENABLE_APIC_EXT_ID
 	select QRANK_DIMM_SUPPORT
 
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index db62863..b0b80e3 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select AMDMCT
 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO
-	select TINY_BOOTBLOCK
 	select ENABLE_APIC_EXT_ID
 	select QRANK_DIMM_SUPPORT
 
diff --git a/src/mainboard/supermicro/x6dai_g/Kconfig b/src/mainboard/supermicro/x6dai_g/Kconfig
index 81c6e24..d0921b6 100644
--- a/src/mainboard/supermicro/x6dai_g/Kconfig
+++ b/src/mainboard/supermicro/x6dai_g/Kconfig
@@ -3,7 +3,7 @@ if BOARD_SUPERMICRO_X6DAI_G
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7525
 	select SOUTHBRIDGE_INTEL_ESB6300
diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig
index 1e461fb..64bc746 100644
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -3,7 +3,7 @@ if BOARD_SUPERMICRO_X6DHE_G
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_ESB6300
diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig
index 15bd961..8295fbd 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -3,7 +3,7 @@ if BOARD_SUPERMICRO_X6DHE_G2
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_I82801EX
diff --git a/src/mainboard/supermicro/x6dhr_ig/Kconfig b/src/mainboard/supermicro/x6dhr_ig/Kconfig
index d678c77..6e080ba 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig/Kconfig
@@ -3,7 +3,7 @@ if BOARD_SUPERMICRO_X6DHR_IG
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_I82801EX
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Kconfig b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
index 383633d..9713169 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
@@ -3,7 +3,7 @@ if BOARD_SUPERMICRO_X6DHR_IG2
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_I82801EX
diff --git a/src/mainboard/technologic/ts5300/Kconfig b/src/mainboard/technologic/ts5300/Kconfig
index 7ffc912..6352ca4 100644
--- a/src/mainboard/technologic/ts5300/Kconfig
+++ b/src/mainboard/technologic/ts5300/Kconfig
@@ -3,7 +3,7 @@ if BOARD_TECHNOLOGIC_TS5300
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_SC520
 	select ROMCC
 	select HAVE_OPTION_TABLE
diff --git a/src/mainboard/televideo/tc7020/Kconfig b/src/mainboard/televideo/tc7020/Kconfig
index 6ad55e7..a3e5260 100644
--- a/src/mainboard/televideo/tc7020/Kconfig
+++ b/src/mainboard/televideo/tc7020/Kconfig
@@ -21,7 +21,7 @@ if BOARD_TELEVIDEO_TC7020
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_AMD_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/traverse/geos/Kconfig b/src/mainboard/traverse/geos/Kconfig
index 7ef69d8..6a5e0b9 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 9d52abc..cd030a5 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 TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7501
 	select SOUTHBRIDGE_INTEL_I82870
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index c46f608..8b5cc14 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select RAMINIT_SYSINFO
 	select ENABLE_APIC_EXT_ID
 	select AMDMCT
-	select TINY_BOOTBLOCK
 	select MMCONF_SUPPORT_DEFAULT
 	select QRANK_DIMM_SUPPORT
 
diff --git a/src/mainboard/via/epia-cn/Kconfig b/src/mainboard/via/epia-cn/Kconfig
index 026db22..c14dda6 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/via/epia-m/Kconfig b/src/mainboard/via/epia-m/Kconfig
index 166799e..f23600b 100644
--- a/src/mainboard/via/epia-m/Kconfig
+++ b/src/mainboard/via/epia-m/Kconfig
@@ -3,7 +3,7 @@ if BOARD_VIA_EPIA_M
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_VIA_C3
 	select NORTHBRIDGE_VIA_VT8623
 	select SOUTHBRIDGE_VIA_VT8235
diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig
index 78d3abb..38f045f 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_VX800
 	select SUPERIO_WINBOND_W83697HF
diff --git a/src/mainboard/via/epia-n/Kconfig b/src/mainboard/via/epia-n/Kconfig
index e397079..b6a54b0 100644
--- a/src/mainboard/via/epia-n/Kconfig
+++ b/src/mainboard/via/epia-n/Kconfig
@@ -3,7 +3,7 @@ if BOARD_VIA_EPIA_N
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_VIA_C3
 	select NORTHBRIDGE_VIA_CN400
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/via/epia/Kconfig b/src/mainboard/via/epia/Kconfig
index 19e792b..daa2b4f 100644
--- a/src/mainboard/via/epia/Kconfig
+++ b/src/mainboard/via/epia/Kconfig
@@ -3,7 +3,7 @@ if BOARD_VIA_EPIA
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
-	select TINY_NO_BOOTBLOCK
+	select NO_TINY_BOOTBLOCK
 	select CPU_VIA_C3
 	select NORTHBRIDGE_VIA_VT8601
 	select SOUTHBRIDGE_VIA_VT8231
diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig
index bea73ff..e25cdb9 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 20a41b6..8c722da 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_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 06b4e66..6df776d 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 TINY_NO_BOOTBLOCK
+	select MAYBE_TINY_BOOTBLOCK
 	select CPU_AMD_GX2
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536




More information about the coreboot mailing list