[PATCH] v2: Refactor Config.lb includes a bit - coreboot

6 Jun 2009

When I started refactoring mainboard Config.lb, I added two different
files for targets without failover:
src/config/nofailovercalculation.lb (64 kB XIP)
src/config/nofailovercalculation128.lb (128 kB XIP)
Targets with other XIP sizes were ignored.
This patch moves XIP size back into mainboard code.
Benefits from this patch:
- src/config/nofailovercalculation128.lb is no longer needed
- Targets with XIP sizes besides 64k and 128k benefit from refactoring
- Conceptually, this makes the include files pure calculation files
without settings.
Abuild tested.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8_htx/Config.lb
===================================================================

--- coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8_htx/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8_htx/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8s2/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8s2/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8s2/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8x/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8x/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8x/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/axus/tc320/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/axus/tc320/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/axus/tc320/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnetp680/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnetp680/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnetp680/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnet100/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnet100/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnet100/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/televideo/tc7020/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/televideo/tc7020/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/televideo/tc7020/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/broadcom/blast/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/broadcom/blast/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/broadcom/blast/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/thomson/ip1000/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/thomson/ip1000/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/thomson/ip1000/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dai_g/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dai_g/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dai_g/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dmr/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dmr/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dmr/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
## Set all of the defaults for an x86 architecture
 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dme/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dme/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dme/Config.lb	(working copy)
@@ -16,6 +16,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g2/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g2/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g2/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
## Set all of the defaults for an x86 architecture
 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig2/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig2/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig2/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/kontron/986lcd-m/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/kontron/986lcd-m/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/kontron/986lcd-m/Config.lb	(working copy)
@@ -28,6 +28,8 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6240/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6240/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6240/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6220/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6220/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6220/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/m57sli/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/m57sli/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/m57sli/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga_2761gxdk/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga_2761gxdk/Config.lb	(working copy)
@@ -21,6 +21,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga-6bxc/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga-6bxc/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga-6bxc/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm800sev/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm800sev/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm800sev/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/adl855pc/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/adl855pc/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/adl855pc/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm586seg/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm586seg/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm586seg/Config.lb	(working copy)
@@ -1,38 +1,9 @@
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
 default ROM_SIZE = 512 * 1024 
 default FALLBACK_SIZE = 0x10000
-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=32*1024
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
+default XIP_ROM_SIZE = 32 * 1024
+include /config/nofailovercalculation.lb
##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/olpc/btest/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/olpc/btest/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/olpc/btest/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/olpc/rev_a/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/olpc/rev_a/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/olpc/rev_a/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/technologic/ts5300/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/technologic/ts5300/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/technologic/ts5300/Config.lb	(working copy)
@@ -1,38 +1,9 @@
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
 default ROM_SIZE = 128 * 1024 
 default FALLBACK_SIZE = 0x10000
-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=32*1024
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
+default XIP_ROM_SIZE = 32 * 1024
+include /config/nofailovercalculation.lb
##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/pistachio/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/pistachio/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/pistachio/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ##
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/dbm690t/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/dbm690t/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/dbm690t/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ##
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/rumba/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/rumba/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/rumba/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/norwich/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/norwich/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/norwich/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb	(working copy)
@@ -17,6 +17,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/db800/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/db800/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/db800/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/biostar/m6tba/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/biostar/m6tba/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/biostar/m6tba/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/nec/powermate2000/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/nec/powermate2000/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/nec/powermate2000/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/azza/pt-6ibd/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/azza/pt-6ibd/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/azza/pt-6ibd/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 arch i386 end
 driver mainboard.o
