Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dai_g/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dai_g/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dai_g/Config.lb	(Arbeitskopie)
@@ -3,41 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
 
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-	default ROM_SECTION_SIZE   = FALLBACK_SIZE
-	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-	default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation128.lb
 
 ##
-## Compute the start location and size size of
-## The coreboot bootloader.
-##
-default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot rom
-##
-default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can be cached to speed up coreboot,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-##
-default XIP_ROM_SIZE=131072
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhe_g/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhe_g/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhe_g/Config.lb	(Arbeitskopie)
@@ -3,39 +3,8 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
 
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-	default ROM_SECTION_SIZE   = FALLBACK_SIZE
-	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-	default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation128.lb
 
-##
-## Compute the start location and size size of
-## The coreboot bootloader.
-##
-default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot rom
-##
-default _ROMBASE	=( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can be cached to speed up coreboot.
-## execution speed.
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-default XIP_ROM_SIZE=131072
-default XIP_ROM_BASE= ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhe_g2/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhe_g2/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhe_g2/Config.lb	(Arbeitskopie)
@@ -3,39 +3,8 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
 
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-	default ROM_SECTION_SIZE   = FALLBACK_SIZE
-	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-	default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation128.lb
 
-##
-## Compute the start location and size size of
-## The coreboot bootloader.
-##
-default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot rom
-##
-default _ROMBASE	=( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can be cached to speed up coreboot.
-## execution speed.
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-default XIP_ROM_SIZE=131072
-default XIP_ROM_BASE= ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhr_ig/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhr_ig/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhr_ig/Config.lb	(Arbeitskopie)
@@ -3,41 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
 
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-	default ROM_SECTION_SIZE   = FALLBACK_SIZE
-	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-	default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation128.lb
 
 ##
-## Compute the start location and size size of
-## The coreboot bootloader.
-##
-default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot rom
-##
-default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can cached to speed up coreboot,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-##
-default XIP_ROM_SIZE=131072
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhr_ig2/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhr_ig2/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/supermicro/x6dhr_ig2/Config.lb	(Arbeitskopie)
@@ -3,41 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
 
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-	default ROM_SECTION_SIZE   = FALLBACK_SIZE
-	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-	default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation128.lb
 
 ##
-## Compute the start location and size size of
-## The coreboot bootloader.
-##
-default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot rom
-##
-default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can cached to speed up coreboot,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-##
-default XIP_ROM_SIZE=131072
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/kontron/986lcd-m/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/kontron/986lcd-m/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/kontron/986lcd-m/Config.lb	(Arbeitskopie)
@@ -28,41 +28,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
 
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-        default ROM_SECTION_SIZE   = FALLBACK_SIZE
-        default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-        default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-        default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation.lb
 
 ##
-## Compute the start location and size size of
-## The coreboot bootloader.
-##
-default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot rom
-##
-default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can cached to speed up coreboot,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-##
-default XIP_ROM_SIZE=(64*1024)
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/dell/s1850/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/dell/s1850/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/dell/s1850/Config.lb	(Arbeitskopie)
@@ -3,41 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
 
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-	default ROM_SECTION_SIZE   = FALLBACK_SIZE
-	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-	default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation128.lb
 
 ##
-## Compute the start location and size size of
-## The coreboot bootloader.
-##
-default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot rom
-##
-default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can cached to speed up coreboot,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-##
-default XIP_ROM_SIZE=131072
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/arima/hdama/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/arima/hdama/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/arima/hdama/Config.lb	(Arbeitskopie)
@@ -1,38 +1,6 @@
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-	default ROM_SECTION_SIZE   = FALLBACK_SIZE
-	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-	default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation128.lb
 
 ##
-## Compute the start location and size size of
-## The coreboot bootloader.
-##
-default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot rom
-##
-default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can cached to speed up coreboot,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-##
-default XIP_ROM_SIZE=131072
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/xe7501devkit/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/xe7501devkit/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/xe7501devkit/Config.lb	(Arbeitskopie)
@@ -1,40 +1,5 @@
-##################################################################
-## BEGIN BOILERPLATE - DO NOT EDIT
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus payload) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-# The fallback image uses FALLBACK_SIZE bytes at the end of the ROM
+include /config/nofailovercalculation128.lb
 
-	default ROM_SECTION_SIZE   = FALLBACK_SIZE
-	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-
-else
-# The normal image goes at the beginning of the coreboot ROM region
-# and uses all the remaining space
-
-	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-	default ROM_SECTION_OFFSET = 0
-end
-
-##
-## Compute where this copy of coreboot will start in the boot rom
-##
-default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can cached to speed up coreboot,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-default XIP_ROM_SIZE = 65536
-default XIP_ROM_BASE = ((( _ROMBASE + ROM_IMAGE_SIZE ) / XIP_ROM_SIZE ) * XIP_ROM_SIZE - XIP_ROM_SIZE )
-
-## END BOILERPLATE
-##################################################################
-
 arch i386 end 
 
 ##
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/truxton/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/truxton/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/truxton/Config.lb	(Arbeitskopie)
@@ -17,40 +17,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot ROM chip
-##
-if USE_FALLBACK_IMAGE
-        default ROM_SECTION_SIZE = FALLBACK_SIZE
-        default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-        default ROM_SECTION_SIZE = ( ROM_SIZE - FALLBACK_SIZE )
-        default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation128.lb
 
 ##
-## Compute the start location and size size of the coreboot bootloader
-##
-default PAYLOAD_SIZE = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot ROM
-##
-default _ROMBASE = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can cached to speed up coreboot,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-##
-default XIP_ROM_SIZE=131072
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/mtarvon/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/mtarvon/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/mtarvon/Config.lb	(Arbeitskopie)
@@ -17,40 +17,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot ROM chip
-##
-if USE_FALLBACK_IMAGE
-        default ROM_SECTION_SIZE = FALLBACK_SIZE
-        default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-        default ROM_SECTION_SIZE = ( ROM_SIZE - FALLBACK_SIZE )
-        default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation128.lb
 
 ##
-## Compute the start location and size size of the coreboot bootloader
-##
-default PAYLOAD_SIZE = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot ROM
-##
-default _ROMBASE = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can cached to speed up coreboot,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-##
-default XIP_ROM_SIZE=131072
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/jarrell/Config.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/jarrell/Config.lb	(Revision 4150)
+++ LinuxBIOSv2-Configlb_refactor/src/mainboard/intel/jarrell/Config.lb	(Arbeitskopie)
@@ -3,41 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
 
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
-if USE_FALLBACK_IMAGE
-	default ROM_SECTION_SIZE   = FALLBACK_SIZE
-	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-	default ROM_SECTION_OFFSET = 0
-end
+include /config/nofailovercalculation128.lb
 
 ##
-## Compute the start location and size size of
-## The coreboot bootloader.
-##
-default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-
-##
-## Compute where this copy of coreboot will start in the boot rom
-##
-default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
-
-##
-## Compute a range of ROM that can cached to speed up coreboot,
-## execution speed.
-##
-## XIP_ROM_SIZE must be a power of 2.
-## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
-##
-default XIP_ROM_SIZE=131072
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
-
-##
 ## Set all of the defaults for an x86 architecture
 ##
 
Index: LinuxBIOSv2-Configlb_refactor/src/config/nofailovercalculation128.lb
===================================================================
--- LinuxBIOSv2-Configlb_refactor/src/config/nofailovercalculation128.lb	(Revision 0)
+++ LinuxBIOSv2-Configlb_refactor/src/config/nofailovercalculation128.lb	(Revision 0)
@@ -0,0 +1,38 @@
+##
+## Compute the location and size of where this firmware image
+## (coreboot plus bootloader) will live in the boot rom chip.
+##
+if USE_FALLBACK_IMAGE
+	default ROM_SECTION_SIZE   = FALLBACK_SIZE
+	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
+else
+	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
+	default ROM_SECTION_OFFSET = 0
+end
+
+##
+## Compute the start location and size size of
+## The coreboot bootloader.
+##
+default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+
+##
+## Compute where this copy of coreboot will start in the boot rom
+##
+default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
+
+##
+## Compute a range of ROM that can cached to speed up coreboot,
+## execution speed.
+##
+## XIP_ROM_SIZE must be a power of 2.
+## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
+##
+default XIP_ROM_SIZE = 128 * 1024
+default XIP_ROM_BASE = ( _ROMBASE - XIP_ROM_SIZE + ROM_IMAGE_SIZE )
+
+## This is needed to work around a parser bug.
+if USE_FALLBACK_IMAGE
+end
+
