Patchwork Rename ROM_IMAGE_SIZE to BOOTBLOCK_SIZE?

login
register
about
Submitter Peter Stuge
Date 2009-10-01 22:37:38
Message ID <20091001223739.17912.qmail@stuge.se>
Download mbox | patch
Permalink /patch/321/
State Not Applicable
Headers show

Comments

Peter Stuge - 2009-10-01 22:37:38
Myles Watson wrote:
> 1. shrink your bootblock (CONFIG_ROM_IMAGE_SIZE)

Is this variable still around with Kconfig? How about the attached
patch? It has not been tested yet.


//Peter
Rename ROM_IMAGE_SIZE to BOOTBLOCK_SIZE

This was generated by:

grep -lr ROM_IMAGE_SIZE .|grep -v '/\.svn/'|xargs sed -i s,ROM_IMAGE_SIZE,BOOTBLOCK_SIZE,g

Signed-off-by: Peter Stuge <peter@stuge.se>
Myles Watson - 2009-10-01 22:43:31
On Thu, Oct 1, 2009 at 4:37 PM, Peter Stuge <peter@stuge.se> wrote:
> Myles Watson wrote:
>> 1. shrink your bootblock (CONFIG_ROM_IMAGE_SIZE)
>
> Is this variable still around with Kconfig?
That suggestion was for if he wanted to use newconfig still.

> How about the attached
> patch? It has not been tested yet.

I think it will be hard to test since the CBFS bootblock has normal
and fallback ram init concatenated together.  Kconfig doesn't support
normal yet.

As always I could be wrong :)

Thanks,
Myles

Patch

Index: src/southbridge/via/k8t890/romstrap.lds
===================================================================
--- src/southbridge/via/k8t890/romstrap.lds	(revision 4704)
+++ src/southbridge/via/k8t890/romstrap.lds	(working copy)
@@ -22,7 +22,7 @@ 
 /* Modified for K8T890 ROM strap by Rudolf Marek <r.marek@assembler.cz>. */
 
 SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x2c) - (__romstrap_end - __romstrap_start);
+	. = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - 0x2c) - (__romstrap_end - __romstrap_start);
 	.romstrap (.): {
 		*(.romstrap)
 	}
Index: src/southbridge/nvidia/ck804/romstrap.lds
===================================================================
--- src/southbridge/nvidia/ck804/romstrap.lds	(revision 4704)
+++ src/southbridge/nvidia/ck804/romstrap.lds	(working copy)
@@ -1,5 +1,5 @@ 
 SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
+	. = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
 	.romstrap (.): {
 		*(.romstrap)
 	}
Index: src/southbridge/nvidia/ck804/id.inc
===================================================================
--- src/southbridge/nvidia/ck804/id.inc	(revision 4704)
+++ src/southbridge/nvidia/ck804/id.inc	(working copy)
@@ -8,7 +8,7 @@ 
 	.asciz CONFIG_MAINBOARD_PART_NUMBER
 .long __id_end + 0x80 - vendor       /* Reverse offset to the vendor ID */
 .long __id_end + 0x80 - part         /* Reverse offset to the part number */
-.long CONFIG_PAYLOAD_SIZE + CONFIG_ROM_IMAGE_SIZE  /* Size of this ROM image */
+.long CONFIG_PAYLOAD_SIZE + CONFIG_BOOTBLOCK_SIZE  /* Size of this ROM image */
 	.globl __id_end
 
 __id_end:
Index: src/southbridge/nvidia/ck804/id.lds
===================================================================
--- src/southbridge/nvidia/ck804/id.lds	(revision 4704)
+++ src/southbridge/nvidia/ck804/id.lds	(working copy)
@@ -1,5 +1,5 @@ 
 SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x80) - (__id_end - __id_start);
+	. = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - 0x80) - (__id_end - __id_start);
 	.id (.): {
 		*(.id)
 	}
Index: src/southbridge/nvidia/mcp55/romstrap.lds
===================================================================
--- src/southbridge/nvidia/mcp55/romstrap.lds	(revision 4704)
+++ src/southbridge/nvidia/mcp55/romstrap.lds	(working copy)
@@ -20,7 +20,7 @@ 
  */
 
 SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
+	. = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
 	.romstrap (.): {
 		*(.romstrap)
 	}
Index: src/southbridge/nvidia/mcp55/id.inc
===================================================================
--- src/southbridge/nvidia/mcp55/id.inc	(revision 4704)
+++ src/southbridge/nvidia/mcp55/id.inc	(working copy)
@@ -29,7 +29,7 @@ 
 	.asciz CONFIG_MAINBOARD_PART_NUMBER
 .long __id_end + 0x80 - vendor  /* Reverse offset to the vendor id */
 .long __id_end + 0x80 - part    /* Reverse offset to the part number */
-.long CONFIG_PAYLOAD_SIZE + CONFIG_ROM_IMAGE_SIZE  /* Size of this romimage */
+.long CONFIG_PAYLOAD_SIZE + CONFIG_BOOTBLOCK_SIZE  /* Size of this romimage */
 	.globl __id_end
 
 __id_end:
Index: src/southbridge/nvidia/mcp55/id.lds
===================================================================
--- src/southbridge/nvidia/mcp55/id.lds	(revision 4704)
+++ src/southbridge/nvidia/mcp55/id.lds	(working copy)
@@ -20,7 +20,7 @@ 
  */
 
 SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x80) - (__id_end - __id_start);
+	. = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - 0x80) - (__id_end - __id_start);
 	.id (.): {
 		*(.id)
 	}
Index: src/southbridge/sis/sis966/romstrap.lds
===================================================================
--- src/southbridge/sis/sis966/romstrap.lds	(revision 4704)
+++ src/southbridge/sis/sis966/romstrap.lds	(working copy)
@@ -20,7 +20,7 @@ 
  */
 
 SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
+	. = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
 	.romstrap (.): {
 		*(.romstrap)
 	}
Index: src/southbridge/sis/sis966/id.inc
===================================================================
--- src/southbridge/sis/sis966/id.inc	(revision 4704)
+++ src/southbridge/sis/sis966/id.inc	(working copy)
@@ -29,7 +29,7 @@ 
 	.asciz CONFIG_MAINBOARD_PART_NUMBER
 .long __id_end + 0x80 - vendor  /* Reverse offset to the vendor id */
 .long __id_end + 0x80 - part    /* Reverse offset to the part number */
-.long CONFIG_PAYLOAD_SIZE + CONFIG_ROM_IMAGE_SIZE  /* Size of this romimage */
+.long CONFIG_PAYLOAD_SIZE + CONFIG_BOOTBLOCK_SIZE  /* Size of this romimage */
 	.globl __id_end
 
 __id_end:
Index: src/southbridge/sis/sis966/id.lds
===================================================================
--- src/southbridge/sis/sis966/id.lds	(revision 4704)
+++ src/southbridge/sis/sis966/id.lds	(working copy)
@@ -20,7 +20,7 @@ 
  */
 
 SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x80) - (__id_end - __id_start);
+	. = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - 0x80) - (__id_end - __id_start);
 	.id (.): {
 		*(.id)
 	}
Index: src/cpu/x86/32bit/reset32.lds
===================================================================
--- src/cpu/x86/32bit/reset32.lds	(revision 4704)
+++ src/cpu/x86/32bit/reset32.lds	(working copy)
@@ -4,7 +4,7 @@ 
  */
 
 SECTIONS {
-	_ROMTOP = CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10;
+	_ROMTOP = CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - 0x10;
 	. = _ROMTOP;
 	.reset (.): {
 		*(.reset)
Index: src/cpu/x86/16bit/reset16.lds
===================================================================
--- src/cpu/x86/16bit/reset16.lds	(revision 4704)
+++ src/cpu/x86/16bit/reset16.lds	(working copy)
@@ -5,7 +5,7 @@ 
 
 SECTIONS {
 	/* Trigger an error if I have an unuseable start address */
-	_bogus = ASSERT(_start >= 0xffff0000, "_start too low. Please decrease CONFIG_ROM_IMAGE_SIZE");
+	_bogus = ASSERT(_start >= 0xffff0000, "_start too low. Please decrease CONFIG_BOOTBLOCK_SIZE");
 	_ROMTOP = 0xfffffff0;
 	. = _ROMTOP;
 	.reset . : {
Index: src/mainboard/iwill/dk8_htx/Options.lb
===================================================================
--- src/mainboard/iwill/dk8_htx/Options.lb	(revision 4704)
+++ src/mainboard/iwill/dk8_htx/Options.lb	(working copy)
@@ -20,7 +20,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -107,7 +107,7 @@ 
 ##
 
 #FALLBACK: 256K-8K
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 #FAILOVER: 8K
 default CONFIG_FAILOVER_SIZE=0x02000
 
@@ -235,8 +235,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536 - CONFIG_FAILOVER_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/iwill/dk8s2/Options.lb
===================================================================
--- src/mainboard/iwill/dk8s2/Options.lb	(revision 4704)
+++ src/mainboard/iwill/dk8s2/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -66,7 +66,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -136,8 +136,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/iwill/dk8x/Options.lb
===================================================================
--- src/mainboard/iwill/dk8x/Options.lb	(revision 4704)
+++ src/mainboard/iwill/dk8x/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -66,7 +66,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -135,8 +135,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/axus/tc320/Options.lb
===================================================================
--- src/mainboard/axus/tc320/Options.lb	(revision 4704)
+++ src/mainboard/axus/tc320/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -86,8 +86,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 2	# Soldered NIC, internal USB, no real slots
 default CONFIG_PIRQ_ROUTE = 1
 default CONFIG_HAVE_OPTION_TABLE = 0
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_USE_OPTION_TABLE = 0
Index: src/mainboard/bcom/winnetp680/Options.lb
===================================================================
--- src/mainboard/bcom/winnetp680/Options.lb	(revision 4704)
+++ src/mainboard/bcom/winnetp680/Options.lb	(working copy)
@@ -39,7 +39,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -83,8 +83,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 10
 default CONFIG_HAVE_ACPI_TABLES = 0
 default CONFIG_HAVE_OPTION_TABLE = 1
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_USE_FALLBACK_IMAGE = 1
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
Index: src/mainboard/bcom/winnet100/Options.lb
===================================================================
--- src/mainboard/bcom/winnet100/Options.lb	(revision 4704)
+++ src/mainboard/bcom/winnet100/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -86,8 +86,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 2	# Soldered NIC, internal USB, no real slots
 default CONFIG_PIRQ_ROUTE = 1
 default CONFIG_HAVE_OPTION_TABLE = 0
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_USE_OPTION_TABLE = 0
Index: src/mainboard/televideo/tc7020/Options.lb
===================================================================
--- src/mainboard/televideo/tc7020/Options.lb	(revision 4704)
+++ src/mainboard/televideo/tc7020/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -87,8 +87,8 @@ 
 default CONFIG_HAVE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 3	# Soldered NIC, internal USB, mini PCI slot
 default CONFIG_HAVE_OPTION_TABLE = 0
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_USE_OPTION_TABLE = 0
Index: src/mainboard/broadcom/blast/Options.lb
===================================================================
--- src/mainboard/broadcom/blast/Options.lb	(revision 4704)
+++ src/mainboard/broadcom/blast/Options.lb	(working copy)
@@ -16,7 +16,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -81,7 +81,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -168,8 +168,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/thomson/ip1000/Options.lb
===================================================================
--- src/mainboard/thomson/ip1000/Options.lb	(revision 4704)
+++ src/mainboard/thomson/ip1000/Options.lb	(working copy)
@@ -52,7 +52,7 @@ 
 uses CONFIG_PAYLOAD_SIZE
 uses CONFIG_RAMBASE
 uses CONFIG_ROMBASE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_SIZE
@@ -66,9 +66,9 @@ 
 uses CONFIG_XIP_ROM_BASE
 
 default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+default CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_HAVE_PIRQ_TABLE = 1
Index: src/mainboard/supermicro/x6dai_g/Options.lb
===================================================================
--- src/mainboard/supermicro/x6dai_g/Options.lb	(revision 4704)
+++ src/mainboard/supermicro/x6dai_g/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -129,8 +129,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
@@ -147,7 +147,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Coreboot C code runs at this location in RAM
Index: src/mainboard/supermicro/h8dmr/Options.lb
===================================================================
--- src/mainboard/supermicro/h8dmr/Options.lb	(revision 4704)
+++ src/mainboard/supermicro/h8dmr/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -128,7 +128,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the ROM part of the fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE=CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE=CONFIG_BOOTBLOCK_SIZE
 #FAILOVER: 4K
 default CONFIG_FAILOVER_SIZE=0x01000
 
@@ -251,8 +251,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 0xf000
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 0xf000
 
 
 ##
Index: src/mainboard/supermicro/x6dhe_g/Options.lb
===================================================================
--- src/mainboard/supermicro/x6dhe_g/Options.lb	(revision 4704)
+++ src/mainboard/supermicro/x6dhe_g/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -129,8 +129,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
@@ -147,7 +147,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Coreboot C code runs at this location in RAM
Index: src/mainboard/supermicro/h8dme/Options.lb
===================================================================
--- src/mainboard/supermicro/h8dme/Options.lb	(revision 4704)
+++ src/mainboard/supermicro/h8dme/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -135,7 +135,7 @@ 
 ##
 
 #FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 #FAILOVER: 4K
 default CONFIG_FAILOVER_SIZE=0x01000
 
@@ -258,8 +258,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536 - CONFIG_FAILOVER_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/supermicro/x6dhe_g2/Options.lb
===================================================================
--- src/mainboard/supermicro/x6dhe_g2/Options.lb	(revision 4704)
+++ src/mainboard/supermicro/x6dhe_g2/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -129,8 +129,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
@@ -147,7 +147,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Coreboot C code runs at this location in RAM
Index: src/mainboard/supermicro/h8dmr_fam10/Options.lb
===================================================================
--- src/mainboard/supermicro/h8dmr_fam10/Options.lb	(revision 4704)
+++ src/mainboard/supermicro/h8dmr_fam10/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -131,7 +131,7 @@ 
 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the ROM part of the fallback image will use
-default CONFIG_FALLBACK_SIZE=CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE=CONFIG_BOOTBLOCK_SIZE
 default CONFIG_FAILOVER_SIZE=0x02000
 
 #more 1M for pgtbl
@@ -262,8 +262,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 0x1e000
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 0x1e000
 
 ##
 ## Use a 32K stack
Index: src/mainboard/supermicro/x6dhr_ig/Options.lb
===================================================================
--- src/mainboard/supermicro/x6dhr_ig/Options.lb	(revision 4704)
+++ src/mainboard/supermicro/x6dhr_ig/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -129,8 +129,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
@@ -147,7 +147,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Coreboot C code runs at this location in RAM
Index: src/mainboard/supermicro/x6dhr_ig2/Options.lb
===================================================================
--- src/mainboard/supermicro/x6dhr_ig2/Options.lb	(revision 4704)
+++ src/mainboard/supermicro/x6dhr_ig2/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -129,8 +129,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
@@ -147,7 +147,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Coreboot C code runs at this location in RAM
Index: src/mainboard/soyo/sy-6ba-plus-iii/Options.lb
===================================================================
--- src/mainboard/soyo/sy-6ba-plus-iii/Options.lb	(revision 4704)
+++ src/mainboard/soyo/sy-6ba-plus-iii/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/a-trend/atc-6240/Options.lb
===================================================================
--- src/mainboard/a-trend/atc-6240/Options.lb	(revision 4704)
+++ src/mainboard/a-trend/atc-6240/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/a-trend/atc-6220/Options.lb
===================================================================
--- src/mainboard/a-trend/atc-6220/Options.lb	(revision 4704)
+++ src/mainboard/a-trend/atc-6220/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/kontron/986lcd-m/Options.lb
===================================================================
--- src/mainboard/kontron/986lcd-m/Options.lb	(revision 4704)
+++ src/mainboard/kontron/986lcd-m/Options.lb	(working copy)
@@ -44,7 +44,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 # Payload
@@ -219,7 +219,7 @@ 
 ##
 
 default CONFIG_XIP_ROM_SIZE = 128 * 1024
-default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE - CONFIG_XIP_ROM_SIZE + CONFIG_ROM_IMAGE_SIZE )
+default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE - CONFIG_XIP_ROM_SIZE + CONFIG_BOOTBLOCK_SIZE )
 
 ##
 ## Build code to setup a generic IOAPIC
@@ -236,8 +236,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 0x10000
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 0x10000
 
 ##
 ## Use a small 32K stack
@@ -254,7 +254,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE=CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE=CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## coreboot C code runs at this location in RAM
Index: src/mainboard/gigabyte/m57sli/Options.lb
===================================================================
--- src/mainboard/gigabyte/m57sli/Options.lb	(revision 4704)
+++ src/mainboard/gigabyte/m57sli/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -134,7 +134,7 @@ 
 ##
 
 #FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 #FAILOVER: 4K
 default CONFIG_FAILOVER_SIZE=0x01000
 
@@ -267,8 +267,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536 - CONFIG_FAILOVER_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/gigabyte/ga_2761gxdk/Options.lb
===================================================================
--- src/mainboard/gigabyte/ga_2761gxdk/Options.lb	(revision 4704)
+++ src/mainboard/gigabyte/ga_2761gxdk/Options.lb	(working copy)
@@ -43,7 +43,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -133,7 +133,7 @@ 
 ##
 
 #FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 #FAILOVER: 4K
 default CONFIG_FAILOVER_SIZE=0x01000
 
@@ -258,8 +258,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536 - CONFIG_FAILOVER_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/gigabyte/ga-6bxc/Options.lb
===================================================================
--- src/mainboard/gigabyte/ga-6bxc/Options.lb	(revision 4704)
+++ src/mainboard/gigabyte/ga-6bxc/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/digitallogic/msm800sev/Options.lb
===================================================================
--- src/mainboard/digitallogic/msm800sev/Options.lb	(revision 4704)
+++ src/mainboard/digitallogic/msm800sev/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -99,9 +99,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## enable CACHE_AS_RAM specifics
Index: src/mainboard/digitallogic/adl855pc/Options.lb
===================================================================
--- src/mainboard/digitallogic/adl855pc/Options.lb	(revision 4704)
+++ src/mainboard/digitallogic/adl855pc/Options.lb	(working copy)
@@ -19,7 +19,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -83,9 +83,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/digitallogic/msm586seg/Options.lb
===================================================================
--- src/mainboard/digitallogic/msm586seg/Options.lb	(revision 4704)
+++ src/mainboard/digitallogic/msm586seg/Options.lb	(working copy)
@@ -20,7 +20,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -91,9 +91,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/motorola/sandpoint/Options.lb
===================================================================
--- src/mainboard/motorola/sandpoint/Options.lb	(revision 4704)
+++ src/mainboard/motorola/sandpoint/Options.lb	(working copy)
@@ -31,7 +31,7 @@ 
 uses CONFIG_AUTOBOOT_CMDLINE
 uses CONFIG_PAYLOAD_SIZE
 uses CONFIG_ROM_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_RESET
 uses CONFIG_EXCEPTION_VECTORS
 uses CONFIG_ROMBASE
@@ -97,8 +97,8 @@ 
 default CONFIG_AUTOBOOT_CMDLINE="hdc1:/vmlinuz"
 
 # coreboot must fit into 128KB
-default CONFIG_ROM_IMAGE_SIZE=131072
-default CONFIG_ROM_SIZE={CONFIG_ROM_IMAGE_SIZE+CONFIG_PAYLOAD_SIZE}
+default CONFIG_BOOTBLOCK_SIZE=131072
+default CONFIG_ROM_SIZE={CONFIG_BOOTBLOCK_SIZE+CONFIG_PAYLOAD_SIZE}
 default CONFIG_PAYLOAD_SIZE=262144
 
 # Set stack and heap sizes (stage 2)
Index: src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
===================================================================
--- src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb	(revision 4704)
+++ src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb	(working copy)
@@ -28,7 +28,7 @@ 
 uses CONFIG_AUTOBOOT_CMDLINE
 uses CONFIG_PAYLOAD_SIZE
 uses CONFIG_ROM_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_RESET
 uses CONFIG_EXCEPTION_VECTORS
 uses CONFIG_ROMBASE
@@ -94,7 +94,7 @@ 
 default CONFIG_AUTOBOOT_CMDLINE="hdc1:/vmlinuz"
 
 # coreboot must fit into 128KB
-default CONFIG_ROM_IMAGE_SIZE=160*1024
+default CONFIG_BOOTBLOCK_SIZE=160*1024
 default CONFIG_ROM_SIZE=384*1024
 default CONFIG_PAYLOAD_SIZE=262144
 
Index: src/mainboard/mitac/6513wu/Options.lb
===================================================================
--- src/mainboard/mitac/6513wu/Options.lb	(revision 4704)
+++ src/mainboard/mitac/6513wu/Options.lb	(working copy)
@@ -42,7 +42,7 @@ 
 uses CONFIG_PCI_ROM_RUN
 uses CONFIG_RAMBASE
 uses CONFIG_ROMBASE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_PAYLOAD
 uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_ROM_SECTION_OFFSET
@@ -74,8 +74,8 @@ 
 
 # ROM layout
 default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_HAVE_FALLBACK_BOOT = 1
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CBFS=1
Index: src/mainboard/emulation/qemu-x86/Config.lb
===================================================================
--- src/mainboard/emulation/qemu-x86/Config.lb	(revision 4704)
+++ src/mainboard/emulation/qemu-x86/Config.lb	(working copy)
@@ -5,14 +5,14 @@ 
 ## (coreboot plus bootloader) will live in the boot rom chip.
 ##
 default CONFIG_ROM_SIZE = 256 * 1024 
-default CONFIG_ROM_SECTION_SIZE   = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_ROM_SECTION_SIZE   = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_ROM_SECTION_OFFSET = 0
 
 ##
 ## Compute the start location and size size of
 ## The coreboot bootloader.
 ##
-default CONFIG_PAYLOAD_SIZE            = ( CONFIG_ROM_SIZE - CONFIG_ROM_IMAGE_SIZE )
+default CONFIG_PAYLOAD_SIZE            = ( CONFIG_ROM_SIZE - CONFIG_BOOTBLOCK_SIZE )
 default CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1)
 
 ##
@@ -28,7 +28,7 @@ 
 ## CONFIG_XIP_ROM_BASE must be a multiple of CONFIG_XIP_ROM_SIZE
 ##
 default CONFIG_XIP_ROM_SIZE=32*1024
-default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - CONFIG_XIP_ROM_SIZE )
+default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - CONFIG_XIP_ROM_SIZE )
 
 ##
 ## Set all of the defaults for an x86 architecture