Index: coreboot-v2-configlb_rerefactor/src/mainboard/rca/rm4100/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/rca/rm4100/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/rca/rm4100/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/iei/nova4899r/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/iei/nova4899r/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/iei/nova4899r/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/iei/pcisa-lx-800-r10/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/iei/pcisa-lx-800-r10/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/iei/pcisa-lx-800-r10/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/hp/dl145_g3/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/hp/dl145_g3/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/hp/dl145_g3/Config.lb	(working copy)
@@ -25,6 +25,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/artecgroup/dbe61/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/artecgroup/dbe61/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/artecgroup/dbe61/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/pcengines/alix1c/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/pcengines/alix1c/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/pcengines/alix1c/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2850/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2850/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2850/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2735/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2735/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2735/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2880/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2880/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2880/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s1846/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s1846/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s1846/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2881/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2881/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2881/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2882/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2882/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2882/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2891/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2891/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2891/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD       = 1
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4880/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4880/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4880/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2892/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2892/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2892/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2875/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2875/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2875/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4882/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4882/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4882/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2885/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2885/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2885/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2895/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2895/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2895/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912_fam10/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912_fam10/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912_fam10/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blgp/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blgp/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blgp/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blmp/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blmp/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blmp/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/lippert/roadrunner-lx/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/lippert/roadrunner-lx/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/lippert/roadrunner-lx/Config.lb	(working copy)
@@ -20,6 +20,8 @@
## Based on Config.lb from AMD's DB800 and DBM690T mainboards.
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/lippert/frontrunner/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/lippert/frontrunner/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/lippert/frontrunner/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/lippert/spacerunner-lx/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/lippert/spacerunner-lx/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/lippert/spacerunner-lx/Config.lb	(working copy)
@@ -20,6 +20,8 @@
## Based on Config.lb from AMD's DB800 and DBM690T mainboards.
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/abit/be6-ii_v2_0/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/abit/be6-ii_v2_0/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/abit/be6-ii_v2_0/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m700/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m700/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m700/Config.lb	(working copy)
@@ -18,22 +18,10 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
-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
-default PAYLOAD_SIZE = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-default _ROMBASE = (CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE)
+## XIP_ROM_SIZE must be a power of 2.
 default XIP_ROM_SIZE = 64 * 1024
-#default XIP_ROM_SIZE = ROM_IMAGE_SIZE
-#default XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
-default XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
+include /config/nofailovercalculation.lb
-
 arch i386 end
 driver mainboard.o
 driver wakeup.o
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/vt8454c/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/vt8454c/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/vt8454c/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## MA 02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-cn/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-cn/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-cn/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/epia/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/epia/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/epia/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/pc2500e/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/pc2500e/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/pc2500e/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/dell/s1850/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/dell/s1850/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/dell/s1850/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7135/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7135/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7135/Config.lb	(working copy)
@@ -22,6 +22,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6119/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6119/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6119/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6147/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6147/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6147/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9282/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9282/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9282/Config.lb	(working copy)
@@ -22,6 +22,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6178/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6178/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6178/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9185/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9185/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9185/Config.lb	(working copy)
@@ -22,6 +22,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7260/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7260/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7260/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/arima/hdama/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/arima/hdama/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/arima/hdama/Config.lb	(working copy)
@@ -1,4 +1,6 @@
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/sunw/ultra40/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/sunw/ultra40/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/sunw/ultra40/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1
Index: coreboot-v2-configlb_rerefactor/src/mainboard/advantech/pcm-5820/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/advantech/pcm-5820/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/advantech/pcm-5820/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/eaglelion/5bcm/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/eaglelion/5bcm/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/eaglelion/5bcm/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/newisys/khepri/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/newisys/khepri/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/newisys/khepri/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/jetway/j7f24/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/jetway/j7f24/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/jetway/j7f24/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/technexion/tim8690/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/technexion/tim8690/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/technexion/tim8690/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ##
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e326/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e326/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e326/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e325/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e325/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e325/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/nvidia/l1_2pvv/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/nvidia/l1_2pvv/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/nvidia/l1_2pvv/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/intel/xe7501devkit/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/intel/xe7501devkit/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/intel/xe7501devkit/Config.lb	(working copy)
@@ -1,4 +1,6 @@
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/intel/truxton/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/intel/truxton/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/intel/truxton/Config.lb	(working copy)
@@ -17,7 +17,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/intel/mtarvon/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/intel/mtarvon/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/intel/mtarvon/Config.lb	(working copy)
@@ -17,7 +17,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/intel/jarrell/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/intel/jarrell/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/intel/jarrell/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-am/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-am/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-am/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-d/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-d/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-d/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-f/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-f/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-f/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8v-e_se/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8v-e_se/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8v-e_se/Config.lb	(working copy)
@@ -20,6 +20,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-ds/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-ds/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-ds/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/p3b-f/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/p3b-f/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/p3b-f/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-vm/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-vm/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-vm/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8n_e/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8n_e/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8n_e/Config.lb	(working copy)
@@ -21,6 +21,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/m2v-mx_se/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/m2v-mx_se/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/m2v-mx_se/Config.lb	(working copy)
@@ -20,7 +20,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation.lb	(working copy)
@@ -31,8 +31,7 @@
 ## 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_SIZE must be a power of 2 and is set in mainboard Config.lb
 ## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
 ##