Index: src/mainboard/emulation/qemu-x86/Options.lb
===================================================================
--- src/mainboard/emulation/qemu-x86/Options.lb	(revision 4704)
+++ src/mainboard/emulation/qemu-x86/Options.lb	(working copy)
@@ -21,7 +21,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -101,9 +101,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/olpc/btest/Options.lb
===================================================================
--- src/mainboard/olpc/btest/Options.lb	(revision 4704)
+++ src/mainboard/olpc/btest/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -87,9 +87,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/olpc/rev_a/Options.lb
===================================================================
--- src/mainboard/olpc/rev_a/Options.lb	(revision 4704)
+++ src/mainboard/olpc/rev_a/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -87,9 +87,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/technologic/ts5300/Options.lb
===================================================================
--- src/mainboard/technologic/ts5300/Options.lb	(revision 4704)
+++ src/mainboard/technologic/ts5300/Options.lb	(working copy)
@@ -20,7 +20,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -106,9 +106,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/amd/pistachio/Options.lb
===================================================================
--- src/mainboard/amd/pistachio/Options.lb	(revision 4704)
+++ src/mainboard/amd/pistachio/Options.lb	(working copy)
@@ -37,7 +37,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -106,7 +106,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -201,8 +201,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/amd/dbm690t/Options.lb
===================================================================
--- src/mainboard/amd/dbm690t/Options.lb	(revision 4704)
+++ src/mainboard/amd/dbm690t/Options.lb	(working copy)
@@ -37,7 +37,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -106,9 +106,9 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-#default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+#default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 #256K
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -203,8 +203,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/amd/rumba/Options.lb
===================================================================
--- src/mainboard/amd/rumba/Options.lb	(revision 4704)
+++ src/mainboard/amd/rumba/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -86,9 +86,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/amd/serengeti_cheetah/Options.lb
===================================================================
--- src/mainboard/amd/serengeti_cheetah/Options.lb	(revision 4704)
+++ src/mainboard/amd/serengeti_cheetah/Options.lb	(working copy)
@@ -20,7 +20,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -106,7 +106,7 @@ 
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
 
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_FAILOVER_SIZE=0x01000
 
 #more 1M for pgtbl
@@ -234,8 +234,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536 - CONFIG_FAILOVER_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/amd/norwich/Options.lb
===================================================================
--- src/mainboard/amd/norwich/Options.lb	(revision 4704)
+++ src/mainboard/amd/norwich/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -99,9 +99,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## enable CACHE_AS_RAM specifics
Index: src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
===================================================================
--- src/mainboard/amd/serengeti_cheetah_fam10/Options.lb	(revision 4704)
+++ src/mainboard/amd/serengeti_cheetah_fam10/Options.lb	(working copy)
@@ -39,7 +39,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -132,7 +132,7 @@ 
 ##
 
 #FALLBACK: 1024K - 8K
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 #FAILOVER: 8k
 default CONFIG_FAILOVER_SIZE=0x02000
 
@@ -270,8 +270,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/amd/db800/Options.lb
===================================================================
--- src/mainboard/amd/db800/Options.lb	(revision 4704)
+++ src/mainboard/amd/db800/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -99,9 +99,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## enable CACHE_AS_RAM specifics
Index: src/mainboard/biostar/m6tba/Options.lb
===================================================================
--- src/mainboard/biostar/m6tba/Options.lb	(revision 4704)
+++ src/mainboard/biostar/m6tba/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/nec/powermate2000/Options.lb
===================================================================
--- src/mainboard/nec/powermate2000/Options.lb	(revision 4704)
+++ src/mainboard/nec/powermate2000/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -73,8 +73,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/azza/pt-6ibd/Options.lb
===================================================================
--- src/mainboard/azza/pt-6ibd/Options.lb	(revision 4704)
+++ src/mainboard/azza/pt-6ibd/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/rca/rm4100/Options.lb
===================================================================
--- src/mainboard/rca/rm4100/Options.lb	(revision 4704)
+++ src/mainboard/rca/rm4100/Options.lb	(working copy)
@@ -52,7 +52,7 @@ 
 uses CONFIG_PAYLOAD_SIZE
 uses CONFIG_RAMBASE
 uses CONFIG_ROMBASE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_SIZE
@@ -66,9 +66,9 @@ 
 uses CONFIG_XIP_ROM_BASE
 
 default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+default CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_HAVE_PIRQ_TABLE = 1
Index: src/mainboard/iei/nova4899r/Options.lb
===================================================================
--- src/mainboard/iei/nova4899r/Options.lb	(revision 4704)
+++ src/mainboard/iei/nova4899r/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -96,9 +96,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/iei/pcisa-lx-800-r10/Options.lb
===================================================================
--- src/mainboard/iei/pcisa-lx-800-r10/Options.lb	(revision 4704)
+++ src/mainboard/iei/pcisa-lx-800-r10/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -84,8 +84,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 9
 default CONFIG_PIRQ_ROUTE = 1
 default CONFIG_HAVE_OPTION_TABLE = 0
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_USE_DCACHE_RAM = 1
 default CONFIG_DCACHE_RAM_BASE = 0xc8000
 default CONFIG_DCACHE_RAM_SIZE = 32 * 1024
Index: src/mainboard/iei/juki-511p/Config.lb
===================================================================
--- src/mainboard/iei/juki-511p/Config.lb	(revision 4704)
+++ src/mainboard/iei/juki-511p/Config.lb	(working copy)
@@ -8,7 +8,7 @@ 
 ## Compute the start location and size size of
 ## The coreboot bootloader.
 ##
-default CONFIG_PAYLOAD_SIZE            = ( CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE )
+default CONFIG_PAYLOAD_SIZE            = ( CONFIG_ROM_SECTION_SIZE - CONFIG_BOOTBLOCK_SIZE )
 default CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1)
 
 ##
@@ -24,7 +24,7 @@ 
 ## CONFIG_XIP_ROM_BASE must be a multiple of CONFIG_XIP_ROM_SIZE
 ##
 default CONFIG_XIP_ROM_SIZE=65536
-default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - CONFIG_XIP_ROM_SIZE )
+default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - CONFIG_XIP_ROM_SIZE )
 
 ##
 ## Set all of the defaults for an x86 architecture
Index: src/mainboard/iei/juki-511p/Options.lb
===================================================================
--- src/mainboard/iei/juki-511p/Options.lb	(revision 4704)
+++ src/mainboard/iei/juki-511p/Options.lb	(working copy)
@@ -23,7 +23,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -86,9 +86,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/hp/dl145_g3/Options.lb
===================================================================
--- src/mainboard/hp/dl145_g3/Options.lb	(revision 4704)
+++ src/mainboard/hp/dl145_g3/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -121,7 +121,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE=CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE=CONFIG_BOOTBLOCK_SIZE
 
 #more 1M for pgtbl
 default CONFIG_LB_MEM_TOPK=2048
@@ -235,8 +235,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2912/Options.lb
===================================================================
--- src/mainboard/tyan/s2912/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2912/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -131,7 +131,7 @@ 
 ##
 
 #FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 #FAILOVER: 4K
 default CONFIG_FAILOVER_SIZE=0x01000
 
@@ -258,8 +258,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536 - CONFIG_FAILOVER_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2850/Options.lb
===================================================================
--- src/mainboard/tyan/s2850/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2850/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -74,7 +74,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -152,8 +152,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2735/Options.lb
===================================================================
--- src/mainboard/tyan/s2735/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2735/Options.lb	(working copy)
@@ -16,7 +16,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -76,7 +76,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ###
 ### Build options
@@ -166,8 +166,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2880/Options.lb
===================================================================
--- src/mainboard/tyan/s2880/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2880/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -74,7 +74,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -152,8 +152,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2881/Options.lb
===================================================================
--- src/mainboard/tyan/s2881/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2881/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -79,7 +79,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -169,8 +169,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s1846/Options.lb
===================================================================
--- src/mainboard/tyan/s1846/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s1846/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -77,8 +77,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/tyan/s4880/Options.lb
===================================================================
--- src/mainboard/tyan/s4880/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s4880/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -78,7 +78,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -161,8 +161,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2891/Options.lb
===================================================================
--- src/mainboard/tyan/s2891/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2891/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -88,7 +88,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ###
 ### Build options
@@ -208,8 +208,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2882/Options.lb
===================================================================
--- src/mainboard/tyan/s2882/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2882/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -74,7 +74,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -152,8 +152,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2892/Options.lb
===================================================================
--- src/mainboard/tyan/s2892/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2892/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -82,7 +82,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ###
 ### Build options
@@ -196,8 +196,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s4882/Options.lb
===================================================================
--- src/mainboard/tyan/s4882/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s4882/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -78,7 +78,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -160,8 +160,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2875/Options.lb
===================================================================
--- src/mainboard/tyan/s2875/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2875/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -74,7 +74,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 
 ##
@@ -153,8 +153,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2885/Options.lb
===================================================================
--- src/mainboard/tyan/s2885/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2885/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -85,7 +85,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -179,8 +179,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2895/Options.lb
===================================================================
--- src/mainboard/tyan/s2895/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2895/Options.lb	(working copy)
@@ -17,7 +17,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -93,7 +93,7 @@ 
 ##
 
 #FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 #FAILOVER: 4K
 default CONFIG_FAILOVER_SIZE=0x01000
 
@@ -215,8 +215,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536 - CONFIG_FAILOVER_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/tyan/s2912_fam10/Options.lb
===================================================================
--- src/mainboard/tyan/s2912_fam10/Options.lb	(revision 4704)
+++ src/mainboard/tyan/s2912_fam10/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -134,7 +134,7 @@ 
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
 
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_FAILOVER_SIZE=0x01000
 
 #more 1M for pgtbl
@@ -267,8 +267,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = (128*1024) - CONFIG_FAILOVER_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = (128*1024) - CONFIG_FAILOVER_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/artecgroup/dbe61/Options.lb
===================================================================
--- src/mainboard/artecgroup/dbe61/Options.lb	(revision 4704)
+++ src/mainboard/artecgroup/dbe61/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -99,9 +99,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## enable CACHE_AS_RAM specifics
Index: src/mainboard/pcengines/alix1c/Options.lb
===================================================================
--- src/mainboard/pcengines/alix1c/Options.lb	(revision 4704)
+++ src/mainboard/pcengines/alix1c/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -117,9 +117,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## enable CACHE_AS_RAM specifics
Index: src/mainboard/asi/mb_5blgp/Options.lb
===================================================================
--- src/mainboard/asi/mb_5blgp/Options.lb	(revision 4704)
+++ src/mainboard/asi/mb_5blgp/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -86,8 +86,8 @@ 
 default CONFIG_HAVE_OPTION_TABLE = 0
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_USE_OPTION_TABLE = 0
Index: src/mainboard/asi/mb_5blmp/Options.lb
===================================================================
--- src/mainboard/asi/mb_5blmp/Options.lb	(revision 4704)
+++ src/mainboard/asi/mb_5blmp/Options.lb	(working copy)
@@ -15,7 +15,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -83,9 +83,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/via/epia-m700/Options.lb
===================================================================
--- src/mainboard/via/epia-m700/Options.lb	(revision 4704)
+++ src/mainboard/via/epia-m700/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -123,8 +123,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 13
 default CONFIG_HAVE_ACPI_TABLES = 1
 default CONFIG_HAVE_OPTION_TABLE = 1
-default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_USE_FALLBACK_IMAGE = 1
 default CONFIG_STACK_SIZE = 16 * 1024
 default CONFIG_HEAP_SIZE = 20 * 1024
Index: src/mainboard/via/vt8454c/Options.lb
===================================================================
--- src/mainboard/via/vt8454c/Options.lb	(revision 4704)
+++ src/mainboard/via/vt8454c/Options.lb	(working copy)
@@ -40,7 +40,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 
@@ -156,9 +156,9 @@ 
 ### LinuxBIOS layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow linuxBIOS to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/via/epia-m/Options.lb
===================================================================
--- src/mainboard/via/epia-m/Options.lb	(revision 4704)
+++ src/mainboard/via/epia-m/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -99,9 +99,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/via/epia-n/Options.lb
===================================================================
--- src/mainboard/via/epia-n/Options.lb	(revision 4704)
+++ src/mainboard/via/epia-n/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -96,11 +96,11 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 7
 default CONFIG_HAVE_ACPI_TABLES = 1
 default CONFIG_HAVE_OPTION_TABLE = 1
-#default CONFIG_ROM_IMAGE_SIZE = 67 * 1024
+#default CONFIG_BOOTBLOCK_SIZE = 67 * 1024
 #default CONFIG_PAYLOAD_SIZE = 125 * 1024
-default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+default CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 default CONFIG_PAYLOAD_SIZE = 256 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_USE_FALLBACK_IMAGE = 1
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
Index: src/mainboard/via/epia-cn/Options.lb
===================================================================
--- src/mainboard/via/epia-cn/Options.lb	(revision 4704)
+++ src/mainboard/via/epia-cn/Options.lb	(working copy)
@@ -39,7 +39,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -84,8 +84,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 9
 default CONFIG_HAVE_ACPI_TABLES = 0
 default CONFIG_HAVE_OPTION_TABLE = 1
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_USE_FALLBACK_IMAGE = 1
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
Index: src/mainboard/via/epia/Options.lb
===================================================================
--- src/mainboard/via/epia/Options.lb	(revision 4704)
+++ src/mainboard/via/epia/Options.lb	(working copy)
@@ -27,7 +27,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -109,9 +109,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/via/pc2500e/Options.lb
===================================================================
--- src/mainboard/via/pc2500e/Options.lb	(revision 4704)
+++ src/mainboard/via/pc2500e/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
@@ -73,8 +73,8 @@ 
 uses CONFIG_IOAPIC
 
 default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_IOAPIC = 0
 default CONFIG_VIDEO_MB = 32
 default CONFIG_CONSOLE_SERIAL8250 = 1
Index: src/mainboard/lippert/roadrunner-lx/Options.lb
===================================================================
--- src/mainboard/lippert/roadrunner-lx/Options.lb	(revision 4704)
+++ src/mainboard/lippert/roadrunner-lx/Options.lb	(working copy)
@@ -45,7 +45,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -127,9 +127,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## enable CACHE_AS_RAM specifics
Index: src/mainboard/lippert/frontrunner/Options.lb
===================================================================
--- src/mainboard/lippert/frontrunner/Options.lb	(revision 4704)
+++ src/mainboard/lippert/frontrunner/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -86,9 +86,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/lippert/spacerunner-lx/Options.lb
===================================================================
--- src/mainboard/lippert/spacerunner-lx/Options.lb	(revision 4704)
+++ src/mainboard/lippert/spacerunner-lx/Options.lb	(working copy)
@@ -45,7 +45,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -127,9 +127,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## enable CACHE_AS_RAM specifics
Index: src/mainboard/abit/be6-ii_v2_0/Options.lb
===================================================================
--- src/mainboard/abit/be6-ii_v2_0/Options.lb	(revision 4704)
+++ src/mainboard/abit/be6-ii_v2_0/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -77,8 +77,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
===================================================================
--- src/mainboard/compaq/deskpro_en_sff_p600/Options.lb	(revision 4704)
+++ src/mainboard/compaq/deskpro_en_sff_p600/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/dell/s1850/Options.lb
===================================================================
--- src/mainboard/dell/s1850/Options.lb	(revision 4704)
+++ src/mainboard/dell/s1850/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -129,8 +129,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 
 ##
 ## Use a small 8K stack
@@ -147,7 +147,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Coreboot C code runs at this location in RAM
Index: src/mainboard/msi/ms7135/Options.lb
===================================================================
--- src/mainboard/msi/ms7135/Options.lb	(revision 4704)
+++ src/mainboard/msi/ms7135/Options.lb	(working copy)
@@ -39,7 +39,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -112,7 +112,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 #FAILOVER: 4K
 default CONFIG_FAILOVER_SIZE=(4*1024)
@@ -227,8 +227,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = (64*1024) - CONFIG_FAILOVER_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = (64*1024) - CONFIG_FAILOVER_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/msi/ms6119/Options.lb
===================================================================
--- src/mainboard/msi/ms6119/Options.lb	(revision 4704)
+++ src/mainboard/msi/ms6119/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/msi/ms6147/Options.lb
===================================================================
--- src/mainboard/msi/ms6147/Options.lb	(revision 4704)
+++ src/mainboard/msi/ms6147/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/msi/ms9282/Options.lb
===================================================================
--- src/mainboard/msi/ms9282/Options.lb	(revision 4704)
+++ src/mainboard/msi/ms9282/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -112,7 +112,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ###
 ### Build options
@@ -216,8 +216,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/msi/ms6178/Options.lb
===================================================================
--- src/mainboard/msi/ms6178/Options.lb	(revision 4704)
+++ src/mainboard/msi/ms6178/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -75,8 +75,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/msi/ms9185/Options.lb
===================================================================
--- src/mainboard/msi/ms9185/Options.lb	(revision 4704)
+++ src/mainboard/msi/ms9185/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -118,7 +118,7 @@ 
 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 #more 1M for pgtbl
 default CONFIG_LB_MEM_TOPK=2048
@@ -236,8 +236,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/msi/ms7260/Options.lb
===================================================================
--- src/mainboard/msi/ms7260/Options.lb	(revision 4704)
+++ src/mainboard/msi/ms7260/Options.lb	(working copy)
@@ -37,7 +37,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -101,7 +101,7 @@ 
 uses CONFIG_USE_PRINTK_IN_CAR
 
 default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_FAILOVER_SIZE = 4 * 1024
 default CONFIG_LB_MEM_TOPK = 2048	# 1MB more for pgtbl.
 default CONFIG_HAVE_FALLBACK_BOOT = 1
@@ -169,7 +169,7 @@ 
 default CONFIG_MAINBOARD_VENDOR = "MSI"
 default CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID = 0x1462
 default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID = 0x7260
-default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 65536 - CONFIG_FAILOVER_SIZE
 default CONFIG_STACK_SIZE = 0x2000
 default CONFIG_HEAP_SIZE = 0x8000
 default CONFIG_USE_OPTION_TABLE = (!CONFIG_USE_FALLBACK_IMAGE) && (!CONFIG_USE_FAILOVER_IMAGE)
Index: src/mainboard/arima/hdama/Options.lb
===================================================================
--- src/mainboard/arima/hdama/Options.lb	(revision 4704)
+++ src/mainboard/arima/hdama/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -76,7 +76,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -150,8 +150,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/sunw/ultra40/Options.lb
===================================================================
--- src/mainboard/sunw/ultra40/Options.lb	(revision 4704)
+++ src/mainboard/sunw/ultra40/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -82,7 +82,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ###
 ### Build options
@@ -184,8 +184,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/advantech/pcm-5820/Options.lb
===================================================================
--- src/mainboard/advantech/pcm-5820/Options.lb	(revision 4704)
+++ src/mainboard/advantech/pcm-5820/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -86,8 +86,8 @@ 
 default CONFIG_HAVE_OPTION_TABLE = 0
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_USE_OPTION_TABLE = 0
Index: src/mainboard/embeddedplanet/ep405pc/Options.lb
===================================================================
--- src/mainboard/embeddedplanet/ep405pc/Options.lb	(revision 4704)
+++ src/mainboard/embeddedplanet/ep405pc/Options.lb	(working copy)
@@ -34,7 +34,7 @@ 
 #uses CONFIG_IDE_SWAB
 uses CONFIG_IDE_OFFSET 
 uses CONFIG_ROM_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_RESET
 uses CONFIG_EXCEPTION_VECTORS
 uses CONFIG_ROMBASE
@@ -106,7 +106,7 @@ 
 default CONFIG_AUTOBOOT_CMDLINE="hda1:/vmlinuz"
 
 default CONFIG_ROM_SIZE=1048576
-default CONFIG_ROM_IMAGE_SIZE=160*1024
+default CONFIG_BOOTBLOCK_SIZE=160*1024
 
 ## Board has fixed size RAM
 default CONFIG_EMBEDDED_RAM_SIZE=64*1024*1024
Index: src/mainboard/eaglelion/5bcm/Options.lb
===================================================================
--- src/mainboard/eaglelion/5bcm/Options.lb	(revision 4704)
+++ src/mainboard/eaglelion/5bcm/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -89,9 +89,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/newisys/khepri/Options.lb
===================================================================
--- src/mainboard/newisys/khepri/Options.lb	(revision 4704)
+++ src/mainboard/newisys/khepri/Options.lb	(working copy)
@@ -14,7 +14,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -73,7 +73,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -151,8 +151,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/jetway/j7f24/Options.lb
===================================================================
--- src/mainboard/jetway/j7f24/Options.lb	(revision 4704)
+++ src/mainboard/jetway/j7f24/Options.lb	(working copy)
@@ -39,7 +39,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -84,8 +84,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 10
 default CONFIG_HAVE_ACPI_TABLES = 0
 default CONFIG_HAVE_OPTION_TABLE = 0
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_USE_FALLBACK_IMAGE = 1
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
Index: src/mainboard/technexion/tim8690/Options.lb
===================================================================
--- src/mainboard/technexion/tim8690/Options.lb	(revision 4704)
+++ src/mainboard/technexion/tim8690/Options.lb	(working copy)
@@ -37,7 +37,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -106,7 +106,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -202,8 +202,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/ibm/e326/Options.lb
===================================================================
--- src/mainboard/ibm/e326/Options.lb	(revision 4704)
+++ src/mainboard/ibm/e326/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -67,7 +67,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -140,8 +140,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/ibm/e325/Options.lb
===================================================================
--- src/mainboard/ibm/e325/Options.lb	(revision 4704)
+++ src/mainboard/ibm/e325/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -65,7 +65,7 @@ 
 ##
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
 ##
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Build code for the fallback boot
@@ -134,8 +134,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/nvidia/l1_2pvv/Options.lb
===================================================================
--- src/mainboard/nvidia/l1_2pvv/Options.lb	(revision 4704)
+++ src/mainboard/nvidia/l1_2pvv/Options.lb	(working copy)
@@ -41,7 +41,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -131,7 +131,7 @@ 
 ##
 
 #FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 #FAILOVER: 4K
 default CONFIG_FAILOVER_SIZE=0x01000
 
@@ -256,8 +256,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536 - CONFIG_FAILOVER_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/intel/xe7501devkit/Options.lb
===================================================================
--- src/mainboard/intel/xe7501devkit/Options.lb	(revision 4704)
+++ src/mainboard/intel/xe7501devkit/Options.lb	(working copy)
@@ -54,7 +54,7 @@ 
 ## These are defined in target Config.lb, don't add here
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_ROM_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_FALLBACK_SIZE
 uses COREBOOT_EXTRA_VERSION
 
@@ -73,13 +73,13 @@ 
 ## CONFIG_ROM_SIZE is the size of boot ROM that this board will use.
 ##
 default CONFIG_ROM_SIZE=2097152
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Build code for the fallback boot?
 ##
 default CONFIG_HAVE_FALLBACK_BOOT=1
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 
 ## Delay timer options
Index: src/mainboard/intel/truxton/Options.lb
===================================================================
--- src/mainboard/intel/truxton/Options.lb	(revision 4704)
+++ src/mainboard/intel/truxton/Options.lb	(working copy)
@@ -31,7 +31,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -134,8 +134,8 @@ 
 ### Coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
@@ -152,7 +152,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## coreboot C code runs at this location in RAM
Index: src/mainboard/intel/mtarvon/Options.lb
===================================================================
--- src/mainboard/intel/mtarvon/Options.lb	(revision 4704)
+++ src/mainboard/intel/mtarvon/Options.lb	(working copy)
@@ -31,7 +31,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -132,8 +132,8 @@ 
 ### Coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
@@ -150,7 +150,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## coreboot C code runs at this location in RAM
Index: src/mainboard/intel/eagleheights/Options.lb
===================================================================
--- src/mainboard/intel/eagleheights/Options.lb	(revision 4704)
+++ src/mainboard/intel/eagleheights/Options.lb	(working copy)
@@ -43,7 +43,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 # Payload
@@ -228,8 +228,8 @@ 
 ### coreboot layout values
 ###
 
-## ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
@@ -246,7 +246,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE=CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE=CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## coreboot C code runs at this location in RAM
Index: src/mainboard/intel/jarrell/Options.lb
===================================================================
--- src/mainboard/intel/jarrell/Options.lb	(revision 4704)
+++ src/mainboard/intel/jarrell/Options.lb	(working copy)
@@ -13,7 +13,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -143,8 +143,8 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
 
 ##
 ## Use a small 8K stack
@@ -161,7 +161,7 @@ 
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Coreboot C code runs at this location in RAM
Index: src/mainboard/asus/mew-am/Options.lb
===================================================================
--- src/mainboard/asus/mew-am/Options.lb	(revision 4704)
+++ src/mainboard/asus/mew-am/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/asus/p2b/Options.lb
===================================================================
--- src/mainboard/asus/p2b/Options.lb	(revision 4704)
+++ src/mainboard/asus/p2b/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -77,8 +77,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/asus/p2b-d/Options.lb
===================================================================
--- src/mainboard/asus/p2b-d/Options.lb	(revision 4704)
+++ src/mainboard/asus/p2b-d/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -80,8 +80,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/asus/p2b-f/Options.lb
===================================================================
--- src/mainboard/asus/p2b-f/Options.lb	(revision 4704)
+++ src/mainboard/asus/p2b-f/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/asus/a8v-e_se/Options.lb
===================================================================
--- src/mainboard/asus/a8v-e_se/Options.lb	(revision 4704)
+++ src/mainboard/asus/a8v-e_se/Options.lb	(working copy)
@@ -33,7 +33,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -95,7 +95,7 @@ 
 uses CONFIG_USE_PRINTK_IN_CAR
 
 default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_HAVE_FALLBACK_BOOT = 1
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_HAVE_PIRQ_TABLE = 0
@@ -148,7 +148,7 @@ 
 default CONFIG_MAINBOARD_PART_NUMBER = "A8V-E SE"
 default CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID = 0x1043
 # default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID = 0x1234	# FIXME
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 256 * 1024
 # More 1M for pgtbl.