-default XIP_ROM_SIZE = 64 * 1024
 default XIP_ROM_BASE = ( _ROMBASE - XIP_ROM_SIZE + ROM_IMAGE_SIZE )
Index: coreboot-v2-configlb_rerefactor/src/config/failovercalculation.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/config/failovercalculation.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/config/failovercalculation.lb	(working copy)
@@ -36,10 +36,9 @@
 ## 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_SIZE must be a power of 2 and is set in mainboard Config.lb
 ## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
 ##
-default XIP_ROM_SIZE = 64 * 1024
if USE_FAILOVER_IMAGE
    default XIP_ROM_BASE = ( _ROMBASE - XIP_ROM_SIZE + ROM_IMAGE_SIZE)
Index: coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation128.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation128.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation128.lb	(working copy)
@@ -1,38 +0,0 @@
-##
-## 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
-	if CONFIG_CBFS
-		default ROM_SECTION_SIZE   = FALLBACK_SIZE
-		default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE - FALLBACK_SIZE )
-	else
-		default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-		default ROM_SECTION_OFFSET = 0
-	end
-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 )
-- 
http://www.hailfinger.org/


Index: coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8_htx/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8_htx/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8_htx/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8s2/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8s2/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8s2/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8x/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8x/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/iwill/dk8x/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/axus/tc320/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/axus/tc320/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/axus/tc320/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnetp680/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnetp680/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnetp680/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnet100/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnet100/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/bcom/winnet100/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/televideo/tc7020/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/televideo/tc7020/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/televideo/tc7020/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/broadcom/blast/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/broadcom/blast/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/broadcom/blast/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/thomson/ip1000/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/thomson/ip1000/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/thomson/ip1000/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dai_g/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dai_g/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dai_g/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE

-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 ##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dmr/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dmr/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dmr/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ## 

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE

-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 ## Set all of the defaults for an x86 architecture
 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dme/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dme/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/h8dme/Config.lb	(working copy)
@@ -16,6 +16,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ## 

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g2/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g2/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhe_g2/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE

-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 ## Set all of the defaults for an x86 architecture
 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE

-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 ##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig2/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig2/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/supermicro/x6dhr_ig2/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE

-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 ##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/kontron/986lcd-m/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/kontron/986lcd-m/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/kontron/986lcd-m/Config.lb	(working copy)
@@ -28,6 +28,8 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6240/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6240/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6240/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6220/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6220/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/a-trend/atc-6220/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/m57sli/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/m57sli/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/m57sli/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ## 

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga_2761gxdk/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga_2761gxdk/Config.lb	(working copy)
@@ -21,6 +21,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga-6bxc/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga-6bxc/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/gigabyte/ga-6bxc/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm800sev/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm800sev/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm800sev/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/adl855pc/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/adl855pc/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/adl855pc/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm586seg/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm586seg/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/digitallogic/msm586seg/Config.lb	(working copy)
@@ -1,38 +1,9 @@
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
 default ROM_SIZE = 512 * 1024 
 default FALLBACK_SIZE = 0x10000
-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=32*1024
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
+default XIP_ROM_SIZE = 32 * 1024
+include /config/nofailovercalculation.lb

 ##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/olpc/btest/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/olpc/btest/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/olpc/btest/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/olpc/rev_a/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/olpc/rev_a/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/olpc/rev_a/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/technologic/ts5300/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/technologic/ts5300/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/technologic/ts5300/Config.lb	(working copy)
@@ -1,38 +1,9 @@
-##
-## Compute the location and size of where this firmware image
-## (coreboot plus bootloader) will live in the boot rom chip.
-##
 default ROM_SIZE = 128 * 1024 
 default FALLBACK_SIZE = 0x10000
-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=32*1024
-default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
+default XIP_ROM_SIZE = 32 * 1024
+include /config/nofailovercalculation.lb

 ##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/pistachio/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/pistachio/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/pistachio/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ##
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/dbm690t/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/dbm690t/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/dbm690t/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ##
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/rumba/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/rumba/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/rumba/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/norwich/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/norwich/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/norwich/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb	(working copy)
@@ -17,6 +17,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/amd/db800/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/amd/db800/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/amd/db800/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/biostar/m6tba/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/biostar/m6tba/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/biostar/m6tba/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/nec/powermate2000/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/nec/powermate2000/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/nec/powermate2000/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/azza/pt-6ibd/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/azza/pt-6ibd/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/azza/pt-6ibd/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 arch i386 end
 driver mainboard.o
Index: coreboot-v2-configlb_rerefactor/src/mainboard/rca/rm4100/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/rca/rm4100/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/rca/rm4100/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/iei/nova4899r/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/iei/nova4899r/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/iei/nova4899r/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/iei/pcisa-lx-800-r10/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/iei/pcisa-lx-800-r10/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/iei/pcisa-lx-800-r10/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/hp/dl145_g3/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/hp/dl145_g3/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/hp/dl145_g3/Config.lb	(working copy)
@@ -25,6 +25,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/artecgroup/dbe61/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/artecgroup/dbe61/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/artecgroup/dbe61/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/pcengines/alix1c/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/pcengines/alix1c/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/pcengines/alix1c/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2850/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2850/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2850/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2735/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2735/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2735/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1

Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2880/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2880/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2880/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s1846/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s1846/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s1846/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2881/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2881/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2881/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2882/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2882/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2882/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2891/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2891/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2891/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD       = 1

Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4880/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4880/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4880/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1

Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2892/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2892/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2892/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1

Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2875/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2875/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2875/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4882/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4882/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s4882/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1

Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2885/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2885/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2885/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end 
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2895/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2895/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2895/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912_fam10/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912_fam10/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/tyan/s2912_fam10/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blgp/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blgp/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blgp/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blmp/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blmp/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asi/mb_5blmp/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/lippert/roadrunner-lx/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/lippert/roadrunner-lx/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/lippert/roadrunner-lx/Config.lb	(working copy)
@@ -20,6 +20,8 @@

 ## Based on Config.lb from AMD's DB800 and DBM690T mainboards.

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/lippert/frontrunner/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/lippert/frontrunner/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/lippert/frontrunner/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/lippert/spacerunner-lx/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/lippert/spacerunner-lx/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/lippert/spacerunner-lx/Config.lb	(working copy)
@@ -20,6 +20,8 @@

 ## Based on Config.lb from AMD's DB800 and DBM690T mainboards.

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/abit/be6-ii_v2_0/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/abit/be6-ii_v2_0/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/abit/be6-ii_v2_0/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m700/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m700/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m700/Config.lb	(working copy)
@@ -18,22 +18,10 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

-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
-default PAYLOAD_SIZE = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
-default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-default _ROMBASE = (CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE)
+## XIP_ROM_SIZE must be a power of 2.
 default XIP_ROM_SIZE = 64 * 1024
-#default XIP_ROM_SIZE = ROM_IMAGE_SIZE
-#default XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
-default XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
+include /config/nofailovercalculation.lb

-
 arch i386 end
 driver mainboard.o
 driver wakeup.o
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/vt8454c/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/vt8454c/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/vt8454c/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## MA 02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-m/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-cn/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-cn/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/epia-cn/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/epia/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/epia/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/epia/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/via/pc2500e/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/via/pc2500e/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/via/pc2500e/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/dell/s1850/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/dell/s1850/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/dell/s1850/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE

-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 ##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7135/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7135/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7135/Config.lb	(working copy)
@@ -22,6 +22,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6119/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6119/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6119/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6147/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6147/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6147/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9282/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9282/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9282/Config.lb	(working copy)
@@ -22,6 +22,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1

Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6178/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6178/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms6178/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9185/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9185/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms9185/Config.lb	(working copy)
@@ -22,6 +22,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7260/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7260/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/msi/ms7260/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/arima/hdama/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/arima/hdama/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/arima/hdama/Config.lb	(working copy)
@@ -1,4 +1,6 @@
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 ##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/sunw/ultra40/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/sunw/ultra40/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/sunw/ultra40/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1