Index: src/mainboard/asus/p3b-f/Options.lb
===================================================================
--- src/mainboard/asus/p3b-f/Options.lb	(revision 4704)
+++ src/mainboard/asus/p3b-f/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -76,8 +76,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/asus/p2b-ds/Options.lb
===================================================================
--- src/mainboard/asus/p2b-ds/Options.lb	(revision 4704)
+++ src/mainboard/asus/p2b-ds/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -80,8 +80,8 @@ 
 default CONFIG_IRQ_SLOT_COUNT = 0		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
-default CONFIG_ROM_IMAGE_SIZE = 36 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 36 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_STACK_SIZE = 8 * 1024
 default CONFIG_HEAP_SIZE = 16 * 1024
 default CONFIG_HAVE_OPTION_TABLE = 0
Index: src/mainboard/asus/mew-vm/Options.lb
===================================================================
--- src/mainboard/asus/mew-vm/Options.lb	(revision 4704)
+++ src/mainboard/asus/mew-vm/Options.lb	(working copy)
@@ -18,7 +18,7 @@ 
 uses CONFIG_HEAP_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD_START
@@ -83,9 +83,9 @@ 
 ### coreboot layout values
 ###
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+default CONFIG_BOOTBLOCK_SIZE = 65536
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 ##
 ## Use a small 8K stack
Index: src/mainboard/asus/a8n_e/Options.lb
===================================================================
--- src/mainboard/asus/a8n_e/Options.lb	(revision 4704)
+++ src/mainboard/asus/a8n_e/Options.lb	(working copy)
@@ -38,7 +38,7 @@ 
 uses CONFIG_FAILOVER_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -100,8 +100,8 @@ 
 uses CONFIG_USE_PRINTK_IN_CAR
 
 default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024 - CONFIG_FAILOVER_SIZE
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024 - CONFIG_FAILOVER_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 default CONFIG_FAILOVER_SIZE = 4 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
 default CONFIG_HAVE_FAILOVER_BOOT = 1
Index: src/mainboard/asus/m2v-mx_se/Options.lb
===================================================================
--- src/mainboard/asus/m2v-mx_se/Options.lb	(revision 4704)
+++ src/mainboard/asus/m2v-mx_se/Options.lb	(working copy)
@@ -33,7 +33,7 @@ 
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_ROM_SIZE
 uses CONFIG_ROM_SECTION_SIZE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_PAYLOAD
@@ -174,8 +174,8 @@ 
 default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
 default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL = "MAINBOARD_POWER_ON"
 
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
+default CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 #
 # CBFS
 #
Index: src/config/nofailovercalculation.lb
===================================================================
--- src/config/nofailovercalculation.lb	(revision 4704)
+++ src/config/nofailovercalculation.lb	(working copy)
@@ -19,7 +19,7 @@ 
 ## Compute the start location and size size of
 ## The coreboot bootloader.
 ##
-default CONFIG_PAYLOAD_SIZE            = ( CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE )
+default CONFIG_PAYLOAD_SIZE            = ( CONFIG_ROM_SECTION_SIZE - CONFIG_BOOTBLOCK_SIZE )
 default CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1)
 
 ##
@@ -34,4 +34,4 @@ 
 ## CONFIG_XIP_ROM_SIZE must be a power of 2 and is set in mainboard Config.lb
 ## CONFIG_XIP_ROM_BASE must be a multiple of CONFIG_XIP_ROM_SIZE
 ##
-default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE - CONFIG_XIP_ROM_SIZE + CONFIG_ROM_IMAGE_SIZE )
+default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE - CONFIG_XIP_ROM_SIZE + CONFIG_BOOTBLOCK_SIZE )
Index: src/config/failovercalculation.lb
===================================================================
--- src/config/failovercalculation.lb	(revision 4704)
+++ src/config/failovercalculation.lb	(working copy)
@@ -24,7 +24,7 @@ 
 ## Compute the start location and size size of
 ## The coreboot bootloader.
 ##
-default CONFIG_PAYLOAD_SIZE            = ( CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE )
+default CONFIG_PAYLOAD_SIZE            = ( CONFIG_ROM_SECTION_SIZE - CONFIG_BOOTBLOCK_SIZE )
 default CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1)
 
 ##
@@ -41,12 +41,12 @@ 
 ##
 
 if CONFIG_USE_FAILOVER_IMAGE
-	default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE - CONFIG_XIP_ROM_SIZE + CONFIG_ROM_IMAGE_SIZE)
+	default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE - CONFIG_XIP_ROM_SIZE + CONFIG_BOOTBLOCK_SIZE)
 else
     if CONFIG_USE_FALLBACK_IMAGE
-	default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE - CONFIG_XIP_ROM_SIZE + CONFIG_ROM_IMAGE_SIZE + CONFIG_FAILOVER_SIZE)
+	default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE - CONFIG_XIP_ROM_SIZE + CONFIG_BOOTBLOCK_SIZE + CONFIG_FAILOVER_SIZE)
     else
-	default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE - CONFIG_XIP_ROM_SIZE + CONFIG_ROM_IMAGE_SIZE)
+	default CONFIG_XIP_ROM_BASE = ( CONFIG_ROMBASE - CONFIG_XIP_ROM_SIZE + CONFIG_BOOTBLOCK_SIZE)
     end
 end
 
Index: src/config/Options.lb
===================================================================
--- src/config/Options.lb	(revision 4704)
+++ src/config/Options.lb	(working copy)
@@ -228,7 +228,7 @@ 
 	export used
 	comment "Size of your ROM"
 end
-define CONFIG_ROM_IMAGE_SIZE
+define CONFIG_BOOTBLOCK_SIZE
 	default 65535
 	format "0x%x"
 	export always
@@ -247,7 +247,7 @@ 
 	comment "Default rom section offset"
 end
 define CONFIG_PAYLOAD_SIZE
-	default {CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE}
+	default {CONFIG_ROM_SECTION_SIZE - CONFIG_BOOTBLOCK_SIZE}
 	format "0x%x"
 	export always
 	comment "Default payload size"
Index: src/northbridge/via/vx800/romstrap.lds
===================================================================
--- src/northbridge/via/vx800/romstrap.lds	(revision 4704)
+++ src/northbridge/via/vx800/romstrap.lds	(working copy)
@@ -19,7 +19,7 @@ 
  */
 
 SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x2c) - (__romstrap_end - __romstrap_start);
+	. = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - 0x2c) - (__romstrap_end - __romstrap_start);
 	.romstrap (.): {
 		*(.romstrap)
 	}
Index: src/arch/i386/Kconfig
===================================================================
--- src/arch/i386/Kconfig	(revision 4704)
+++ src/arch/i386/Kconfig	(working copy)
@@ -41,7 +41,7 @@ 
 	default 0xfffc0000 if COREBOOT_ROMSIZE_KB_256
 	default 0xfffe0000 if COREBOOT_ROMSIZE_KB_128
 
-config ROM_IMAGE_SIZE
+config BOOTBLOCK_SIZE
 	hex
 	default 0x400000 if COREBOOT_ROMSIZE_KB_4096
 	default 0x200000 if COREBOOT_ROMSIZE_KB_2048
Index: src/arch/i386/Config.lb
===================================================================
--- src/arch/i386/Config.lb	(revision 4704)
+++ src/arch/i386/Config.lb	(working copy)
@@ -105,7 +105,7 @@ 
 else
 	makerule coreboot.rom 
 		depends	"coreboot.strip buildrom $(PAYLOAD-1)"
-		action "PAYLOAD=$(PAYLOAD-1); if [ $(CONFIG_CBFS) -eq 1 ]; then PAYLOAD=/dev/null; touch cbfs-support; fi; ./buildrom $< $@ $$PAYLOAD $(CONFIG_ROM_IMAGE_SIZE) $(CONFIG_ROM_SECTION_SIZE)"
+		action "PAYLOAD=$(PAYLOAD-1); if [ $(CONFIG_CBFS) -eq 1 ]; then PAYLOAD=/dev/null; touch cbfs-support; fi; ./buildrom $< $@ $$PAYLOAD $(CONFIG_BOOTBLOCK_SIZE) $(CONFIG_ROM_SECTION_SIZE)"
 		action "if [ $(CONFIG_COMPRESSED_PAYLOAD_LZMA) -eq 1 -a $(CONFIG_CBFS) -eq 1 ]; then echo l > cbfs-support; fi"
 	end
 end
Index: src/arch/i386/init/ldscript_fallback.lb
===================================================================
--- src/arch/i386/init/ldscript_fallback.lb	(revision 4704)
+++ src/arch/i386/init/ldscript_fallback.lb	(working copy)
@@ -45,7 +45,7 @@ 
 
 	/* cut _start into last 64k*/
 	_x = .;
-	. = (_x < (CONFIG_ROMBASE - 0x10000 +  CONFIG_ROM_IMAGE_SIZE)) ? (CONFIG_ROMBASE - 0x10000 +  CONFIG_ROM_IMAGE_SIZE) : _x;
+	. = (_x < (CONFIG_ROMBASE - 0x10000 +  CONFIG_BOOTBLOCK_SIZE)) ? (CONFIG_ROMBASE - 0x10000 +  CONFIG_BOOTBLOCK_SIZE) : _x;
 
 	/* This section might be better named .setup */
 	.rom . : {
Index: src/arch/i386/init/ldscript_fallback_cbfs.lb
===================================================================
--- src/arch/i386/init/ldscript_fallback_cbfs.lb	(revision 4704)
+++ src/arch/i386/init/ldscript_fallback_cbfs.lb	(working copy)
@@ -38,7 +38,7 @@ 
 
 	/* cut _start into last 64k*/
 	_x = .;
-	. = (_x < (CONFIG_ROMBASE - 0x10000 +  CONFIG_ROM_IMAGE_SIZE)) ? (CONFIG_ROMBASE - 0x10000 +  CONFIG_ROM_IMAGE_SIZE) : _x;
+	. = (_x < (CONFIG_ROMBASE - 0x10000 +  CONFIG_BOOTBLOCK_SIZE)) ? (CONFIG_ROMBASE - 0x10000 +  CONFIG_BOOTBLOCK_SIZE) : _x;
 
 	/* This section might be better named .setup */
 	.rom . : {
Index: src/arch/i386/lib/id.inc
===================================================================
--- src/arch/i386/lib/id.inc	(revision 4704)
+++ src/arch/i386/lib/id.inc	(working copy)
@@ -8,7 +8,7 @@ 
 	.asciz CONFIG_MAINBOARD_PART_NUMBER
 .long __id_end + 0x10 - vendor  /* Reverse offset to the vendor id */
 .long __id_end + 0x10 - part    /* Reverse offset to the part number */
-.long CONFIG_PAYLOAD_SIZE + CONFIG_ROM_IMAGE_SIZE  /* Size of this romimage */
+.long CONFIG_PAYLOAD_SIZE + CONFIG_BOOTBLOCK_SIZE  /* Size of this romimage */
 	.globl __id_end
 
 __id_end:
Index: src/arch/i386/lib/id.lds
===================================================================
--- src/arch/i386/lib/id.lds	(revision 4704)
+++ src/arch/i386/lib/id.lds	(working copy)
@@ -1,5 +1,5 @@ 
 SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10) - (__id_end - __id_start);
+	. = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - 0x10) - (__id_end - __id_start);
 	.id (.): {
 		*(.id)
 	}
Index: documentation/LinuxBIOS-AMD64.tex
===================================================================
--- documentation/LinuxBIOS-AMD64.tex	(revision 4704)
+++ documentation/LinuxBIOS-AMD64.tex	(working copy)
@@ -286,7 +286,7 @@ 
 All local configuration variables have to be declared before they can be
 used. Example:
 \begin{verbatim}
-        uses CONFIG_ROM_IMAGE_SIZE
+        uses CONFIG_BOOTBLOCK_SIZE
 \end{verbatim}
 
 \textbf{NOTE:} Only configuration variables known to the configuration
@@ -303,7 +303,7 @@ 
 Example:
 
 \begin{verbatim}
-        default CONFIG_ROM_IMAGE_SIZE=0x10000
+        default CONFIG_BOOTBLOCK_SIZE=0x10000
 \end{verbatim}
 
 It is also possible to assign the value of one configuration variable to
@@ -366,7 +366,7 @@ 
 \begin{verbatim}
 romimage "normal"
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=0x10000
+        option CONFIG_BOOTBLOCK_SIZE=0x10000
         option COREBOOT_EXTRA_VERSION=".0Normal"
         mainboard amd/solo
         payload /suse/stepan/tg3ide_
@@ -460,7 +460,7 @@ 
 
 Set to \texttt{1} to build a fallback image. Defaults to \texttt{0}
 
-\item \begin{verbatim}CONFIG_ROM_IMAGE_SIZE\end{verbatim}
+\item \begin{verbatim}CONFIG_BOOTBLOCK_SIZE\end{verbatim}
 
 Default image size. Defaults to \texttt{65535} bytes.
 
@@ -1773,7 +1773,7 @@ 
 romimage "failover"
         option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="\$(shell cat ../../VERSION)\_Failover"
 end
Index: documentation/RFC/config.tex
===================================================================
--- documentation/RFC/config.tex	(revision 4704)
+++ documentation/RFC/config.tex	(working copy)
@@ -261,7 +261,7 @@ 
 #
 ### The linuxBIOS bootloader.
 ###
-option CONFIG_PAYLOAD_SIZE            = (CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE)
+option CONFIG_PAYLOAD_SIZE            = (CONFIG_ROM_SECTION_SIZE - CONFIG_BOOTBLOCK_SIZE)
 option CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1)
 #
 
@@ -275,7 +275,7 @@ 
 export CONFIG_MAINBOARD:=/home/rminnich/src/yapps2/freebios2/src/mainboard/amd/solo
 export CONFIG_ARCH:=i386
 export CONFIG_RAMBASE:=0x4000
-export CONFIG_ROM_IMAGE_SIZE:=65535
+export CONFIG_BOOTBLOCK_SIZE:=65535
 export CONFIG_PAYLOAD_SIZE:=131073
 export CONFIG_MAX_CPUS:=1
 export CONFIG_HEAP_SIZE:=8192
Index: targets/iwill/dk8_htx/Config-abuild.lb
===================================================================
--- targets/iwill/dk8_htx/Config-abuild.lb	(revision 4704)
+++ targets/iwill/dk8_htx/Config-abuild.lb	(working copy)
@@ -27,7 +27,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 end
 
Index: targets/iwill/dk8_htx/Config.lb
===================================================================
--- targets/iwill/dk8_htx/Config.lb	(revision 4704)
+++ targets/iwill/dk8_htx/Config.lb	(working copy)
@@ -12,10 +12,10 @@ 
 #        option CONFIG_ROM_SIZE = 458752 
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -38,10 +38,10 @@ 
 romimage "fallback" 
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -65,7 +65,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/iwill/dk8s2/Config.lb
===================================================================
--- targets/iwill/dk8s2/Config.lb	(revision 4704)
+++ targets/iwill/dk8s2/Config.lb	(working copy)
@@ -63,8 +63,8 @@ 
 #option CONFIG_FALLBACK_SIZE=98304
 option CONFIG_FALLBACK_SIZE=131072
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-option CONFIG_ROM_IMAGE_SIZE=65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+option CONFIG_BOOTBLOCK_SIZE=65536
  
 
 ###
@@ -133,14 +133,14 @@ 
 	option CONFIG_ROM_SECTION_SIZE  = (CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE)
 	option CONFIG_ROM_SECTION_OFFSET= 0
 
-	option CONFIG_PAYLOAD_SIZE            = (CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE)
+	option CONFIG_PAYLOAD_SIZE            = (CONFIG_ROM_SECTION_SIZE - CONFIG_BOOTBLOCK_SIZE)
 	option CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1)
 	option CONFIG_ROMBASE      = (CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE)
 
 #	option CONFIG_XIP_ROM_SIZE = CONFIG_FALLBACK_SIZE
         option CONFIG_XIP_ROM_SIZE = 65536
 
-	option CONFIG_XIP_ROM_BASE = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - CONFIG_XIP_ROM_SIZE)
+	option CONFIG_XIP_ROM_BASE = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - CONFIG_XIP_ROM_SIZE)
 
 	payload /usr/src/filo-0.4.1_btext/filo.elf
 #	payload /usr/src/filo-0.4.2/filo.elf
@@ -152,13 +152,13 @@ 
 	option CONFIG_ROM_SECTION_SIZE  = CONFIG_FALLBACK_SIZE
 	option CONFIG_ROM_SECTION_OFFSET= (CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE)
 