Index: coreboot-v2-configlb_rerefactor/src/mainboard/advantech/pcm-5820/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/advantech/pcm-5820/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/advantech/pcm-5820/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/eaglelion/5bcm/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/eaglelion/5bcm/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/eaglelion/5bcm/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/newisys/khepri/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/newisys/khepri/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/newisys/khepri/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/jetway/j7f24/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/jetway/j7f24/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/jetway/j7f24/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/technexion/tim8690/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/technexion/tim8690/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/technexion/tim8690/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ##
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e326/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e326/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e326/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e325/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e325/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/ibm/e325/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/nvidia/l1_2pvv/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/nvidia/l1_2pvv/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/nvidia/l1_2pvv/Config.lb	(working copy)
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/intel/xe7501devkit/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/intel/xe7501devkit/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/intel/xe7501devkit/Config.lb	(working copy)
@@ -1,4 +1,6 @@
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 arch i386 end 

Index: coreboot-v2-configlb_rerefactor/src/mainboard/intel/truxton/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/intel/truxton/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/intel/truxton/Config.lb	(working copy)
@@ -17,7 +17,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 ##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/intel/mtarvon/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/intel/mtarvon/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/intel/mtarvon/Config.lb	(working copy)
@@ -17,7 +17,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 ##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/intel/jarrell/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/intel/jarrell/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/intel/jarrell/Config.lb	(working copy)
@@ -3,7 +3,9 @@
 ##
 default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE

-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 ##
 ## Set all of the defaults for an x86 architecture
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-am/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-am/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-am/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-d/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-d/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-d/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-f/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-f/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-f/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8v-e_se/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8v-e_se/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8v-e_se/Config.lb	(working copy)
@@ -20,6 +20,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ## 

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb
 default CONFIG_ROM_PAYLOAD = 1

Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-ds/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-ds/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/p2b-ds/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/p3b-f/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/p3b-f/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/p3b-f/Config.lb	(working copy)
@@ -18,6 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-vm/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-vm/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/mew-vm/Config.lb	(working copy)
@@ -1,3 +1,5 @@
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/nofailovercalculation.lb

 ##
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8n_e/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8n_e/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/a8n_e/Config.lb	(working copy)
@@ -21,6 +21,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##

+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 64 * 1024
 include /config/failovercalculation.lb

 arch i386 end
Index: coreboot-v2-configlb_rerefactor/src/mainboard/asus/m2v-mx_se/Config.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/mainboard/asus/m2v-mx_se/Config.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/mainboard/asus/m2v-mx_se/Config.lb	(working copy)
@@ -20,7 +20,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ## 

-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb

 arch i386 end 

Index: coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation.lb	(working copy)
@@ -31,8 +31,7 @@
 ## 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_SIZE must be a power of 2 and is set in mainboard Config.lb
 ## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
 ##
-default XIP_ROM_SIZE = 64 * 1024
 default XIP_ROM_BASE = ( _ROMBASE - XIP_ROM_SIZE + ROM_IMAGE_SIZE )
Index: coreboot-v2-configlb_rerefactor/src/config/failovercalculation.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/config/failovercalculation.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/config/failovercalculation.lb	(working copy)
@@ -36,10 +36,9 @@
 ## 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_SIZE must be a power of 2 and is set in mainboard Config.lb
 ## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
 ##
-default XIP_ROM_SIZE = 64 * 1024

 if USE_FAILOVER_IMAGE
    default XIP_ROM_BASE = ( _ROMBASE - XIP_ROM_SIZE + ROM_IMAGE_SIZE)
Index: coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation128.lb
===================================================================
--- coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation128.lb	(revision 4347)
+++ coreboot-v2-configlb_rerefactor/src/config/nofailovercalculation128.lb	(working copy)
@@ -1,38 +0,0 @@
-##
-## 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
-	if CONFIG_CBFS
-		default ROM_SECTION_SIZE   = FALLBACK_SIZE
-		default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE - FALLBACK_SIZE )
-	else
-		default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-		default ROM_SECTION_OFFSET = 0
-	end
-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 )

    