-	option CONFIG_PAYLOAD_SIZE            = (CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE)
+	option CONFIG_PAYLOAD_SIZE            = (CONFIG_ROM_SECTION_SIZE - CONFIG_BOOTBLOCK_SIZE)
 	option CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1)
 	option CONFIG_ROMBASE      = (CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE)
 
 #	option CONFIG_XIP_ROM_SIZE = CONFIG_FALLBACK_SIZE
 	option CONFIG_XIP_ROM_SIZE = 65536
-	option CONFIG_XIP_ROM_BASE = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - CONFIG_XIP_ROM_SIZE)
+	option CONFIG_XIP_ROM_BASE = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - CONFIG_XIP_ROM_SIZE)
 
 	payload ../../../payloads/filo.elf
 #	payload /usr/src/filo-0.4.2/filo.elf
Index: targets/iwill/dk8x/Config.lb
===================================================================
--- targets/iwill/dk8x/Config.lb	(revision 4704)
+++ targets/iwill/dk8x/Config.lb	(working copy)
@@ -63,8 +63,8 @@ 
 #option CONFIG_FALLBACK_SIZE=98304
 option CONFIG_FALLBACK_SIZE=131072
 
-## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-option CONFIG_ROM_IMAGE_SIZE=65536
+## CONFIG_BOOTBLOCK_SIZE is the amount of space to allow coreboot to occupy.
+option CONFIG_BOOTBLOCK_SIZE=65536
  
 
 ###
@@ -133,14 +133,14 @@ 
 	option CONFIG_ROM_SECTION_SIZE  = (CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE)
 	option CONFIG_ROM_SECTION_OFFSET= 0
 
-	option CONFIG_PAYLOAD_SIZE            = (CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE)
+	option CONFIG_PAYLOAD_SIZE            = (CONFIG_ROM_SECTION_SIZE - CONFIG_BOOTBLOCK_SIZE)
 	option CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1)
 	option CONFIG_ROMBASE      = (CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE)
 
 #	option CONFIG_XIP_ROM_SIZE = CONFIG_FALLBACK_SIZE
         option CONFIG_XIP_ROM_SIZE = 65536
 
-	option CONFIG_XIP_ROM_BASE = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - CONFIG_XIP_ROM_SIZE)
+	option CONFIG_XIP_ROM_BASE = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - CONFIG_XIP_ROM_SIZE)
 
 	payload /usr/src/filo-0.4.1_btext/filo.elf
 #	payload /usr/src/filo-0.4.2/filo.elf
@@ -152,13 +152,13 @@ 
 	option CONFIG_ROM_SECTION_SIZE  = CONFIG_FALLBACK_SIZE
 	option CONFIG_ROM_SECTION_OFFSET= (CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE)
 
-	option CONFIG_PAYLOAD_SIZE            = (CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE)
+	option CONFIG_PAYLOAD_SIZE            = (CONFIG_ROM_SECTION_SIZE - CONFIG_BOOTBLOCK_SIZE)
 	option CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1)
 	option CONFIG_ROMBASE      = (CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE)
 
 #	option CONFIG_XIP_ROM_SIZE = CONFIG_FALLBACK_SIZE
 	option CONFIG_XIP_ROM_SIZE = 65536
-	option CONFIG_XIP_ROM_BASE = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - CONFIG_XIP_ROM_SIZE)
+	option CONFIG_XIP_ROM_BASE = (CONFIG_ROMBASE + CONFIG_BOOTBLOCK_SIZE - CONFIG_XIP_ROM_SIZE)
 
 	payload ../../../payloads/filo.elf
 #	payload /usr/src/filo-0.4.2/filo.elf
Index: targets/bcom/winnetp680/Config-abuild.lb
===================================================================
--- targets/bcom/winnetp680/Config-abuild.lb	(revision 4704)
+++ targets/bcom/winnetp680/Config-abuild.lb	(working copy)
@@ -14,7 +14,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/bcom/winnet100/Config.lb
===================================================================
--- targets/bcom/winnet100/Config.lb	(revision 4704)
+++ targets/bcom/winnet100/Config.lb	(working copy)
@@ -38,14 +38,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE = 0
-	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload ../../../../../../../images/etherboot.elf
 end
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE = 1
-	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload ../../../../../../../images/etherboot.elf
 end
Index: targets/televideo/tc7020/Config.lb
===================================================================
--- targets/televideo/tc7020/Config.lb	(revision 4704)
+++ targets/televideo/tc7020/Config.lb	(working copy)
@@ -36,14 +36,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE = 0
-	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE = 1
-	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
Index: targets/broadcom/blast/Config.lb
===================================================================
--- targets/broadcom/blast/Config.lb	(revision 4704)
+++ targets/broadcom/blast/Config.lb	(working copy)
@@ -13,10 +13,10 @@ 
 #       64K for Etherboot
 #       option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
-#	option CONFIG_ROM_IMAGE_SIZE=0x15000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x15000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -38,10 +38,10 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
-#	option CONFIG_ROM_IMAGE_SIZE=0x15000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x15000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/supermicro/h8dmr/Config-abuild.lb
===================================================================
--- targets/supermicro/h8dmr/Config-abuild.lb	(revision 4704)
+++ targets/supermicro/h8dmr/Config-abuild.lb	(working copy)
@@ -23,7 +23,7 @@ 
 
 romimage "failover"
   option CONFIG_USE_FAILOVER_IMAGE=1
-  option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+  option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
   option COREBOOT_EXTRA_VERSION=".0-failover"
 end
 
Index: targets/supermicro/h8dmr/Config.lb.kernel
===================================================================
--- targets/supermicro/h8dmr/Config.lb.kernel	(revision 4704)
+++ targets/supermicro/h8dmr/Config.lb.kernel	(working copy)
@@ -30,10 +30,10 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x18000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x19800
+	option CONFIG_BOOTBLOCK_SIZE=0x18000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -65,7 +65,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/supermicro/h8dmr/Config.lb
===================================================================
--- targets/supermicro/h8dmr/Config.lb	(revision 4704)
+++ targets/supermicro/h8dmr/Config.lb	(working copy)
@@ -35,7 +35,7 @@ 
 
 romimage "failover"
   option CONFIG_USE_FAILOVER_IMAGE=1
-  option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+  option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
   option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
Index: targets/supermicro/h8dmr/Config-lab.lb
===================================================================
--- targets/supermicro/h8dmr/Config-lab.lb	(revision 4704)
+++ targets/supermicro/h8dmr/Config-lab.lb	(working copy)
@@ -31,7 +31,7 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option CONFIG_ROM_IMAGE_SIZE=0x18000
+	option CONFIG_BOOTBLOCK_SIZE=0x18000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
@@ -40,7 +40,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/supermicro/h8dme/Config-abuild.lb
===================================================================
--- targets/supermicro/h8dme/Config-abuild.lb	(revision 4704)
+++ targets/supermicro/h8dme/Config-abuild.lb	(working copy)
@@ -27,7 +27,7 @@ 
 romimage "failover"
         option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION=".0-failover"
 end
Index: targets/supermicro/h8dme/Config.lb.kernel
===================================================================
--- targets/supermicro/h8dme/Config.lb.kernel	(revision 4704)
+++ targets/supermicro/h8dme/Config.lb.kernel	(working copy)
@@ -27,7 +27,7 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option CONFIG_ROM_IMAGE_SIZE=0x18000
+	option CONFIG_BOOTBLOCK_SIZE=0x18000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 
@@ -36,7 +36,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/supermicro/h8dme/Config.lb
===================================================================
--- targets/supermicro/h8dme/Config.lb	(revision 4704)
+++ targets/supermicro/h8dme/Config.lb	(working copy)
@@ -22,7 +22,7 @@ 
 romimage "normal"
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 	payload ../payload.elf
@@ -31,7 +31,7 @@ 
 romimage "fallback"
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf
@@ -40,7 +40,7 @@ 
 romimage "failover"
         option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/supermicro/h8dme/Config-lab.lb
===================================================================
--- targets/supermicro/h8dme/Config-lab.lb	(revision 4704)
+++ targets/supermicro/h8dme/Config-lab.lb	(working copy)
@@ -28,7 +28,7 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option CONFIG_ROM_IMAGE_SIZE=0x18000
+	option CONFIG_BOOTBLOCK_SIZE=0x18000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
@@ -37,7 +37,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/supermicro/h8dmr_fam10/Config-abuild.lb
===================================================================
--- targets/supermicro/h8dmr_fam10/Config-abuild.lb	(revision 4704)
+++ targets/supermicro/h8dmr_fam10/Config-abuild.lb	(working copy)
@@ -23,7 +23,7 @@ 
 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
-  option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+  option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION=".0-failover"
 end
 
Index: targets/supermicro/h8dmr_fam10/Config.lb.kernel
===================================================================
--- targets/supermicro/h8dmr_fam10/Config.lb.kernel	(revision 4704)
+++ targets/supermicro/h8dmr_fam10/Config.lb.kernel	(working copy)
@@ -30,10 +30,10 @@ 
 	option USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-#	option ROM_IMAGE_SIZE=0x19800
-	option ROM_IMAGE_SIZE=0x18000
-#	option ROM_IMAGE_SIZE=0x15800
-#	option ROM_IMAGE_SIZE=0x13800
+#	option BOOTBLOCK_SIZE=0x19800
+	option BOOTBLOCK_SIZE=0x18000
+#	option BOOTBLOCK_SIZE=0x15800
+#	option BOOTBLOCK_SIZE=0x13800
 	option XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -65,7 +65,7 @@ 
 romimage "failover"
 	option USE_FAILOVER_IMAGE=1
         option USE_FALLBACK_IMAGE=0
-        option ROM_IMAGE_SIZE=FAILOVER_SIZE
+        option BOOTBLOCK_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/supermicro/h8dmr_fam10/Config.lb
===================================================================
--- targets/supermicro/h8dmr_fam10/Config.lb	(revision 4704)
+++ targets/supermicro/h8dmr_fam10/Config.lb	(working copy)
@@ -37,7 +37,7 @@ 
 
 romimage "failover"
   option CONFIG_USE_FAILOVER_IMAGE=1
-  option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+  option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
   option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
Index: targets/supermicro/h8dmr_fam10/Config-lab.lb
===================================================================
--- targets/supermicro/h8dmr_fam10/Config-lab.lb	(revision 4704)
+++ targets/supermicro/h8dmr_fam10/Config-lab.lb	(working copy)
@@ -30,7 +30,7 @@ 
 
 romimage "failover"
   option CONFIG_USE_FAILOVER_IMAGE=1
-  option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+  option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
   option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
Index: targets/gigabyte/m57sli/Config-abuild.lb
===================================================================
--- targets/gigabyte/m57sli/Config-abuild.lb	(revision 4704)
+++ targets/gigabyte/m57sli/Config-abuild.lb	(working copy)
@@ -27,7 +27,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 end
 
Index: targets/gigabyte/m57sli/Config.lb.kernel
===================================================================
--- targets/gigabyte/m57sli/Config.lb.kernel	(revision 4704)
+++ targets/gigabyte/m57sli/Config.lb.kernel	(working copy)
@@ -32,10 +32,10 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x17000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x19800
+	option CONFIG_BOOTBLOCK_SIZE=0x17000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -67,7 +67,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/gigabyte/m57sli/Config.lb
===================================================================
--- targets/gigabyte/m57sli/Config.lb	(revision 4704)
+++ targets/gigabyte/m57sli/Config.lb	(working copy)
@@ -34,10 +34,10 @@ 
 #        option CONFIG_ROM_SIZE = 479232
         option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x18800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x18800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -63,10 +63,10 @@ 
 romimage "fallback" 
         option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x19800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -97,7 +97,7 @@ 
 romimage "failover"
         option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/gigabyte/m57sli/Config-lab.lb
===================================================================
--- targets/gigabyte/m57sli/Config-lab.lb	(revision 4704)
+++ targets/gigabyte/m57sli/Config-lab.lb	(working copy)
@@ -32,7 +32,7 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option CONFIG_ROM_IMAGE_SIZE=0x17000
+	option CONFIG_BOOTBLOCK_SIZE=0x17000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
@@ -41,7 +41,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/gigabyte/ga_2761gxdk/Config-abuild.lb
===================================================================
--- targets/gigabyte/ga_2761gxdk/Config-abuild.lb	(revision 4704)
+++ targets/gigabyte/ga_2761gxdk/Config-abuild.lb	(working copy)
@@ -48,7 +48,7 @@ 
 romimage "failover"
         option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION=".0-Failover"
 end
Index: targets/gigabyte/ga_2761gxdk/Config.lb
===================================================================
--- targets/gigabyte/ga_2761gxdk/Config.lb	(revision 4704)
+++ targets/gigabyte/ga_2761gxdk/Config.lb	(working copy)
@@ -29,7 +29,7 @@ 
         option CONFIG_ROM_SIZE = (512*1024 - 32*1024)
 
         option CONFIG_USE_FAILOVER_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=0x20000
+        option CONFIG_BOOTBLOCK_SIZE=0x20000
         option CONFIG_XIP_ROM_SIZE=0x40000
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #	payload ../../../../payloads/filo_uda1.elf
@@ -39,7 +39,7 @@ 
 romimage "fallback"
         option CONFIG_USE_FAILOVER_IMAGE=0
         option CONFIG_USE_FALLBACK_IMAGE=1
-        option CONFIG_ROM_IMAGE_SIZE=0x20000
+        option CONFIG_BOOTBLOCK_SIZE=0x20000
         option CONFIG_XIP_ROM_SIZE=0x40000
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #	payload ../../../../payloads/filo_uda1.elf
@@ -49,7 +49,7 @@ 
 romimage "failover"
         option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/digitallogic/msm800sev/Config.lb
===================================================================
--- targets/digitallogic/msm800sev/Config.lb	(revision 4704)
+++ targets/digitallogic/msm800sev/Config.lb	(working copy)
@@ -11,9 +11,9 @@ 
 ##
 option CONFIG_ROM_SIZE = 1024*1024 - 36 * 1024
 
-## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
+## CONFIG_BOOTBLOCK_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
-option CONFIG_ROM_IMAGE_SIZE=64*1024
+option CONFIG_BOOTBLOCK_SIZE=64*1024
 
 option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 
Index: targets/digitallogic/adl855pc/Config.lb
===================================================================
--- targets/digitallogic/adl855pc/Config.lb	(revision 4704)
+++ targets/digitallogic/adl855pc/Config.lb	(working copy)
@@ -8,14 +8,14 @@ 
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=9
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 	payload /etc/hosts
 end
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /etc/hosts
 end
Index: targets/digitallogic/msm586seg/Config.lb
===================================================================
--- targets/digitallogic/msm586seg/Config.lb	(revision 4704)
+++ targets/digitallogic/msm586seg/Config.lb	(working copy)
@@ -11,7 +11,7 @@ 
 
 #romimage "normal"
 #	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x10000
+#	option CONFIG_BOOTBLOCK_SIZE=0x10000
 #	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /etc/hosts
 #end
@@ -21,9 +21,9 @@ 
 #	option CONFIG_ROM_SIZE=512*1024
 #	option CONFIG_ROM_SECTION_SIZE=512*1024
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=32 * 1024 # 0x8000
-	option CONFIG_ROM_IMAGE_SIZE=128 * 1024 # 0x10000
-#	option CONFIG_ROM_IMAGE_SIZE=512 * 1024 # 0x10000
+#	option CONFIG_BOOTBLOCK_SIZE=32 * 1024 # 0x8000
+	option CONFIG_BOOTBLOCK_SIZE=128 * 1024 # 0x10000
+#	option CONFIG_BOOTBLOCK_SIZE=512 * 1024 # 0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../../filo.elf
 #	payload ../../eepro100--ide_disk.zelf
Index: targets/emulation/qemu-x86/Config-car.lb
===================================================================
--- targets/emulation/qemu-x86/Config-car.lb	(revision 4704)
+++ targets/emulation/qemu-x86/Config-car.lb	(working copy)
@@ -16,7 +16,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION="-GRUB2"
 #	payload /home/stepan/core.img
 	payload ../payload.elf
Index: targets/olpc/btest/Config.lb
===================================================================
--- targets/olpc/btest/Config.lb	(revision 4704)
+++ targets/olpc/btest/Config.lb	(working copy)
@@ -16,7 +16,7 @@ 
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 3
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=32*1024
+	option CONFIG_BOOTBLOCK_SIZE=32*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
Index: targets/olpc/rev_a/Config.kernel.lb
===================================================================
--- targets/olpc/rev_a/Config.kernel.lb	(revision 4704)
+++ targets/olpc/rev_a/Config.kernel.lb	(working copy)
@@ -8,7 +8,7 @@ 
 
 #romimage "normal"
 #	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x10000
+#	option CONFIG_BOOTBLOCK_SIZE=0x10000
 #	option COREBOOT_EXTRA_VERSION=".0Normal"
 ##	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 ##	payload ../../../../tg3--ide_disk.zelf	
@@ -20,7 +20,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/olpc/rev_a/Config.lb
===================================================================
--- targets/olpc/rev_a/Config.lb	(revision 4704)
+++ targets/olpc/rev_a/Config.lb	(working copy)
@@ -12,7 +12,7 @@ 
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=32*1024
+	option CONFIG_BOOTBLOCK_SIZE=32*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
Index: targets/olpc/rev_a/Config.SPI.lb
===================================================================
--- targets/olpc/rev_a/Config.SPI.lb	(revision 4704)
+++ targets/olpc/rev_a/Config.SPI.lb	(working copy)
@@ -16,7 +16,7 @@ 
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=32*1024
+	option CONFIG_BOOTBLOCK_SIZE=32*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
Index: targets/olpc/rev_a/Config.1M.lb
===================================================================
--- targets/olpc/rev_a/Config.1M.lb	(revision 4704)
+++ targets/olpc/rev_a/Config.1M.lb	(working copy)
@@ -15,7 +15,7 @@ 
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=32*1024
+	option CONFIG_BOOTBLOCK_SIZE=32*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
Index: targets/technologic/ts5300/Config.lb
===================================================================
--- targets/technologic/ts5300/Config.lb	(revision 4704)
+++ targets/technologic/ts5300/Config.lb	(working copy)
@@ -10,7 +10,7 @@ 
 
 #romimage "normal"
 #	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x10000
+#	option CONFIG_BOOTBLOCK_SIZE=0x10000
 #	option COREBOOT_EXTRA_VERSION=".0-Normal"
 #	payload /etc/hosts
 #end
@@ -20,10 +20,10 @@ 
 #	option CONFIG_ROM_SIZE=512*1024
 #	option CONFIG_ROM_SECTION_SIZE=512*1024
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=32 * 1024 # 0x8000
-#	option CONFIG_ROM_IMAGE_SIZE=48 * 1024 # 0x8000
-#	option CONFIG_ROM_IMAGE_SIZE=64 * 1024 # 0x10000
-#	option CONFIG_ROM_IMAGE_SIZE=512 * 1024 # 0x10000
+	option CONFIG_BOOTBLOCK_SIZE=32 * 1024 # 0x8000
+#	option CONFIG_BOOTBLOCK_SIZE=48 * 1024 # 0x8000
+#	option CONFIG_BOOTBLOCK_SIZE=64 * 1024 # 0x10000
+#	option CONFIG_BOOTBLOCK_SIZE=512 * 1024 # 0x10000
 #	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	option COREBOOT_EXTRA_VERSION=".0"
 	payload /home/stepan/filo-ts5300.elf
Index: targets/amd/pistachio/Config-abuild.lb
===================================================================
--- targets/amd/pistachio/Config-abuild.lb	(revision 4704)
+++ targets/amd/pistachio/Config-abuild.lb	(working copy)
@@ -13,7 +13,7 @@ 
 option CONFIG_ROM_SIZE=1024*1024
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
         option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
@@ -21,7 +21,7 @@ 
 
 romimage "fallback"
         option CONFIG_USE_FALLBACK_IMAGE=1
-        option CONFIG_ROM_IMAGE_SIZE=0x20000
+        option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
Index: targets/amd/pistachio/Config.lb
===================================================================
--- targets/amd/pistachio/Config.lb	(revision 4704)
+++ targets/amd/pistachio/Config.lb	(working copy)
@@ -6,14 +6,14 @@ 
 romimage "normal"
 	option CONFIG_ROM_SIZE = 1024*1024 - 55808
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	payload ../payload.elf
 end
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	payload ../payload.elf
 end
Index: targets/amd/dbm690t/Config-abuild.lb
===================================================================
--- targets/amd/dbm690t/Config-abuild.lb	(revision 4704)
+++ targets/amd/dbm690t/Config-abuild.lb	(working copy)
@@ -13,7 +13,7 @@ 
 option CONFIG_ROM_SIZE=1024*1024
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
         option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
@@ -21,7 +21,7 @@ 
 
 romimage "fallback"
         option CONFIG_USE_FALLBACK_IMAGE=1
-        option CONFIG_ROM_IMAGE_SIZE=0x20000
+        option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
Index: targets/amd/dbm690t/Config.lb
===================================================================
--- targets/amd/dbm690t/Config.lb	(revision 4704)
+++ targets/amd/dbm690t/Config.lb	(working copy)
@@ -6,14 +6,14 @@ 
 romimage "normal"
 	option CONFIG_ROM_SIZE = 1024*1024 - 55808
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	payload ../payload.elf
 end
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	payload ../payload.elf
 end
Index: targets/amd/rumba/Config.lb
===================================================================
--- targets/amd/rumba/Config.lb	(revision 4704)
+++ targets/amd/rumba/Config.lb	(working copy)
@@ -8,7 +8,7 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -20,7 +20,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/amd/rumba/Config.nofallback.lb
===================================================================
--- targets/amd/rumba/Config.nofallback.lb	(revision 4704)
+++ targets/amd/rumba/Config.nofallback.lb	(working copy)
@@ -8,7 +8,7 @@ 
 
 #romimage "normal"
 #	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x10000
+#	option CONFIG_BOOTBLOCK_SIZE=0x10000
 #	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -20,7 +20,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/amd/serengeti_cheetah/Config-abuild.lb
===================================================================
--- targets/amd/serengeti_cheetah/Config-abuild.lb	(revision 4704)
+++ targets/amd/serengeti_cheetah/Config-abuild.lb	(working copy)
@@ -27,7 +27,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 end
 
Index: targets/amd/serengeti_cheetah/Config.lb
===================================================================
--- targets/amd/serengeti_cheetah/Config.lb	(revision 4704)
+++ targets/amd/serengeti_cheetah/Config.lb	(working copy)
@@ -15,10 +15,10 @@ 
 #        option CONFIG_ROM_SIZE = 458752 
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x18800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x18800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -44,10 +44,10 @@ 
 romimage "fallback" 
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x19800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -77,7 +77,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/amd/serengeti_cheetah/Config-lab.lb
===================================================================
--- targets/amd/serengeti_cheetah/Config-lab.lb	(revision 4704)
+++ targets/amd/serengeti_cheetah/Config-lab.lb	(working copy)
@@ -14,7 +14,7 @@ 
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x1a000
+	option CONFIG_BOOTBLOCK_SIZE=0x1a000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 	payload ../payload.elf.lzma
Index: targets/amd/norwich/Config.lb
===================================================================
--- targets/amd/norwich/Config.lb	(revision 4704)
+++ targets/amd/norwich/Config.lb	(working copy)
@@ -40,7 +40,7 @@ 
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=64*1024
+	option CONFIG_BOOTBLOCK_SIZE=64*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../payload.elf
 end
Index: targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
===================================================================
--- targets/amd/serengeti_cheetah_fam10/Config-abuild.lb	(revision 4704)
+++ targets/amd/serengeti_cheetah_fam10/Config-abuild.lb	(working copy)
@@ -14,7 +14,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x3f000
+	option CONFIG_BOOTBLOCK_SIZE=0x3f000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
@@ -22,7 +22,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION=".0-failover"
 end
Index: targets/amd/serengeti_cheetah_fam10/Config.lb
===================================================================
--- targets/amd/serengeti_cheetah_fam10/Config.lb	(revision 4704)
+++ targets/amd/serengeti_cheetah_fam10/Config.lb	(working copy)
@@ -38,8 +38,8 @@ 
 #	option CONFIG_ROM_SIZE = 0x100000
 #	option CONFIG_USE_FAILOVER_IMAGE=0
 #	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x30000
+#	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x30000
 #	option CONFIG_XIP_ROM_SIZE=0x40000
 #	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #	payload ../payload.elf
@@ -48,10 +48,10 @@ 
 romimage "fallback"
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x7f000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x19800
+	option CONFIG_BOOTBLOCK_SIZE=0x7f000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
 	option CONFIG_XIP_ROM_SIZE=0x80000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf
@@ -60,7 +60,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/amd/serengeti_cheetah_fam10/Config-lab.lb
===================================================================
--- targets/amd/serengeti_cheetah_fam10/Config-lab.lb	(revision 4704)
+++ targets/amd/serengeti_cheetah_fam10/Config-lab.lb	(working copy)
@@ -35,7 +35,7 @@ 
 romimage "fallback"
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x30000
+	option CONFIG_BOOTBLOCK_SIZE=0x30000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
@@ -44,7 +44,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/amd/db800/Config.lb
===================================================================
--- targets/amd/db800/Config.lb	(revision 4704)
+++ targets/amd/db800/Config.lb	(working copy)
@@ -40,7 +40,7 @@ 
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=64*1024
+	option CONFIG_BOOTBLOCK_SIZE=64*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../payload.elf
 end
Index: targets/iei/nova4899r/Config.lb
===================================================================
--- targets/iei/nova4899r/Config.lb	(revision 4704)
+++ targets/iei/nova4899r/Config.lb	(working copy)
@@ -38,7 +38,7 @@ 
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 8
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=64*1024
+	option CONFIG_BOOTBLOCK_SIZE=64*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /opt/coreboot-SVN/filo.elf
 end
Index: targets/iei/pcisa-lx-800-r10/Config.lb
===================================================================
--- targets/iei/pcisa-lx-800-r10/Config.lb	(revision 4704)
+++ targets/iei/pcisa-lx-800-r10/Config.lb	(working copy)
@@ -38,7 +38,7 @@ 
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE = 1
-	option CONFIG_ROM_IMAGE_SIZE = 80 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 80 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload ../payload.elf
 end
Index: targets/iei/juki-511p/Config.lb
===================================================================
--- targets/iei/juki-511p/Config.lb	(revision 4704)
+++ targets/iei/juki-511p/Config.lb	(working copy)
@@ -29,7 +29,7 @@ 
 option CONFIG_PRECOMPRESSED_PAYLOAD=0
 
 romimage "fallback"
-	option CONFIG_ROM_IMAGE_SIZE=64*1024
+	option CONFIG_BOOTBLOCK_SIZE=64*1024
 	option COREBOOT_EXTRA_VERSION="-filo"
 	payload ../../filo.elf
 end
Index: targets/tyan/s2912/Config-abuild.lb
===================================================================
--- targets/tyan/s2912/Config-abuild.lb	(revision 4704)
+++ targets/tyan/s2912/Config-abuild.lb	(working copy)
@@ -27,7 +27,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 end
 
Index: targets/tyan/s2912/Config.lb.kernel
===================================================================
--- targets/tyan/s2912/Config.lb.kernel	(revision 4704)
+++ targets/tyan/s2912/Config.lb.kernel	(working copy)
@@ -32,10 +32,10 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x17000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x19800
+	option CONFIG_BOOTBLOCK_SIZE=0x17000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -67,7 +67,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/tyan/s2912/Config.lb
===================================================================
--- targets/tyan/s2912/Config.lb	(revision 4704)
+++ targets/tyan/s2912/Config.lb	(working copy)
@@ -36,10 +36,10 @@ 
 #        option CONFIG_ROM_SIZE = 479232
         option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x18800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x18800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -64,10 +64,10 @@ 
 romimage "fallback" 
         option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x19800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -97,7 +97,7 @@ 
 romimage "failover"
         option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/tyan/s2850/Config.lb
===================================================================
--- targets/tyan/s2850/Config.lb	(revision 4704)
+++ targets/tyan/s2850/Config.lb	(working copy)
@@ -14,11 +14,11 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13c00
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13c00
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -37,11 +37,11 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13c00
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13c00
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2735/Config.lb
===================================================================
--- targets/tyan/s2735/Config.lb	(revision 4704)
+++ targets/tyan/s2735/Config.lb	(working copy)
@@ -14,7 +14,7 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=0x11800
+        option CONFIG_BOOTBLOCK_SIZE=0x11800
         option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -29,7 +29,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-        option CONFIG_ROM_IMAGE_SIZE=0x11800
+        option CONFIG_BOOTBLOCK_SIZE=0x11800
         option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2880/Config.lb
===================================================================
--- targets/tyan/s2880/Config.lb	(revision 4704)
+++ targets/tyan/s2880/Config.lb	(working copy)
@@ -14,11 +14,11 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -36,11 +36,11 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2881/Config.lb
===================================================================
--- targets/tyan/s2881/Config.lb	(revision 4704)
+++ targets/tyan/s2881/Config.lb	(working copy)
@@ -16,10 +16,10 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#        option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13000
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#        option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13000
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
         option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -38,10 +38,10 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#        option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13000
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#        option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13000
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
         option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2881/Config-lab.lb
===================================================================
--- targets/tyan/s2881/Config-lab.lb	(revision 4704)
+++ targets/tyan/s2881/Config-lab.lb	(working copy)
@@ -14,7 +14,7 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option CONFIG_ROM_IMAGE_SIZE=0x17000
+	option CONFIG_BOOTBLOCK_SIZE=0x17000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
Index: targets/tyan/s4880/Config.lb
===================================================================
--- targets/tyan/s4880/Config.lb	(revision 4704)
+++ targets/tyan/s4880/Config.lb	(working copy)
@@ -14,9 +14,9 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x19000
-#	option CONFIG_ROM_IMAGE_SIZE=0x19c00
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x19000
+#	option CONFIG_BOOTBLOCK_SIZE=0x19c00
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -33,9 +33,9 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x19000
-#	option CONFIG_ROM_IMAGE_SIZE=0x19c00
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x19000
+#	option CONFIG_BOOTBLOCK_SIZE=0x19c00
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2891/Config-abuild.lb
===================================================================
--- targets/tyan/s2891/Config-abuild.lb	(revision 4704)
+++ targets/tyan/s2891/Config-abuild.lb	(working copy)
@@ -12,14 +12,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/tyan/s2891/Config.lb.com2
===================================================================
--- targets/tyan/s2891/Config.lb.com2	(revision 4704)
+++ targets/tyan/s2891/Config.lb.com2	(working copy)
@@ -14,9 +14,9 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#        option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13000
-	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#        option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13000
+	option CONFIG_BOOTBLOCK_SIZE=0x15800
         option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -35,9 +35,9 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#        option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13000
-	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#        option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13000
+	option CONFIG_BOOTBLOCK_SIZE=0x15800
         option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2891/Config.lb
===================================================================
--- targets/tyan/s2891/Config.lb	(revision 4704)
+++ targets/tyan/s2891/Config.lb	(working copy)
@@ -16,10 +16,10 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#        option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13000
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#        option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13000
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
         option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -39,10 +39,10 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#        option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13000
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#        option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13000
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
         option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2891/Config-lab.lb
===================================================================
--- targets/tyan/s2891/Config-lab.lb	(revision 4704)
+++ targets/tyan/s2891/Config-lab.lb	(working copy)
@@ -14,7 +14,7 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option CONFIG_ROM_IMAGE_SIZE=0x17000
+	option CONFIG_BOOTBLOCK_SIZE=0x17000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
Index: targets/tyan/s2882/Config.lb
===================================================================
--- targets/tyan/s2882/Config.lb	(revision 4704)
+++ targets/tyan/s2882/Config.lb	(working copy)
@@ -14,9 +14,9 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#        option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#        option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
         option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -33,9 +33,9 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#        option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#        option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
         option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2882/Config-lab.lb
===================================================================
--- targets/tyan/s2882/Config-lab.lb	(revision 4704)
+++ targets/tyan/s2882/Config-lab.lb	(working copy)
@@ -14,7 +14,7 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option CONFIG_ROM_IMAGE_SIZE=0x17000
+	option CONFIG_BOOTBLOCK_SIZE=0x17000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
Index: targets/tyan/s2892/Config-abuild.lb
===================================================================
--- targets/tyan/s2892/Config-abuild.lb	(revision 4704)
+++ targets/tyan/s2892/Config-abuild.lb	(working copy)
@@ -12,14 +12,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/tyan/s2892/Config.lb
===================================================================
--- targets/tyan/s2892/Config.lb	(revision 4704)
+++ targets/tyan/s2892/Config.lb	(working copy)
@@ -16,11 +16,11 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16380
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16380
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -39,11 +39,11 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16380
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16380
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2892/Config-lab.lb
===================================================================
--- targets/tyan/s2892/Config-lab.lb	(revision 4704)
+++ targets/tyan/s2892/Config-lab.lb	(working copy)
@@ -11,7 +11,7 @@ 
 option CONFIG_CONSOLE_SERIAL8250 = 1
 option CONFIG_CONSOLE_VGA = 1
 option CONFIG_XIP_ROM_SIZE = 0x20000
-option CONFIG_ROM_IMAGE_SIZE = 0x18000
+option CONFIG_BOOTBLOCK_SIZE = 0x18000
 option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 
 # Tyan s2892
Index: targets/tyan/s4882/Config.lb
===================================================================
--- targets/tyan/s4882/Config.lb	(revision 4704)
+++ targets/tyan/s4882/Config.lb	(working copy)
@@ -14,11 +14,11 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x19000
-#	option CONFIG_ROM_IMAGE_SIZE=0x19c00
-#	option CONFIG_ROM_IMAGE_SIZE=0x18800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16200
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x19000
+#	option CONFIG_BOOTBLOCK_SIZE=0x19c00
+#	option CONFIG_BOOTBLOCK_SIZE=0x18800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16200
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -37,11 +37,11 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x19000
-#	option CONFIG_ROM_IMAGE_SIZE=0x19c00
-#	option CONFIG_ROM_IMAGE_SIZE=0x18800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16200
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x19000
+#	option CONFIG_BOOTBLOCK_SIZE=0x19c00
+#	option CONFIG_BOOTBLOCK_SIZE=0x18800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16200
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2875/Config.lb
===================================================================
--- targets/tyan/s2875/Config.lb	(revision 4704)
+++ targets/tyan/s2875/Config.lb	(working copy)
@@ -14,11 +14,11 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -36,11 +36,11 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2885/Config.lb
===================================================================
--- targets/tyan/s2885/Config.lb	(revision 4704)
+++ targets/tyan/s2885/Config.lb	(working copy)
@@ -14,10 +14,10 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 512*1024-64*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16200
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16200
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -38,10 +38,10 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
-#	option CONFIG_ROM_IMAGE_SIZE=0x16200
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x16200
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/tyan/s2895/Config.lb
===================================================================
--- targets/tyan/s2895/Config.lb	(revision 4704)
+++ targets/tyan/s2895/Config.lb	(working copy)
@@ -9,7 +9,7 @@ 
 romimage "normal"
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 	payload ../payload.elf
@@ -18,7 +18,7 @@ 
 romimage "fallback" 
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf
Index: targets/tyan/s2895/Config-lab.lb
===================================================================
--- targets/tyan/s2895/Config-lab.lb	(revision 4704)
+++ targets/tyan/s2895/Config-lab.lb	(working copy)
@@ -8,7 +8,7 @@ 
 option CONFIG_CONSOLE_SERIAL8250 = 1
 option CONFIG_CONSOLE_VGA = 1
 option CONFIG_XIP_ROM_SIZE = 0x20000
-option CONFIG_ROM_IMAGE_SIZE = 0x18000
+option CONFIG_BOOTBLOCK_SIZE = 0x18000
 option CONFIG_HAVE_FAILOVER_BOOT = 0
 option CONFIG_FAILOVER_SIZE = 0
 option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
Index: targets/tyan/s2912_fam10/Config-abuild.lb
===================================================================
--- targets/tyan/s2912_fam10/Config-abuild.lb	(revision 4704)
+++ targets/tyan/s2912_fam10/Config-abuild.lb	(working copy)
@@ -45,7 +45,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION=".0-Failover"
 end
Index: targets/tyan/s2912_fam10/Config.lb.kernel
===================================================================
--- targets/tyan/s2912_fam10/Config.lb.kernel	(revision 4704)
+++ targets/tyan/s2912_fam10/Config.lb.kernel	(working copy)
@@ -32,10 +32,10 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x17000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x19800
+	option CONFIG_BOOTBLOCK_SIZE=0x17000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -67,7 +67,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/tyan/s2912_fam10/Config.lb
===================================================================
--- targets/tyan/s2912_fam10/Config.lb	(revision 4704)
+++ targets/tyan/s2912_fam10/Config.lb	(working copy)
@@ -30,7 +30,7 @@ 
 romimage "normal"
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
@@ -40,7 +40,7 @@ 
 romimage "fallback" 
         option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
@@ -50,7 +50,7 @@ 
 romimage "failover"
         option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/pcengines/alix1c/Config.lb
===================================================================
--- targets/pcengines/alix1c/Config.lb	(revision 4704)
+++ targets/pcengines/alix1c/Config.lb	(working copy)
@@ -7,9 +7,9 @@ 
 ## (normal AND fallback images and payloads). Leave 36k for VSA.
 option CONFIG_ROM_SIZE = (512 * 1024) - (36 * 1024)
 
-## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
+## CONFIG_BOOTBLOCK_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
-option CONFIG_ROM_IMAGE_SIZE = (64 * 1024)
+option CONFIG_BOOTBLOCK_SIZE = (64 * 1024)
 
 option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 
Index: targets/artecgroup/dbe61/Config.lb
===================================================================
--- targets/artecgroup/dbe61/Config.lb	(revision 4704)
+++ targets/artecgroup/dbe61/Config.lb	(working copy)
@@ -17,9 +17,9 @@ 
 #No VGA for now
 option CONFIG_ROM_SIZE = 1024*512 - 36*1024
 
-# CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
+# CONFIG_BOOTBLOCK_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
-option CONFIG_ROM_IMAGE_SIZE=64*1024
+option CONFIG_BOOTBLOCK_SIZE=64*1024
 
 option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
Index: targets/asi/mb_5blmp/Config.lb
===================================================================
--- targets/asi/mb_5blmp/Config.lb	(revision 4704)
+++ targets/asi/mb_5blmp/Config.lb	(working copy)
@@ -26,14 +26,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE = 0
-	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE = 1
-	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
Index: targets/via/epia-m/Config.512kflash.lb
===================================================================
--- targets/via/epia-m/Config.512kflash.lb	(revision 4704)
+++ targets/via/epia-m/Config.512kflash.lb	(working copy)
@@ -36,7 +36,7 @@ 
 #
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -45,7 +45,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/via/epia-m/Config.lb
===================================================================
--- targets/via/epia-m/Config.lb	(revision 4704)
+++ targets/via/epia-m/Config.lb	(working copy)
@@ -31,16 +31,16 @@ 
 #
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#option CONFIG_ROM_IMAGE_SIZE=128*1024
-	option CONFIG_ROM_IMAGE_SIZE=64*1024
+#option CONFIG_BOOTBLOCK_SIZE=128*1024
+	option CONFIG_BOOTBLOCK_SIZE=64*1024
 	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload $(HOME)/svn/payload.elf
 end
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	#option CONFIG_ROM_IMAGE_SIZE=128*1024
-	option CONFIG_ROM_IMAGE_SIZE=60*1024
+	#option CONFIG_BOOTBLOCK_SIZE=128*1024
+	option CONFIG_BOOTBLOCK_SIZE=60*1024
 	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload $(HOME)/svn/payload.elf
 end
Index: targets/via/epia-m/Config.filo.lb
===================================================================
--- targets/via/epia-m/Config.filo.lb	(revision 4704)
+++ targets/via/epia-m/Config.filo.lb	(working copy)
@@ -35,7 +35,7 @@ 
 #
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -45,7 +45,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/via/epia-m/Config.vga.filo
===================================================================
--- targets/via/epia-m/Config.vga.filo	(revision 4704)
+++ targets/via/epia-m/Config.vga.filo	(working copy)
@@ -33,7 +33,7 @@ 
 #
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0xc000
+	option CONFIG_BOOTBLOCK_SIZE=0xc000
 	option CONFIG_ROM_SECTION_OFFSET=0x10000
 	option CONFIG_ROM_SECTION_SIZE=0x18000
 	option COREBOOT_EXTRA_VERSION=".0-Normal"
@@ -42,7 +42,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0xc000
+	option CONFIG_BOOTBLOCK_SIZE=0xc000
 	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload $(HOME)/svn/filo.elf
 end
Index: targets/via/epia-m/Config.etherboot.lb
===================================================================
--- targets/via/epia-m/Config.etherboot.lb	(revision 4704)
+++ targets/via/epia-m/Config.etherboot.lb	(working copy)
@@ -35,7 +35,7 @@ 
 #
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -44,7 +44,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/via/epia-n/Config-abuild.lb
===================================================================
--- targets/via/epia-n/Config-abuild.lb	(revision 4704)
+++ targets/via/epia-n/Config-abuild.lb	(working copy)
@@ -14,7 +14,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/via/epia-cn/Config-abuild.lb
===================================================================
--- targets/via/epia-cn/Config-abuild.lb	(revision 4704)
+++ targets/via/epia-cn/Config-abuild.lb	(working copy)
@@ -14,7 +14,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/via/epia/Config.512kflash.lb
===================================================================
--- targets/via/epia/Config.512kflash.lb	(revision 4704)
+++ targets/via/epia/Config.512kflash.lb	(working copy)
@@ -10,7 +10,7 @@ 
 # Via Epia
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -19,7 +19,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/via/epia/Config.lb
===================================================================
--- targets/via/epia/Config.lb	(revision 4704)
+++ targets/via/epia/Config.lb	(working copy)
@@ -14,7 +14,7 @@ 
 # Via Epia
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -24,7 +24,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/via/epia/Config.512kflash.linuxtiny.lb
===================================================================
--- targets/via/epia/Config.512kflash.linuxtiny.lb	(revision 4704)
+++ targets/via/epia/Config.512kflash.linuxtiny.lb	(working copy)
@@ -11,7 +11,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=64*1024
+	option CONFIG_BOOTBLOCK_SIZE=64*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/via/epia/Config.filo.lb
===================================================================
--- targets/via/epia/Config.filo.lb	(revision 4704)
+++ targets/via/epia/Config.filo.lb	(working copy)
@@ -8,7 +8,7 @@ 
 # Via Epia
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -18,7 +18,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/via/epia/Config.ituner.filo.lb
===================================================================
--- targets/via/epia/Config.ituner.filo.lb	(revision 4704)
+++ targets/via/epia/Config.ituner.filo.lb	(working copy)
@@ -10,7 +10,7 @@ 
 # Via Epia
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -20,7 +20,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/via/pc2500e/Config-abuild.lb
===================================================================
--- targets/via/pc2500e/Config-abuild.lb	(revision 4704)
+++ targets/via/pc2500e/Config-abuild.lb	(working copy)
@@ -32,7 +32,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE = 1
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload __PAYLOAD__
 end
Index: targets/lippert/roadrunner-lx/Config.lb
===================================================================
--- targets/lippert/roadrunner-lx/Config.lb	(revision 4704)
+++ targets/lippert/roadrunner-lx/Config.lb	(working copy)
@@ -47,12 +47,12 @@ 
 #option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 4
 #option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 4
 
-# Saves space on CONFIG_ROM_IMAGE_SIZE, but decompression costs a second on boot.
+# Saves space on CONFIG_BOOTBLOCK_SIZE, but decompression costs a second on boot.
 option CONFIG_COMPRESS = 1
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE = 1
-	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0"
 	payload ../payload.elf
 	# If getting payload from IDE
Index: targets/lippert/frontrunner/Config.lb
===================================================================
--- targets/lippert/frontrunner/Config.lb	(revision 4704)
+++ targets/lippert/frontrunner/Config.lb	(working copy)
@@ -8,7 +8,7 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x16000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -20,7 +20,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x16000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/lippert/spacerunner-lx/Config.lb
===================================================================
--- targets/lippert/spacerunner-lx/Config.lb	(revision 4704)
+++ targets/lippert/spacerunner-lx/Config.lb	(working copy)
@@ -47,12 +47,12 @@ 
 #option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 4
 #option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 4
 
-# Saves space on CONFIG_ROM_IMAGE_SIZE, but decompression costs a second on boot.
+# Saves space on CONFIG_BOOTBLOCK_SIZE, but decompression costs a second on boot.
 option CONFIG_COMPRESS = 1
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE = 1
-	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0"
 	payload ../payload.elf
 	# If getting payload from IDE
Index: targets/dell/s1850/Config.lb
===================================================================
--- targets/dell/s1850/Config.lb	(revision 4704)
+++ targets/dell/s1850/Config.lb	(working copy)
@@ -7,7 +7,7 @@ 
 
 #romimage "normal"
 #	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x16000
+#	option CONFIG_BOOTBLOCK_SIZE=0x16000
 #	option COREBOOT_EXTRA_VERSION=".0Normal"
 ##	payload ../../../payloads/filo.elf
 #	payload /tmp/filo.elf
@@ -15,7 +15,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x16000
+	option CONFIG_BOOTBLOCK_SIZE=0x16000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload ../../../payloads/filo.elf
 	payload /tmp/filo.elf
Index: targets/msi/ms7135/Config-abuild.lb
===================================================================
--- targets/msi/ms7135/Config-abuild.lb	(revision 4704)
+++ targets/msi/ms7135/Config-abuild.lb	(working copy)
@@ -27,7 +27,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 end
 
Index: targets/msi/ms7135/Config.lb
===================================================================
--- targets/msi/ms7135/Config.lb	(revision 4704)
+++ targets/msi/ms7135/Config.lb	(working copy)
@@ -34,7 +34,7 @@ 
 romimage "normal"
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="_Normal"
 	payload /tmp/payload.elf
@@ -43,7 +43,7 @@ 
 romimage "fallback" 
 	option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="_Fallback"
 	payload /tmp/payload.elf
@@ -52,7 +52,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION="_Failover"
 end
Index: targets/msi/ms9282/Config-abuild.lb
===================================================================
--- targets/msi/ms9282/Config-abuild.lb	(revision 4704)
+++ targets/msi/ms9282/Config-abuild.lb	(working copy)
@@ -12,14 +12,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/msi/ms9282/Config.lb
===================================================================
--- targets/msi/ms9282/Config.lb	(revision 4704)
+++ targets/msi/ms9282/Config.lb	(working copy)
@@ -32,10 +32,10 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 458752
        option CONFIG_USE_FALLBACK_IMAGE=0
-#      option CONFIG_ROM_IMAGE_SIZE=0x13800
-#      option CONFIG_ROM_IMAGE_SIZE=0x18800
-       option CONFIG_ROM_IMAGE_SIZE=0x20000
-#      option CONFIG_ROM_IMAGE_SIZE=0x15800
+#      option CONFIG_BOOTBLOCK_SIZE=0x13800
+#      option CONFIG_BOOTBLOCK_SIZE=0x18800
+       option CONFIG_BOOTBLOCK_SIZE=0x20000
+#      option CONFIG_BOOTBLOCK_SIZE=0x15800
        option CONFIG_XIP_ROM_SIZE=0x40000
        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -60,10 +60,10 @@ 
 
 romimage "fallback"
        option CONFIG_USE_FALLBACK_IMAGE=1
-#      option CONFIG_ROM_IMAGE_SIZE=0x13800
-#      option CONFIG_ROM_IMAGE_SIZE=0x19800
-       option CONFIG_ROM_IMAGE_SIZE=0x20000
-#      option CONFIG_ROM_IMAGE_SIZE=0x15800
+#      option CONFIG_BOOTBLOCK_SIZE=0x13800
+#      option CONFIG_BOOTBLOCK_SIZE=0x19800
+       option CONFIG_BOOTBLOCK_SIZE=0x20000
+#      option CONFIG_BOOTBLOCK_SIZE=0x15800
        option CONFIG_XIP_ROM_SIZE=0x40000
        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/msi/ms9185/Config-abuild.lb
===================================================================
--- targets/msi/ms9185/Config-abuild.lb	(revision 4704)
+++ targets/msi/ms9185/Config-abuild.lb	(working copy)
@@ -12,14 +12,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/msi/ms9185/Config.lb
===================================================================
--- targets/msi/ms9185/Config.lb	(revision 4704)
+++ targets/msi/ms9185/Config.lb	(working copy)
@@ -35,10 +35,10 @@ 
 #       64K for Etherboot
 #        option CONFIG_ROM_SIZE = 458752
        option CONFIG_USE_FALLBACK_IMAGE=0
-#      option CONFIG_ROM_IMAGE_SIZE=0x13800
-#      option CONFIG_ROM_IMAGE_SIZE=0x18800
-       option CONFIG_ROM_IMAGE_SIZE=0x20000
-#      option CONFIG_ROM_IMAGE_SIZE=0x15800
+#      option CONFIG_BOOTBLOCK_SIZE=0x13800
+#      option CONFIG_BOOTBLOCK_SIZE=0x18800
+       option CONFIG_BOOTBLOCK_SIZE=0x20000
+#      option CONFIG_BOOTBLOCK_SIZE=0x15800
        option CONFIG_XIP_ROM_SIZE=0x40000
        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -63,10 +63,10 @@ 
 
 romimage "fallback"
        option CONFIG_USE_FALLBACK_IMAGE=1
-#      option CONFIG_ROM_IMAGE_SIZE=0x13800
-#      option CONFIG_ROM_IMAGE_SIZE=0x19800
-       option CONFIG_ROM_IMAGE_SIZE=0x20000
-#      option CONFIG_ROM_IMAGE_SIZE=0x15800
+#      option CONFIG_BOOTBLOCK_SIZE=0x13800
+#      option CONFIG_BOOTBLOCK_SIZE=0x19800
+       option CONFIG_BOOTBLOCK_SIZE=0x20000
+#      option CONFIG_BOOTBLOCK_SIZE=0x15800
        option CONFIG_XIP_ROM_SIZE=0x40000
        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/msi/ms7260/Config-abuild.lb
===================================================================
--- targets/msi/ms7260/Config-abuild.lb	(revision 4704)
+++ targets/msi/ms7260/Config-abuild.lb	(working copy)
@@ -45,7 +45,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE = 1
 	option CONFIG_USE_FALLBACK_IMAGE = 0
-	option CONFIG_ROM_IMAGE_SIZE = CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE = CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE = CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION = ".0Failover"
 end
Index: targets/msi/ms7260/Config.lb
===================================================================
--- targets/msi/ms7260/Config.lb	(revision 4704)
+++ targets/msi/ms7260/Config.lb	(working copy)
@@ -29,7 +29,7 @@ 
 romimage "normal"
 	option CONFIG_USE_FAILOVER_IMAGE = 0
 	option CONFIG_USE_FALLBACK_IMAGE = 0
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option CONFIG_XIP_ROM_SIZE = 256 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Normal"
 #	payload /tmp/filo.elf
@@ -39,7 +39,7 @@ 
 romimage "fallback"
 	option CONFIG_USE_FAILOVER_IMAGE = 0
 	option CONFIG_USE_FALLBACK_IMAGE = 1
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option CONFIG_XIP_ROM_SIZE = 256 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 #	payload /tmp/filo.elf
@@ -49,7 +49,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE = 1
 	option CONFIG_USE_FALLBACK_IMAGE = 0
-	option CONFIG_ROM_IMAGE_SIZE = CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE = CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE = CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION = ".0Failover"
 end
Index: targets/arima/hdama/Config-abuild.lb
===================================================================
--- targets/arima/hdama/Config-abuild.lb	(revision 4704)
+++ targets/arima/hdama/Config-abuild.lb	(working copy)
@@ -14,14 +14,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/arima/hdama/Config.lb
===================================================================
--- targets/arima/hdama/Config.lb	(revision 4704)
+++ targets/arima/hdama/Config.lb	(working copy)
@@ -11,7 +11,7 @@ 
 # Arima hdama
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 	payload ../../../payloads/filo.elf
 #	payload /etc/hosts
@@ -19,7 +19,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../../../payloads/filo.elf
 #	payload /etc/hosts
Index: targets/arima/hdama/Config.kernelimage.lb
===================================================================
--- targets/arima/hdama/Config.kernelimage.lb	(revision 4704)
+++ targets/arima/hdama/Config.kernelimage.lb	(working copy)
@@ -32,7 +32,7 @@ 
 uses CONFIG_PAYLOAD_SIZE
 uses CONFIG_RAMBASE
 uses CONFIG_ROMBASE
-uses CONFIG_ROM_IMAGE_SIZE
+uses CONFIG_BOOTBLOCK_SIZE
 uses CONFIG_ROM_SECTION_OFFSET
 uses CONFIG_ROM_SECTION_SIZE
 uses CONFIG_ROM_SIZE
@@ -83,7 +83,7 @@ 
 # Arima hdama
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 #	option CONFIG_ROM_SECTION_SIZE=0x100000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	mainboard arima/hdama
Index: targets/sunw/ultra40/Config.lb
===================================================================
--- targets/sunw/ultra40/Config.lb	(revision 4704)
+++ targets/sunw/ultra40/Config.lb	(working copy)
@@ -17,11 +17,11 @@ 
 #	64K for NIC option 48K for Raid option rom
 #	option CONFIG_ROM_SIZE = 512*1024-64*1024-48*1024
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x15000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x15000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -46,11 +46,11 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x11800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x15000
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+#	option CONFIG_BOOTBLOCK_SIZE=0x11800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x15000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x17800
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
Index: targets/eaglelion/5bcm/Config.lb
===================================================================
--- targets/eaglelion/5bcm/Config.lb	(revision 4704)
+++ targets/eaglelion/5bcm/Config.lb	(working copy)
@@ -8,7 +8,7 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -19,7 +19,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
Index: targets/newisys/khepri/Config.lb
===================================================================
--- targets/newisys/khepri/Config.lb	(revision 4704)
+++ targets/newisys/khepri/Config.lb	(working copy)
@@ -30,14 +30,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="-Khepri-Normal"
 	payload ../../../payloads/tg3--ide_disk.zelf
 end
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="-Khepri-Fallback"
 	payload ../../../payloads/tg3--ide_disk.zelf
 end
Index: targets/jetway/j7f24/Config-abuild.lb
===================================================================
--- targets/jetway/j7f24/Config-abuild.lb	(revision 4704)
+++ targets/jetway/j7f24/Config-abuild.lb	(working copy)
@@ -14,7 +14,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/technexion/tim8690/Config-abuild.lb
===================================================================
--- targets/technexion/tim8690/Config-abuild.lb	(revision 4704)
+++ targets/technexion/tim8690/Config-abuild.lb	(working copy)
@@ -12,14 +12,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/technexion/tim8690/Config.lb
===================================================================
--- targets/technexion/tim8690/Config.lb	(revision 4704)
+++ targets/technexion/tim8690/Config.lb	(working copy)
@@ -7,7 +7,7 @@ 
 romimage "normal"
 	option CONFIG_ROM_SIZE = 1024*512 - 55808
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	payload /home/daniel/mypayloads/link
 end
@@ -15,7 +15,7 @@ 
 romimage "fallback" 
 	option CONFIG_FALLBACK_SIZE= 1024*512 - 55808
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option CONFIG_XIP_ROM_SIZE=0x20000
 	payload /home/daniel/mypayloads/link
 
Index: targets/ibm/e326/Config-abuild.lb
===================================================================
--- targets/ibm/e326/Config-abuild.lb	(revision 4704)
+++ targets/ibm/e326/Config-abuild.lb	(working copy)
@@ -14,14 +14,14 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
Index: targets/ibm/e326/Config.lb
===================================================================
--- targets/ibm/e326/Config.lb	(revision 4704)
+++ targets/ibm/e326/Config.lb	(working copy)
@@ -11,7 +11,7 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload ../../filo.elf
 	payload ../../../payloads/filo.elf
@@ -19,7 +19,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload ../../filo.elf
 	payload ../../../payloads/filo.elf
Index: targets/ibm/e325/Config.lb
===================================================================
--- targets/ibm/e325/Config.lb	(revision 4704)
+++ targets/ibm/e325/Config.lb	(working copy)
@@ -15,7 +15,7 @@ 
 # Arima hdama
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload ../../filo.elf
 	payload ../../../payloads/filo.elf
@@ -23,7 +23,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload ../../filo.elf
 	payload ../../../payloads/filo.elf
Index: targets/nvidia/l1_2pvv/Config-abuild.lb
===================================================================
--- targets/nvidia/l1_2pvv/Config-abuild.lb	(revision 4704)
+++ targets/nvidia/l1_2pvv/Config-abuild.lb	(working copy)
@@ -27,7 +27,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 end
 
Index: targets/nvidia/l1_2pvv/Config.lb.kernel
===================================================================
--- targets/nvidia/l1_2pvv/Config.lb.kernel	(revision 4704)
+++ targets/nvidia/l1_2pvv/Config.lb.kernel	(working copy)
@@ -34,10 +34,10 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x17000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x19800
+	option CONFIG_BOOTBLOCK_SIZE=0x17000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -69,7 +69,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/nvidia/l1_2pvv/Config.lb
===================================================================
--- targets/nvidia/l1_2pvv/Config.lb	(revision 4704)
+++ targets/nvidia/l1_2pvv/Config.lb	(working copy)
@@ -38,10 +38,10 @@ 
 #        option CONFIG_ROM_SIZE = 479232
         option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x18800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x18800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -66,10 +66,10 @@ 
 romimage "fallback" 
         option CONFIG_USE_FAILOVER_IMAGE=0
 	option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_BOOTBLOCK_SIZE=0x13800
+#	option CONFIG_BOOTBLOCK_SIZE=0x19800
+	option CONFIG_BOOTBLOCK_SIZE=0x20000
+#	option CONFIG_BOOTBLOCK_SIZE=0x15800
 	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -99,7 +99,7 @@ 
 romimage "failover"
         option CONFIG_USE_FAILOVER_IMAGE=1
         option CONFIG_USE_FALLBACK_IMAGE=0
-        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
         option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
Index: targets/intel/xe7501devkit/Config.lb
===================================================================
--- targets/intel/xe7501devkit/Config.lb	(revision 4704)
+++ targets/intel/xe7501devkit/Config.lb	(working copy)
@@ -5,9 +5,9 @@ 
 ## (normal AND fallback images and payloads).
 option CONFIG_ROM_SIZE = 192*1024
 
-## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
+## CONFIG_BOOTBLOCK_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
-option CONFIG_ROM_IMAGE_SIZE = 0x1B000
+option CONFIG_BOOTBLOCK_SIZE = 0x1B000
 
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image 
 ## (including payload) will use
Index: targets/intel/truxton/Config.lb
===================================================================
--- targets/intel/truxton/Config.lb	(revision 4704)
+++ targets/intel/truxton/Config.lb	(working copy)
@@ -24,13 +24,13 @@ 
 ## (normal AND fallback images and payloads).
 option CONFIG_ROM_SIZE = 2 * 1024 * 1024
 
-## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
+## CONFIG_BOOTBLOCK_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
-option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image
 ## (including payload) will use
-option CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+option CONFIG_FALLBACK_SIZE = CONFIG_BOOTBLOCK_SIZE
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE=1
Index: targets/intel/mtarvon/Config.lb
===================================================================
--- targets/intel/mtarvon/Config.lb	(revision 4704)
+++ targets/intel/mtarvon/Config.lb	(working copy)
@@ -24,9 +24,9 @@ 
 ## (normal AND fallback images and payloads).
 option CONFIG_ROM_SIZE = 2 * 1024 * 1024
 
-## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
+## CONFIG_BOOTBLOCK_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
-option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 
 ## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image
 ## (including payload) will use
Index: targets/asus/a8v-e_se/Config.lb
===================================================================
--- targets/asus/a8v-e_se/Config.lb	(revision 4704)
+++ targets/asus/a8v-e_se/Config.lb	(working copy)
@@ -23,14 +23,14 @@ 
 romimage "normal"
 	option CONFIG_ROM_SIZE = 512 * 1024
 	option CONFIG_USE_FALLBACK_IMAGE = 0
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 	payload ../payload.elf
 end
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE = 1
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../payload.elf
 end
Index: targets/asus/mew-vm/Config.lb
===================================================================
--- targets/asus/mew-vm/Config.lb	(revision 4704)
+++ targets/asus/mew-vm/Config.lb	(working copy)
@@ -8,7 +8,7 @@ 
 
 romimage "normal"
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /etc/hosts
 	payload /home/amp/filo-0.5/filo.elf
@@ -16,7 +16,7 @@ 
 
 romimage "fallback" 
 	option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x10000
+	option CONFIG_BOOTBLOCK_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /etc/hosts
 	payload /home/amp/filo-0.5/filo.elf
Index: targets/asus/a8n_e/Config-abuild.lb
===================================================================
--- targets/asus/a8n_e/Config-abuild.lb	(revision 4704)
+++ targets/asus/a8n_e/Config-abuild.lb	(working copy)
@@ -27,7 +27,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE=1
 	option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE=CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 end
 
Index: targets/asus/a8n_e/Config.lb
===================================================================
--- targets/asus/a8n_e/Config.lb	(revision 4704)
+++ targets/asus/a8n_e/Config.lb	(working copy)
@@ -25,7 +25,7 @@ 
 romimage "normal"
 	option CONFIG_USE_FAILOVER_IMAGE = 0
 	option CONFIG_USE_FALLBACK_IMAGE = 0
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option CONFIG_XIP_ROM_SIZE = 128 * 1024
 	option COREBOOT_EXTRA_VERSION = "_Normal"
 	payload ../payload.elf
@@ -34,7 +34,7 @@ 
 romimage "fallback" 
 	option CONFIG_USE_FAILOVER_IMAGE = 0
 	option CONFIG_USE_FALLBACK_IMAGE = 1
-	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 	option CONFIG_XIP_ROM_SIZE = 128 * 1024
 	option COREBOOT_EXTRA_VERSION = "_Fallback"
 	payload ../payload.elf
@@ -43,7 +43,7 @@ 
 romimage "failover"
 	option CONFIG_USE_FAILOVER_IMAGE = 1
 	option CONFIG_USE_FALLBACK_IMAGE = 0
-	option CONFIG_ROM_IMAGE_SIZE = CONFIG_FAILOVER_SIZE
+	option CONFIG_BOOTBLOCK_SIZE = CONFIG_FAILOVER_SIZE
 	option CONFIG_XIP_ROM_SIZE = CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION = "_Failover"
 end
Index: targets/asus/m2v-mx_se/Config-abuild.lb
===================================================================
--- targets/asus/m2v-mx_se/Config-abuild.lb	(revision 4704)
+++ targets/asus/m2v-mx_se/Config-abuild.lb	(working copy)
@@ -32,7 +32,7 @@ 
 
 option CONFIG_ROM_SIZE = 512 * 1024
 
-## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
+## CONFIG_BOOTBLOCK_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
 
 romimage "fallback"
Index: targets/asus/m2v-mx_se/Config.lb
===================================================================
--- targets/asus/m2v-mx_se/Config.lb	(revision 4704)
+++ targets/asus/m2v-mx_se/Config.lb	(working copy)
@@ -34,12 +34,12 @@ 
 
 #option CONFIG_ROM_SIZE = (512 * 1024) - (64 * 1024)
 
-## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
+## CONFIG_BOOTBLOCK_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
 
 # Please note that 128KB is cached for (XIP) too
 
-option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+option CONFIG_BOOTBLOCK_SIZE = 128 * 1024
 
 romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE=1
Index: util/newconfig/config.g
===================================================================
--- util/newconfig/config.g	(revision 4704)
+++ util/newconfig/config.g	(working copy)
@@ -1386,7 +1386,7 @@ 
 	global curimage
 	global bootblocksize
 	mainboard()
-	imagesize = getoption("CONFIG_ROM_IMAGE_SIZE", curimage)
+	imagesize = getoption("CONFIG_BOOTBLOCK_SIZE", curimage)
 	bootblocksize += imagesize
 	print "End ROMIMAGE"
 	curimage = 0
Index: util/abuild/abuild
===================================================================
--- util/abuild/abuild	(revision 4704)
+++ util/abuild/abuild	(working copy)
@@ -178,7 +178,7 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=0
 if CONFIG_CBFS
 else
-	option CONFIG_ROM_IMAGE_SIZE=0x17000
+	option CONFIG_BOOTBLOCK_SIZE=0x17000
 end
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
@@ -188,7 +188,7 @@ 
 	option CONFIG_USE_FALLBACK_IMAGE=1
 if CONFIG_CBFS
 else
-	option CONFIG_ROM_IMAGE_SIZE=0x17000
+	option CONFIG_BOOTBLOCK_SIZE=0x17000
 end
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__