summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2009-08-11 17:35:02 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2009-08-11 17:35:02 +0000
commitb339e10f04869a3d8da31e7d52831c32c57302a2 (patch)
tree9876043ec4255e1dcf619890eba579872273564f
parent401c8d1da2a5292649498ec3a2c8414bd8ecd62c (diff)
downloadcoreboot-b339e10f04869a3d8da31e7d52831c32c57302a2.tar.xz
Enable CBFS everywhere. All boards compiled for me (abuild tested),
and we will fix issues as they appear. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Ronald G. Minnich <rminnich@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4531 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/config/Options.lb2
-rw-r--r--src/mainboard/a-trend/atc-6220/Options.lb4
-rw-r--r--src/mainboard/a-trend/atc-6240/Options.lb4
-rw-r--r--src/mainboard/abit/be6-ii_v2_0/Options.lb4
-rw-r--r--src/mainboard/advantech/pcm-5820/Options.lb4
-rw-r--r--src/mainboard/amd/db800/Options.lb4
-rw-r--r--src/mainboard/amd/dbm690t/Options.lb6
-rw-r--r--src/mainboard/amd/norwich/Options.lb4
-rw-r--r--src/mainboard/amd/pistachio/Options.lb6
-rw-r--r--src/mainboard/amd/rumba/Options.lb4
-rw-r--r--src/mainboard/amd/serengeti_cheetah/Options.lb10
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/Options.lb6
-rw-r--r--src/mainboard/arima/hdama/Options.lb4
-rw-r--r--src/mainboard/artecgroup/dbe61/Options.lb4
-rw-r--r--src/mainboard/asi/mb_5blgp/Options.lb4
-rw-r--r--src/mainboard/asi/mb_5blmp/Options.lb4
-rw-r--r--src/mainboard/asus/a8n_e/Options.lb6
-rw-r--r--src/mainboard/asus/a8v-e_se/Options.lb4
-rw-r--r--src/mainboard/asus/m2v-mx_se/Options.lb5
-rw-r--r--src/mainboard/asus/mew-am/Options.lb4
-rw-r--r--src/mainboard/asus/mew-vm/Options.lb4
-rw-r--r--src/mainboard/asus/p2b-d/Options.lb4
-rw-r--r--src/mainboard/asus/p2b-ds/Options.lb4
-rw-r--r--src/mainboard/asus/p2b-f/Options.lb4
-rw-r--r--src/mainboard/asus/p2b/Options.lb4
-rw-r--r--src/mainboard/asus/p3b-f/Options.lb4
-rw-r--r--src/mainboard/axus/tc320/Options.lb4
-rw-r--r--src/mainboard/azza/pt-6ibd/Options.lb4
-rw-r--r--src/mainboard/bcom/winnet100/Options.lb4
-rw-r--r--src/mainboard/bcom/winnetp680/Options.lb4
-rw-r--r--src/mainboard/biostar/m6tba/Options.lb4
-rw-r--r--src/mainboard/broadcom/blast/Options.lb6
-rw-r--r--src/mainboard/compaq/deskpro_en_sff_p600/Options.lb4
-rw-r--r--src/mainboard/dell/s1850/Config.lb2
-rw-r--r--src/mainboard/dell/s1850/Options.lb6
-rw-r--r--src/mainboard/digitallogic/adl855pc/Options.lb4
-rw-r--r--src/mainboard/digitallogic/msm586seg/Config.lb1
-rw-r--r--src/mainboard/digitallogic/msm586seg/Options.lb4
-rw-r--r--src/mainboard/digitallogic/msm800sev/Options.lb4
-rw-r--r--src/mainboard/eaglelion/5bcm/Options.lb4
-rw-r--r--src/mainboard/embeddedplanet/ep405pc/Options.lb2
-rw-r--r--src/mainboard/gigabyte/ga-6bxc/Options.lb4
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/Options.lb8
-rw-r--r--src/mainboard/gigabyte/m57sli/Options.lb8
-rw-r--r--src/mainboard/ibm/e325/Options.lb4
-rw-r--r--src/mainboard/ibm/e326/Options.lb4
-rw-r--r--src/mainboard/iei/juki-511p/Config.lb2
-rw-r--r--src/mainboard/iei/juki-511p/Options.lb4
-rw-r--r--src/mainboard/iei/nova4899r/Options.lb4
-rw-r--r--src/mainboard/iei/pcisa-lx-800-r10/Options.lb4
-rw-r--r--src/mainboard/intel/jarrell/Config.lb2
-rw-r--r--src/mainboard/intel/jarrell/Options.lb4
-rw-r--r--src/mainboard/intel/mtarvon/Config.lb2
-rw-r--r--src/mainboard/intel/mtarvon/Options.lb4
-rw-r--r--src/mainboard/intel/truxton/Config.lb2
-rw-r--r--src/mainboard/intel/truxton/Options.lb4
-rw-r--r--src/mainboard/intel/xe7501devkit/Config.lb2
-rw-r--r--src/mainboard/intel/xe7501devkit/Options.lb4
-rw-r--r--src/mainboard/iwill/dk8_htx/Options.lb8
-rw-r--r--src/mainboard/iwill/dk8s2/Options.lb4
-rw-r--r--src/mainboard/iwill/dk8x/Options.lb4
-rw-r--r--src/mainboard/jetway/j7f24/Options.lb4
-rw-r--r--src/mainboard/lippert/frontrunner/Options.lb4
-rw-r--r--src/mainboard/lippert/roadrunner-lx/Options.lb4
-rw-r--r--src/mainboard/lippert/spacerunner-lx/Options.lb4
-rw-r--r--src/mainboard/mitac/6513wu/Options.lb4
-rw-r--r--src/mainboard/motorola/sandpoint/Options.lb2
-rw-r--r--src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb2
-rw-r--r--src/mainboard/msi/ms6119/Options.lb4
-rw-r--r--src/mainboard/msi/ms6147/Options.lb4
-rw-r--r--src/mainboard/msi/ms7135/Options.lb7
-rw-r--r--src/mainboard/msi/ms7260/Options.lb6
-rw-r--r--src/mainboard/msi/ms9185/Options.lb7
-rw-r--r--src/mainboard/msi/ms9282/Options.lb6
-rw-r--r--src/mainboard/nec/powermate2000/Options.lb4
-rw-r--r--src/mainboard/newisys/khepri/Options.lb6
-rw-r--r--src/mainboard/nvidia/l1_2pvv/Options.lb8
-rw-r--r--src/mainboard/olpc/btest/Options.lb4
-rw-r--r--src/mainboard/olpc/rev_a/Options.lb4
-rw-r--r--src/mainboard/pcengines/alix1c/Options.lb4
-rw-r--r--src/mainboard/rca/rm4100/Options.lb4
-rw-r--r--src/mainboard/soyo/sy-6ba-plus-iii/Options.lb4
-rw-r--r--src/mainboard/sunw/ultra40/Options.lb6
-rw-r--r--src/mainboard/supermicro/h8dme/Options.lb8
-rw-r--r--src/mainboard/supermicro/x6dai_g/Config.lb2
-rw-r--r--src/mainboard/supermicro/x6dai_g/Options.lb4
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Config.lb2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Options.lb4
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Config.lb2
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Options.lb4
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/Config.lb2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/Options.lb4
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/Config.lb2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/Options.lb4
-rw-r--r--src/mainboard/technexion/tim8690/Options.lb4
-rw-r--r--src/mainboard/technologic/ts5300/Options.lb4
-rw-r--r--src/mainboard/televideo/tc7020/Options.lb4
-rw-r--r--src/mainboard/thomson/ip1000/Options.lb4
-rw-r--r--src/mainboard/totalimpact/briq/Options.lb2
-rw-r--r--src/mainboard/tyan/s1846/Options.lb4
-rw-r--r--src/mainboard/tyan/s2735/Options.lb4
-rw-r--r--src/mainboard/tyan/s2850/Options.lb6
-rw-r--r--src/mainboard/tyan/s2875/Options.lb6
-rw-r--r--src/mainboard/tyan/s2880/Options.lb6
-rw-r--r--src/mainboard/tyan/s2881/Options.lb6
-rw-r--r--src/mainboard/tyan/s2882/Options.lb6
-rw-r--r--src/mainboard/tyan/s2885/Options.lb6
-rw-r--r--src/mainboard/tyan/s2891/Options.lb6
-rw-r--r--src/mainboard/tyan/s2892/Options.lb6
-rw-r--r--src/mainboard/tyan/s2895/Options.lb8
-rw-r--r--src/mainboard/tyan/s2912/Options.lb8
-rw-r--r--src/mainboard/tyan/s2912_fam10/Config.lb2
-rw-r--r--src/mainboard/tyan/s2912_fam10/Options.lb8
-rw-r--r--src/mainboard/tyan/s4880/Options.lb6
-rw-r--r--src/mainboard/tyan/s4882/Options.lb6
-rw-r--r--src/mainboard/via/epia-cn/Options.lb4
-rw-r--r--src/mainboard/via/epia-m/Options.lb4
-rw-r--r--src/mainboard/via/epia-m700/Options.lb4
-rw-r--r--src/mainboard/via/epia-n/Options.lb4
-rw-r--r--src/mainboard/via/epia/Options.lb4
-rw-r--r--src/mainboard/via/pc2500e/Options.lb4
-rw-r--r--targets/amd/db800/Config.lb1
-rw-r--r--targets/amd/norwich/Config.lb1
-rw-r--r--targets/amd/rumba/Config.nofallback.lb2
-rw-r--r--targets/amd/serengeti_cheetah/Config-abuild.lb2
-rw-r--r--targets/amd/serengeti_cheetah/Config-lab.lb1
-rw-r--r--targets/amd/serengeti_cheetah_fam10/Config-lab.lb1
-rw-r--r--targets/arima/hdama/Config.kernelimage.lb7
-rw-r--r--targets/artecgroup/dbe61/Config.lb2
-rw-r--r--targets/asi/mb_5blmp/Config.lb1
-rw-r--r--targets/asus/a8n_e/Config-abuild.lb2
-rw-r--r--targets/asus/m2v-mx_se/Config-abuild.lb9
-rw-r--r--targets/asus/m2v-mx_se/Config.lb5
-rw-r--r--targets/digitallogic/msm586seg/Config-abuild.lb2
-rw-r--r--targets/gigabyte/ga_2761gxdk/Config-abuild.lb4
-rw-r--r--targets/gigabyte/m57sli/Config-abuild.lb2
-rw-r--r--targets/iei/juki-511p/Config-abuild.lb7
-rw-r--r--targets/iwill/dk8_htx/Config-abuild.lb2
-rw-r--r--targets/msi/ms7135/Config-abuild.lb2
-rw-r--r--targets/msi/ms7260/Config-abuild.lb4
-rw-r--r--targets/nvidia/l1_2pvv/Config-abuild.lb2
-rw-r--r--targets/supermicro/h8dme/Config-abuild.lb2
-rw-r--r--targets/technologic/ts5300/Config-abuild.lb2
-rw-r--r--targets/tyan/s2895/Config-abuild.lb2
-rw-r--r--targets/tyan/s2912/Config-abuild.lb2
-rw-r--r--targets/tyan/s2912_fam10/Config-abuild.lb4
146 files changed, 238 insertions, 365 deletions
diff --git a/src/config/Options.lb b/src/config/Options.lb
index a564a5dfaa..b0ad8252fb 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -693,7 +693,7 @@ define CONFIG_FS_FAT
comment "Enable FAT filesystem support"
end
define CONFIG_CBFS
- default 0
+ default 1
export always
comment "The new CBFS file system"
end
diff --git a/src/mainboard/a-trend/atc-6220/Options.lb b/src/mainboard/a-trend/atc-6220/Options.lb
index c1d5bfd3a4..b2a6fd6eda 100644
--- a/src/mainboard/a-trend/atc-6220/Options.lb
+++ b/src/mainboard/a-trend/atc-6220/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/a-trend/atc-6240/Options.lb b/src/mainboard/a-trend/atc-6240/Options.lb
index dfba9224f6..af25b9a430 100644
--- a/src/mainboard/a-trend/atc-6240/Options.lb
+++ b/src/mainboard/a-trend/atc-6240/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/abit/be6-ii_v2_0/Options.lb b/src/mainboard/abit/be6-ii_v2_0/Options.lb
index 108037a62c..356636a9ea 100644
--- a/src/mainboard/abit/be6-ii_v2_0/Options.lb
+++ b/src/mainboard/abit/be6-ii_v2_0/Options.lb
@@ -78,7 +78,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -102,5 +102,5 @@ default CONFIG_PCI_ROM_RUN = 1 # Override this in targets/*/Config.lb.
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/advantech/pcm-5820/Options.lb b/src/mainboard/advantech/pcm-5820/Options.lb
index 4031a060b1..ac76175100 100644
--- a/src/mainboard/advantech/pcm-5820/Options.lb
+++ b/src/mainboard/advantech/pcm-5820/Options.lb
@@ -87,7 +87,7 @@ default CONFIG_HAVE_OPTION_TABLE = 0
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_USE_OPTION_TABLE = 0
@@ -107,5 +107,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/amd/db800/Options.lb b/src/mainboard/amd/db800/Options.lb
index 3745383856..1be68938dc 100644
--- a/src/mainboard/amd/db800/Options.lb
+++ b/src/mainboard/amd/db800/Options.lb
@@ -101,7 +101,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## enable CACHE_AS_RAM specifics
@@ -185,5 +185,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/amd/dbm690t/Options.lb b/src/mainboard/amd/dbm690t/Options.lb
index d2d9ea2fa9..707ed6c455 100644
--- a/src/mainboard/amd/dbm690t/Options.lb
+++ b/src/mainboard/amd/dbm690t/Options.lb
@@ -106,9 +106,9 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
+#default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -305,5 +305,5 @@ default CONFIG_HAVE_MAINBOARD_RESOURCES=1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/amd/norwich/Options.lb b/src/mainboard/amd/norwich/Options.lb
index 7f62ddb568..1c6da2c37a 100644
--- a/src/mainboard/amd/norwich/Options.lb
+++ b/src/mainboard/amd/norwich/Options.lb
@@ -101,7 +101,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## enable CACHE_AS_RAM specifics
@@ -185,5 +185,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/amd/pistachio/Options.lb b/src/mainboard/amd/pistachio/Options.lb
index 539a2994f9..58163a0b08 100644
--- a/src/mainboard/amd/pistachio/Options.lb
+++ b/src/mainboard/amd/pistachio/Options.lb
@@ -106,9 +106,9 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
+#default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -305,5 +305,5 @@ default CONFIG_HAVE_MAINBOARD_RESOURCES=1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/amd/rumba/Options.lb b/src/mainboard/amd/rumba/Options.lb
index 57f31b0b84..e8a6e106e6 100644
--- a/src/mainboard/amd/rumba/Options.lb
+++ b/src/mainboard/amd/rumba/Options.lb
@@ -88,7 +88,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -164,5 +164,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/amd/serengeti_cheetah/Options.lb b/src/mainboard/amd/serengeti_cheetah/Options.lb
index 632c259ced..6b53360c4e 100644
--- a/src/mainboard/amd/serengeti_cheetah/Options.lb
+++ b/src/mainboard/amd/serengeti_cheetah/Options.lb
@@ -105,12 +105,8 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#default CONFIG_FALLBACK_SIZE=0x40000
-#FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE=0x3f000
-#FAILOVER: 4K
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_FAILOVER_SIZE=0x01000
#more 1M for pgtbl
@@ -239,7 +235,7 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2b80
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
##
## Use a small 8K stack
@@ -333,5 +329,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb b/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
index ecff75c91b..f8079a5cd4 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
@@ -130,11 +130,9 @@ default CONFIG_ROM_SIZE=1024*1024
##
#FALLBACK_SIZE_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#default CONFIG_FALLBACK_SIZE=0x40000
#FALLBACK: 1024K - 8K
-default CONFIG_FALLBACK_SIZE=0xFE000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#FAILOVER: 8k
default CONFIG_FAILOVER_SIZE=0x02000
@@ -368,5 +366,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb
index b7de4eb6d4..1e8b436b15 100644
--- a/src/mainboard/arima/hdama/Options.lb
+++ b/src/mainboard/arima/hdama/Options.lb
@@ -76,7 +76,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -246,5 +246,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/artecgroup/dbe61/Options.lb b/src/mainboard/artecgroup/dbe61/Options.lb
index 44b98e79c4..94fa6b6277 100644
--- a/src/mainboard/artecgroup/dbe61/Options.lb
+++ b/src/mainboard/artecgroup/dbe61/Options.lb
@@ -101,7 +101,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## enable CACHE_AS_RAM specifics
@@ -185,5 +185,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asi/mb_5blgp/Options.lb b/src/mainboard/asi/mb_5blgp/Options.lb
index 74b0d2040e..20785e8c19 100644
--- a/src/mainboard/asi/mb_5blgp/Options.lb
+++ b/src/mainboard/asi/mb_5blgp/Options.lb
@@ -87,7 +87,7 @@ default CONFIG_HAVE_OPTION_TABLE = 0
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_USE_OPTION_TABLE = 0
@@ -107,5 +107,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asi/mb_5blmp/Options.lb b/src/mainboard/asi/mb_5blmp/Options.lb
index 05fd34e7b8..a3aa658565 100644
--- a/src/mainboard/asi/mb_5blmp/Options.lb
+++ b/src/mainboard/asi/mb_5blmp/Options.lb
@@ -85,7 +85,7 @@ default CONFIG_PIRQ_ROUTE=1
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -166,5 +166,5 @@ default CONFIG_VIDEO_MB = 0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asus/a8n_e/Options.lb b/src/mainboard/asus/a8n_e/Options.lb
index 54e28795f0..d83e938603 100644
--- a/src/mainboard/asus/a8n_e/Options.lb
+++ b/src/mainboard/asus/a8n_e/Options.lb
@@ -100,8 +100,8 @@ uses CONFIG_LB_MEM_TOPK
uses CONFIG_USE_PRINTK_IN_CAR
default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 252 * 1024
+default CONFIG_ROM_IMAGE_SIZE = 64 * 1024 - CONFIG_FAILOVER_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_FAILOVER_SIZE = 4 * 1024
default CONFIG_HAVE_FALLBACK_BOOT = 1
default CONFIG_HAVE_FAILOVER_BOOT = 1
@@ -171,5 +171,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL = "MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asus/a8v-e_se/Options.lb b/src/mainboard/asus/a8v-e_se/Options.lb
index bda99157d5..15648cba2a 100644
--- a/src/mainboard/asus/a8v-e_se/Options.lb
+++ b/src/mainboard/asus/a8v-e_se/Options.lb
@@ -95,7 +95,7 @@ uses CONFIG_COMPRESSED_PAYLOAD_LZMA
uses CONFIG_USE_PRINTK_IN_CAR
default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_FALLBACK_SIZE = 256 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_HAVE_FALLBACK_BOOT = 1
default CONFIG_HAVE_HARD_RESET = 0
default CONFIG_HAVE_PIRQ_TABLE = 0
@@ -171,5 +171,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL = "MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asus/m2v-mx_se/Options.lb b/src/mainboard/asus/m2v-mx_se/Options.lb
index 203f770bf9..1a9fa17cec 100644
--- a/src/mainboard/asus/m2v-mx_se/Options.lb
+++ b/src/mainboard/asus/m2v-mx_se/Options.lb
@@ -173,9 +173,12 @@ default CONFIG_TTYS0_LCS = 0x3 # 8n1
default CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL = "MAINBOARD_POWER_ON"
+
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
+default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
#
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asus/mew-am/Options.lb b/src/mainboard/asus/mew-am/Options.lb
index 3b259f0d1e..6ccdc4c805 100644
--- a/src/mainboard/asus/mew-am/Options.lb
+++ b/src/mainboard/asus/mew-am/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1 # Override this in targets/*/Config.lb.
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asus/mew-vm/Options.lb b/src/mainboard/asus/mew-vm/Options.lb
index 728a6e5f95..0883ce344d 100644
--- a/src/mainboard/asus/mew-vm/Options.lb
+++ b/src/mainboard/asus/mew-vm/Options.lb
@@ -85,7 +85,7 @@ default CONFIG_IDE = 1
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -162,5 +162,5 @@ default CONFIG_UDELAY_TSC=1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asus/p2b-d/Options.lb b/src/mainboard/asus/p2b-d/Options.lb
index d8b2f7509a..de216f8029 100644
--- a/src/mainboard/asus/p2b-d/Options.lb
+++ b/src/mainboard/asus/p2b-d/Options.lb
@@ -81,7 +81,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -103,5 +103,5 @@ default CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
-default CONFIG_CBFS = 0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asus/p2b-ds/Options.lb b/src/mainboard/asus/p2b-ds/Options.lb
index 37f5db3b6e..f55817f0ba 100644
--- a/src/mainboard/asus/p2b-ds/Options.lb
+++ b/src/mainboard/asus/p2b-ds/Options.lb
@@ -81,7 +81,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -108,5 +108,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asus/p2b-f/Options.lb b/src/mainboard/asus/p2b-f/Options.lb
index c1d5bfd3a4..b2a6fd6eda 100644
--- a/src/mainboard/asus/p2b-f/Options.lb
+++ b/src/mainboard/asus/p2b-f/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asus/p2b/Options.lb b/src/mainboard/asus/p2b/Options.lb
index 55c8568e85..6b41fe5a32 100644
--- a/src/mainboard/asus/p2b/Options.lb
+++ b/src/mainboard/asus/p2b/Options.lb
@@ -78,7 +78,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -102,5 +102,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/asus/p3b-f/Options.lb b/src/mainboard/asus/p3b-f/Options.lb
index c1d5bfd3a4..b2a6fd6eda 100644
--- a/src/mainboard/asus/p3b-f/Options.lb
+++ b/src/mainboard/asus/p3b-f/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/axus/tc320/Options.lb b/src/mainboard/axus/tc320/Options.lb
index e89468ed6f..b8e1a0f89c 100644
--- a/src/mainboard/axus/tc320/Options.lb
+++ b/src/mainboard/axus/tc320/Options.lb
@@ -87,7 +87,7 @@ default CONFIG_IRQ_SLOT_COUNT = 2 # Soldered NIC, internal USB, no real slots
default CONFIG_PIRQ_ROUTE = 1
default CONFIG_HAVE_OPTION_TABLE = 0
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_USE_OPTION_TABLE = 0
@@ -107,5 +107,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 6
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/azza/pt-6ibd/Options.lb b/src/mainboard/azza/pt-6ibd/Options.lb
index c1d5bfd3a4..b2a6fd6eda 100644
--- a/src/mainboard/azza/pt-6ibd/Options.lb
+++ b/src/mainboard/azza/pt-6ibd/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/bcom/winnet100/Options.lb b/src/mainboard/bcom/winnet100/Options.lb
index fdeaa7a2f5..853e4c0840 100644
--- a/src/mainboard/bcom/winnet100/Options.lb
+++ b/src/mainboard/bcom/winnet100/Options.lb
@@ -87,7 +87,7 @@ default CONFIG_IRQ_SLOT_COUNT = 2 # Soldered NIC, internal USB, no real slots
default CONFIG_PIRQ_ROUTE = 1
default CONFIG_HAVE_OPTION_TABLE = 0
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_USE_OPTION_TABLE = 0
@@ -107,5 +107,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 6
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/bcom/winnetp680/Options.lb b/src/mainboard/bcom/winnetp680/Options.lb
index 8af26370bb..212c18ffdc 100644
--- a/src/mainboard/bcom/winnetp680/Options.lb
+++ b/src/mainboard/bcom/winnetp680/Options.lb
@@ -84,7 +84,7 @@ default CONFIG_IRQ_SLOT_COUNT = 10
default CONFIG_HAVE_ACPI_TABLES = 0
default CONFIG_HAVE_OPTION_TABLE = 1
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_USE_FALLBACK_IMAGE = 1
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
@@ -108,5 +108,5 @@ default CONFIG_MAX_PCI_BUSES = 3
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/biostar/m6tba/Options.lb b/src/mainboard/biostar/m6tba/Options.lb
index c1d5bfd3a4..b2a6fd6eda 100644
--- a/src/mainboard/biostar/m6tba/Options.lb
+++ b/src/mainboard/biostar/m6tba/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/broadcom/blast/Options.lb b/src/mainboard/broadcom/blast/Options.lb
index 983ea7409c..ca6738d991 100644
--- a/src/mainboard/broadcom/blast/Options.lb
+++ b/src/mainboard/broadcom/blast/Options.lb
@@ -81,9 +81,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -266,5 +264,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb b/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
index c1d5bfd3a4..b2a6fd6eda 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/dell/s1850/Config.lb b/src/mainboard/dell/s1850/Config.lb
index 90f0181888..645e8b916d 100644
--- a/src/mainboard/dell/s1850/Config.lb
+++ b/src/mainboard/dell/s1850/Config.lb
@@ -4,7 +4,7 @@
default CONFIG_USE_OPTION_TABLE = !CONFIG_USE_FALLBACK_IMAGE
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 128 * 1024
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
include /config/nofailovercalculation.lb
##
diff --git a/src/mainboard/dell/s1850/Options.lb b/src/mainboard/dell/s1850/Options.lb
index 199394a28b..72ad796059 100644
--- a/src/mainboard/dell/s1850/Options.lb
+++ b/src/mainboard/dell/s1850/Options.lb
@@ -130,7 +130,7 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x5580
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
##
## Use a small 8K stack
@@ -147,7 +147,7 @@ default CONFIG_HEAP_SIZE=0x8000
### Compute the location and size of where this firmware image
### (coreboot plus bootloader) will live in the boot rom chip.
###
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Coreboot C code runs at this location in RAM
@@ -232,5 +232,5 @@ default CONFIG_CONSOLE_BTEXT=0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/digitallogic/adl855pc/Options.lb b/src/mainboard/digitallogic/adl855pc/Options.lb
index 91a04a7a43..0ece7ebef7 100644
--- a/src/mainboard/digitallogic/adl855pc/Options.lb
+++ b/src/mainboard/digitallogic/adl855pc/Options.lb
@@ -85,7 +85,7 @@ default CONFIG_HAVE_OPTION_TABLE=1
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -119,5 +119,5 @@ default HOSTCC="gcc"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/digitallogic/msm586seg/Config.lb b/src/mainboard/digitallogic/msm586seg/Config.lb
index 0c28cc907d..0a5ea954a6 100644
--- a/src/mainboard/digitallogic/msm586seg/Config.lb
+++ b/src/mainboard/digitallogic/msm586seg/Config.lb
@@ -1,5 +1,4 @@
default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_FALLBACK_SIZE = 0x10000
## CONFIG_XIP_ROM_SIZE must be a power of 2.
default CONFIG_XIP_ROM_SIZE = 32 * 1024
diff --git a/src/mainboard/digitallogic/msm586seg/Options.lb b/src/mainboard/digitallogic/msm586seg/Options.lb
index c9bf9a60b2..5f85c3a917 100644
--- a/src/mainboard/digitallogic/msm586seg/Options.lb
+++ b/src/mainboard/digitallogic/msm586seg/Options.lb
@@ -93,7 +93,7 @@ default CONFIG_HAVE_OPTION_TABLE=1
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -127,5 +127,5 @@ default HOSTCC="gcc"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/digitallogic/msm800sev/Options.lb b/src/mainboard/digitallogic/msm800sev/Options.lb
index b996a9df3e..3d9f0c706a 100644
--- a/src/mainboard/digitallogic/msm800sev/Options.lb
+++ b/src/mainboard/digitallogic/msm800sev/Options.lb
@@ -101,7 +101,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## enable CACHE_AS_RAM specifics
@@ -185,5 +185,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/eaglelion/5bcm/Options.lb b/src/mainboard/eaglelion/5bcm/Options.lb
index 5605c729e7..f867e9d4d7 100644
--- a/src/mainboard/eaglelion/5bcm/Options.lb
+++ b/src/mainboard/eaglelion/5bcm/Options.lb
@@ -91,7 +91,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -169,5 +169,5 @@ default CONFIG_VIDEO_MB = 0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/embeddedplanet/ep405pc/Options.lb b/src/mainboard/embeddedplanet/ep405pc/Options.lb
index 3fe18e71a9..9aa6a3d0f3 100644
--- a/src/mainboard/embeddedplanet/ep405pc/Options.lb
+++ b/src/mainboard/embeddedplanet/ep405pc/Options.lb
@@ -148,5 +148,5 @@ default CONFIG_RAMBASE=0x00100000
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/gigabyte/ga-6bxc/Options.lb b/src/mainboard/gigabyte/ga-6bxc/Options.lb
index c1d5bfd3a4..b2a6fd6eda 100644
--- a/src/mainboard/gigabyte/ga-6bxc/Options.lb
+++ b/src/mainboard/gigabyte/ga-6bxc/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Options.lb b/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
index f9f57ac9fe..ed45cf60cc 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
@@ -131,11 +131,9 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#default CONFIG_FALLBACK_SIZE=0x40000
#FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE=0x3f000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#FAILOVER: 4K
default CONFIG_FAILOVER_SIZE=0x01000
@@ -261,7 +259,7 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1234
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
##
## Use a small 8K stack
@@ -357,5 +355,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/gigabyte/m57sli/Options.lb b/src/mainboard/gigabyte/m57sli/Options.lb
index 640116d220..f0088bb3a3 100644
--- a/src/mainboard/gigabyte/m57sli/Options.lb
+++ b/src/mainboard/gigabyte/m57sli/Options.lb
@@ -132,11 +132,9 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#default CONFIG_FALLBACK_SIZE=0x40000
#FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE=0x3f000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#FAILOVER: 4K
default CONFIG_FAILOVER_SIZE=0x01000
@@ -270,7 +268,7 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2b80
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
##
## Use a small 8K stack
@@ -365,6 +363,6 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
### End Options.lb
end
diff --git a/src/mainboard/ibm/e325/Options.lb b/src/mainboard/ibm/e325/Options.lb
index 21e39f975c..57cd89707c 100644
--- a/src/mainboard/ibm/e325/Options.lb
+++ b/src/mainboard/ibm/e325/Options.lb
@@ -65,7 +65,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -225,5 +225,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/ibm/e326/Options.lb b/src/mainboard/ibm/e326/Options.lb
index 1d81372c54..b232a10dd4 100644
--- a/src/mainboard/ibm/e326/Options.lb
+++ b/src/mainboard/ibm/e326/Options.lb
@@ -67,7 +67,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -231,5 +231,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/iei/juki-511p/Config.lb b/src/mainboard/iei/juki-511p/Config.lb
index fcc70fd703..9475851f10 100644
--- a/src/mainboard/iei/juki-511p/Config.lb
+++ b/src/mainboard/iei/juki-511p/Config.lb
@@ -3,8 +3,6 @@
## (coreboot plus bootloader) will live in the boot rom chip.
##
default CONFIG_ROM_SIZE = 256 * 1024
-default CONFIG_ROM_SECTION_SIZE = CONFIG_ROM_SIZE
-default CONFIG_ROM_SECTION_OFFSET = 0
##
## Compute the start location and size size of
diff --git a/src/mainboard/iei/juki-511p/Options.lb b/src/mainboard/iei/juki-511p/Options.lb
index 8d8b039abf..564f66acc0 100644
--- a/src/mainboard/iei/juki-511p/Options.lb
+++ b/src/mainboard/iei/juki-511p/Options.lb
@@ -88,7 +88,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -150,5 +150,5 @@ default CONFIG_VIDEO_MB = 0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/iei/nova4899r/Options.lb b/src/mainboard/iei/nova4899r/Options.lb
index 1144648c14..9bee14af0e 100644
--- a/src/mainboard/iei/nova4899r/Options.lb
+++ b/src/mainboard/iei/nova4899r/Options.lb
@@ -98,7 +98,7 @@ default CONFIG_HAVE_OPTION_TABLE=1
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -177,5 +177,5 @@ default CONFIG_VIDEO_MB = 0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Options.lb b/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
index 9dac6822f4..051ffd56ea 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
+++ b/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
@@ -85,7 +85,7 @@ default CONFIG_IRQ_SLOT_COUNT = 9
default CONFIG_PIRQ_ROUTE = 1
default CONFIG_HAVE_OPTION_TABLE = 0
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_USE_DCACHE_RAM = 1
default CONFIG_DCACHE_RAM_BASE = 0xc8000
default CONFIG_DCACHE_RAM_SIZE = 32 * 1024
@@ -111,5 +111,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/intel/jarrell/Config.lb b/src/mainboard/intel/jarrell/Config.lb
index 01bcf82862..4fbd3fb22c 100644
--- a/src/mainboard/intel/jarrell/Config.lb
+++ b/src/mainboard/intel/jarrell/Config.lb
@@ -4,7 +4,7 @@
default CONFIG_USE_OPTION_TABLE = !CONFIG_USE_FALLBACK_IMAGE
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 128 * 1024
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
include /config/nofailovercalculation.lb
##
diff --git a/src/mainboard/intel/jarrell/Options.lb b/src/mainboard/intel/jarrell/Options.lb
index 665b7d0931..aac7a38d0a 100644
--- a/src/mainboard/intel/jarrell/Options.lb
+++ b/src/mainboard/intel/jarrell/Options.lb
@@ -161,7 +161,7 @@ default CONFIG_HEAP_SIZE=0x8000
### Compute the location and size of where this firmware image
### (coreboot plus bootloader) will live in the boot rom chip.
###
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Coreboot C code runs at this location in RAM
@@ -246,5 +246,5 @@ default CONFIG_CONSOLE_BTEXT=0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/intel/mtarvon/Config.lb b/src/mainboard/intel/mtarvon/Config.lb
index 0613d7d369..e5e598214d 100644
--- a/src/mainboard/intel/mtarvon/Config.lb
+++ b/src/mainboard/intel/mtarvon/Config.lb
@@ -18,7 +18,7 @@
##
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 128 * 1024
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
include /config/nofailovercalculation.lb
##
diff --git a/src/mainboard/intel/mtarvon/Options.lb b/src/mainboard/intel/mtarvon/Options.lb
index 17ccf4bc64..c5f2782fd9 100644
--- a/src/mainboard/intel/mtarvon/Options.lb
+++ b/src/mainboard/intel/mtarvon/Options.lb
@@ -150,7 +150,7 @@ default CONFIG_HEAP_SIZE=0x8000
### Compute the location and size of where this firmware image
### (coreboot plus bootloader) will live in the boot rom chip.
###
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## coreboot C code runs at this location in RAM
@@ -229,5 +229,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/intel/truxton/Config.lb b/src/mainboard/intel/truxton/Config.lb
index 4a80852317..7ec2da81b6 100644
--- a/src/mainboard/intel/truxton/Config.lb
+++ b/src/mainboard/intel/truxton/Config.lb
@@ -18,7 +18,7 @@
##
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 128 * 1024
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
include /config/nofailovercalculation.lb
##
diff --git a/src/mainboard/intel/truxton/Options.lb b/src/mainboard/intel/truxton/Options.lb
index 0c8fc291ec..2f98066cd3 100644
--- a/src/mainboard/intel/truxton/Options.lb
+++ b/src/mainboard/intel/truxton/Options.lb
@@ -150,7 +150,7 @@ default CONFIG_HEAP_SIZE=0x8000
### Compute the location and size of where this firmware image
### (coreboot plus bootloader) will live in the boot rom chip.
###
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## coreboot C code runs at this location in RAM
@@ -231,5 +231,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/intel/xe7501devkit/Config.lb b/src/mainboard/intel/xe7501devkit/Config.lb
index 2ac608f066..4557a6a6d5 100644
--- a/src/mainboard/intel/xe7501devkit/Config.lb
+++ b/src/mainboard/intel/xe7501devkit/Config.lb
@@ -1,5 +1,5 @@
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 128 * 1024
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
include /config/nofailovercalculation.lb
arch i386 end
diff --git a/src/mainboard/intel/xe7501devkit/Options.lb b/src/mainboard/intel/xe7501devkit/Options.lb
index 20289a2ee3..325edba261 100644
--- a/src/mainboard/intel/xe7501devkit/Options.lb
+++ b/src/mainboard/intel/xe7501devkit/Options.lb
@@ -79,7 +79,7 @@ default CONFIG_ROM_IMAGE_SIZE = 65536
## Build code for the fallback boot?
##
default CONFIG_HAVE_FALLBACK_BOOT=1
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
## Delay timer options
@@ -244,5 +244,5 @@ default CONFIG_DEBUG=1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/iwill/dk8_htx/Options.lb b/src/mainboard/iwill/dk8_htx/Options.lb
index 346cc6e64c..d216b435d8 100644
--- a/src/mainboard/iwill/dk8_htx/Options.lb
+++ b/src/mainboard/iwill/dk8_htx/Options.lb
@@ -105,11 +105,9 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#default CONFIG_FALLBACK_SIZE=0x40000
#FALLBACK: 256K-8K
-default CONFIG_FALLBACK_SIZE=0x3e000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#FAILOVER: 8K
default CONFIG_FAILOVER_SIZE=0x02000
@@ -238,7 +236,7 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2b80
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
##
## Use a small 8K stack
@@ -332,5 +330,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/iwill/dk8s2/Options.lb b/src/mainboard/iwill/dk8s2/Options.lb
index 99204c4192..248b69449c 100644
--- a/src/mainboard/iwill/dk8s2/Options.lb
+++ b/src/mainboard/iwill/dk8s2/Options.lb
@@ -66,7 +66,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -232,5 +232,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/iwill/dk8x/Options.lb b/src/mainboard/iwill/dk8x/Options.lb
index 9249ee79e7..23fdc89ef4 100644
--- a/src/mainboard/iwill/dk8x/Options.lb
+++ b/src/mainboard/iwill/dk8x/Options.lb
@@ -66,7 +66,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -231,5 +231,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/jetway/j7f24/Options.lb b/src/mainboard/jetway/j7f24/Options.lb
index 17e92c058e..296ca32c25 100644
--- a/src/mainboard/jetway/j7f24/Options.lb
+++ b/src/mainboard/jetway/j7f24/Options.lb
@@ -85,7 +85,7 @@ default CONFIG_IRQ_SLOT_COUNT = 10
default CONFIG_HAVE_ACPI_TABLES = 0
default CONFIG_HAVE_OPTION_TABLE = 0
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_USE_FALLBACK_IMAGE = 1
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
@@ -109,5 +109,5 @@ default CONFIG_MAX_PCI_BUSES = 3
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/lippert/frontrunner/Options.lb b/src/mainboard/lippert/frontrunner/Options.lb
index 57f31b0b84..e8a6e106e6 100644
--- a/src/mainboard/lippert/frontrunner/Options.lb
+++ b/src/mainboard/lippert/frontrunner/Options.lb
@@ -88,7 +88,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -164,5 +164,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/lippert/roadrunner-lx/Options.lb b/src/mainboard/lippert/roadrunner-lx/Options.lb
index 4ab90578d6..f5f99a24fa 100644
--- a/src/mainboard/lippert/roadrunner-lx/Options.lb
+++ b/src/mainboard/lippert/roadrunner-lx/Options.lb
@@ -129,7 +129,7 @@ default CONFIG_HAVE_OPTION_TABLE = 0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## enable CACHE_AS_RAM specifics
@@ -215,5 +215,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/lippert/spacerunner-lx/Options.lb b/src/mainboard/lippert/spacerunner-lx/Options.lb
index 363e3d405e..f1d25a270a 100644
--- a/src/mainboard/lippert/spacerunner-lx/Options.lb
+++ b/src/mainboard/lippert/spacerunner-lx/Options.lb
@@ -129,7 +129,7 @@ default CONFIG_HAVE_OPTION_TABLE = 0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## enable CACHE_AS_RAM specifics
@@ -215,5 +215,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/mitac/6513wu/Options.lb b/src/mainboard/mitac/6513wu/Options.lb
index 2698e31890..9a6ee4b52c 100644
--- a/src/mainboard/mitac/6513wu/Options.lb
+++ b/src/mainboard/mitac/6513wu/Options.lb
@@ -75,10 +75,10 @@ default CONFIG_USE_OPTION_TABLE = 0
# ROM layout
default CONFIG_ROM_SIZE = 512 * 1024
default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
-default CONFIG_FALLBACK_SIZE = 256 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_HAVE_FALLBACK_BOOT = 1
default CONFIG_ROM_PAYLOAD = 1
-default CONFIG_CBFS = 0
+default CONFIG_CBFS=1
# RAM layout
default CONFIG_RAMBASE = 0x00004000
diff --git a/src/mainboard/motorola/sandpoint/Options.lb b/src/mainboard/motorola/sandpoint/Options.lb
index af110025e1..29cc5b96af 100644
--- a/src/mainboard/motorola/sandpoint/Options.lb
+++ b/src/mainboard/motorola/sandpoint/Options.lb
@@ -130,5 +130,5 @@ default CONFIG_SANDPOINT_ALTIMUS=1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
index ac5777a9a3..2ba981db7d 100644
--- a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
+++ b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
@@ -125,5 +125,5 @@ default CONFIG_RAMSTART=0x00100000
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/msi/ms6119/Options.lb b/src/mainboard/msi/ms6119/Options.lb
index dfba9224f6..af25b9a430 100644
--- a/src/mainboard/msi/ms6119/Options.lb
+++ b/src/mainboard/msi/ms6119/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/msi/ms6147/Options.lb b/src/mainboard/msi/ms6147/Options.lb
index 47a6dcbebe..4f2a0e70b3 100644
--- a/src/mainboard/msi/ms6147/Options.lb
+++ b/src/mainboard/msi/ms6147/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -101,5 +101,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/msi/ms7135/Options.lb b/src/mainboard/msi/ms7135/Options.lb
index 5fe20447ea..8731625cc9 100644
--- a/src/mainboard/msi/ms7135/Options.lb
+++ b/src/mainboard/msi/ms7135/Options.lb
@@ -112,7 +112,7 @@ default CONFIG_ROM_SIZE=(512*1024)
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-default CONFIG_FALLBACK_SIZE=(252*1024)
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#FAILOVER: 4K
default CONFIG_FAILOVER_SIZE=(4*1024)
@@ -228,8 +228,7 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x7135
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = (64*1024)
-#65536
+default CONFIG_ROM_IMAGE_SIZE = (64*1024) - CONFIG_FAILOVER_SIZE
##
## Use a small 8K stack
@@ -325,5 +324,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/msi/ms7260/Options.lb b/src/mainboard/msi/ms7260/Options.lb
index ea1a867a55..0dd1e2bf72 100644
--- a/src/mainboard/msi/ms7260/Options.lb
+++ b/src/mainboard/msi/ms7260/Options.lb
@@ -101,7 +101,7 @@ uses CONFIG_WAIT_BEFORE_CPUS_INIT
uses CONFIG_USE_PRINTK_IN_CAR
default CONFIG_ROM_SIZE = 512 * 1024
-default CONFIG_FALLBACK_SIZE = (256 * 1024) - (4 * 1024)
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_FAILOVER_SIZE = 4 * 1024
default CONFIG_LB_MEM_TOPK = 2048 # 1MB more for pgtbl.
default CONFIG_HAVE_FALLBACK_BOOT = 1
@@ -169,7 +169,7 @@ default CONFIG_MAINBOARD_PART_NUMBER = "K9N Neo (MS-7260)"
default CONFIG_MAINBOARD_VENDOR = "MSI"
default CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID = 0x1462
default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID = 0x7260
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
default CONFIG_STACK_SIZE = 0x2000
default CONFIG_HEAP_SIZE = 0x8000
default CONFIG_USE_OPTION_TABLE = (!CONFIG_USE_FALLBACK_IMAGE) && (!CONFIG_USE_FAILOVER_IMAGE)
@@ -190,5 +190,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL = "MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/msi/ms9185/Options.lb b/src/mainboard/msi/ms9185/Options.lb
index c08ab918cf..03c4d3ef9d 100644
--- a/src/mainboard/msi/ms9185/Options.lb
+++ b/src/mainboard/msi/ms9185/Options.lb
@@ -118,10 +118,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
-##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#more 1M for pgtbl
default CONFIG_LB_MEM_TOPK=2048
@@ -334,5 +331,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/msi/ms9282/Options.lb b/src/mainboard/msi/ms9282/Options.lb
index 08f95345a6..d22644f35e 100644
--- a/src/mainboard/msi/ms9282/Options.lb
+++ b/src/mainboard/msi/ms9282/Options.lb
@@ -112,9 +112,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
###
### Build options
@@ -313,5 +311,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/nec/powermate2000/Options.lb b/src/mainboard/nec/powermate2000/Options.lb
index 1475d6e2ad..77562a1f93 100644
--- a/src/mainboard/nec/powermate2000/Options.lb
+++ b/src/mainboard/nec/powermate2000/Options.lb
@@ -74,7 +74,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -100,5 +100,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/newisys/khepri/Options.lb b/src/mainboard/newisys/khepri/Options.lb
index d72780a9f7..b7bbeff208 100644
--- a/src/mainboard/newisys/khepri/Options.lb
+++ b/src/mainboard/newisys/khepri/Options.lb
@@ -73,9 +73,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -249,5 +247,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/nvidia/l1_2pvv/Options.lb b/src/mainboard/nvidia/l1_2pvv/Options.lb
index 7c415b3897..d9867827d0 100644
--- a/src/mainboard/nvidia/l1_2pvv/Options.lb
+++ b/src/mainboard/nvidia/l1_2pvv/Options.lb
@@ -129,11 +129,9 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#default CONFIG_FALLBACK_SIZE=0x40000
#FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE=0x3f000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#FAILOVER: 4K
default CONFIG_FAILOVER_SIZE=0x01000
@@ -259,7 +257,7 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2b80
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
##
## Use a small 8K stack
@@ -355,5 +353,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/olpc/btest/Options.lb b/src/mainboard/olpc/btest/Options.lb
index 910bad4aa7..1e7335d2b1 100644
--- a/src/mainboard/olpc/btest/Options.lb
+++ b/src/mainboard/olpc/btest/Options.lb
@@ -89,7 +89,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -165,5 +165,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/olpc/rev_a/Options.lb b/src/mainboard/olpc/rev_a/Options.lb
index 910bad4aa7..1e7335d2b1 100644
--- a/src/mainboard/olpc/rev_a/Options.lb
+++ b/src/mainboard/olpc/rev_a/Options.lb
@@ -89,7 +89,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -165,5 +165,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/pcengines/alix1c/Options.lb b/src/mainboard/pcengines/alix1c/Options.lb
index e7fe6d7657..85350a4b32 100644
--- a/src/mainboard/pcengines/alix1c/Options.lb
+++ b/src/mainboard/pcengines/alix1c/Options.lb
@@ -119,7 +119,7 @@ default CONFIG_HAVE_OPTION_TABLE=0
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## enable CACHE_AS_RAM specifics
@@ -203,5 +203,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/rca/rm4100/Options.lb b/src/mainboard/rca/rm4100/Options.lb
index e388528c3c..e3c84d5f50 100644
--- a/src/mainboard/rca/rm4100/Options.lb
+++ b/src/mainboard/rca/rm4100/Options.lb
@@ -68,7 +68,7 @@ uses CONFIG_XIP_ROM_BASE
default CONFIG_ROM_SIZE = 512 * 1024
default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_FALLBACK_SIZE = 512 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_UDELAY_TSC = 1
default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
default CONFIG_HAVE_PIRQ_TABLE = 1
@@ -100,5 +100,5 @@ default CONFIG_MAINBOARD_PART_NUMBER = "RM4100"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb b/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb
index cb086c322e..ea8983bcdd 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb
@@ -77,7 +77,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -96,5 +96,5 @@ default CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
-default CONFIG_CBFS = 0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/sunw/ultra40/Options.lb b/src/mainboard/sunw/ultra40/Options.lb
index c8e2e73fed..fc73ee0237 100644
--- a/src/mainboard/sunw/ultra40/Options.lb
+++ b/src/mainboard/sunw/ultra40/Options.lb
@@ -82,9 +82,7 @@ default CONFIG_ROM_SIZE=1048576
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
###
### Build options
@@ -282,5 +280,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/supermicro/h8dme/Options.lb b/src/mainboard/supermicro/h8dme/Options.lb
index d057f3a562..afb735047a 100644
--- a/src/mainboard/supermicro/h8dme/Options.lb
+++ b/src/mainboard/supermicro/h8dme/Options.lb
@@ -133,11 +133,9 @@ default CONFIG_MULTIBOOT=0
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#default CONFIG_FALLBACK_SIZE=0x40000
#FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE=0x3f000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#FAILOVER: 4K
default CONFIG_FAILOVER_SIZE=0x01000
@@ -261,7 +259,7 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1511
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
##
## Use a small 8K stack
@@ -357,5 +355,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/supermicro/x6dai_g/Config.lb b/src/mainboard/supermicro/x6dai_g/Config.lb
index 8acd71c724..3e9a87eb77 100644
--- a/src/mainboard/supermicro/x6dai_g/Config.lb
+++ b/src/mainboard/supermicro/x6dai_g/Config.lb
@@ -4,7 +4,7 @@
default CONFIG_USE_OPTION_TABLE = !CONFIG_USE_FALLBACK_IMAGE
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 128 * 1024
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
include /config/nofailovercalculation.lb
##
diff --git a/src/mainboard/supermicro/x6dai_g/Options.lb b/src/mainboard/supermicro/x6dai_g/Options.lb
index 73eb826468..2ad1692ea5 100644
--- a/src/mainboard/supermicro/x6dai_g/Options.lb
+++ b/src/mainboard/supermicro/x6dai_g/Options.lb
@@ -147,7 +147,7 @@ default CONFIG_HEAP_SIZE=0x8000
### Compute the location and size of where this firmware image
### (coreboot plus bootloader) will live in the boot rom chip.
###
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Coreboot C code runs at this location in RAM
@@ -233,5 +233,5 @@ default CONFIG_CONSOLE_BTEXT=0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/supermicro/x6dhe_g/Config.lb b/src/mainboard/supermicro/x6dhe_g/Config.lb
index 78be06df0b..2c34ff390d 100644
--- a/src/mainboard/supermicro/x6dhe_g/Config.lb
+++ b/src/mainboard/supermicro/x6dhe_g/Config.lb
@@ -4,7 +4,7 @@
default CONFIG_USE_OPTION_TABLE = !CONFIG_USE_FALLBACK_IMAGE
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 128 * 1024
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
include /config/nofailovercalculation.lb
## Set all of the defaults for an x86 architecture
diff --git a/src/mainboard/supermicro/x6dhe_g/Options.lb b/src/mainboard/supermicro/x6dhe_g/Options.lb
index 50b3da430e..c9ca49507d 100644
--- a/src/mainboard/supermicro/x6dhe_g/Options.lb
+++ b/src/mainboard/supermicro/x6dhe_g/Options.lb
@@ -147,7 +147,7 @@ default CONFIG_HEAP_SIZE=0x8000
### Compute the location and size of where this firmware image
### (coreboot plus bootloader) will live in the boot rom chip.
###
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Coreboot C code runs at this location in RAM
@@ -233,5 +233,5 @@ default CONFIG_CONSOLE_BTEXT=0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/supermicro/x6dhe_g2/Config.lb b/src/mainboard/supermicro/x6dhe_g2/Config.lb
index a4950d33ef..722a02077a 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Config.lb
+++ b/src/mainboard/supermicro/x6dhe_g2/Config.lb
@@ -4,7 +4,7 @@
default CONFIG_USE_OPTION_TABLE = !CONFIG_USE_FALLBACK_IMAGE
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 128 * 1024
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
include /config/nofailovercalculation.lb
## Set all of the defaults for an x86 architecture
diff --git a/src/mainboard/supermicro/x6dhe_g2/Options.lb b/src/mainboard/supermicro/x6dhe_g2/Options.lb
index 50b3da430e..c9ca49507d 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Options.lb
+++ b/src/mainboard/supermicro/x6dhe_g2/Options.lb
@@ -147,7 +147,7 @@ default CONFIG_HEAP_SIZE=0x8000
### Compute the location and size of where this firmware image
### (coreboot plus bootloader) will live in the boot rom chip.
###
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Coreboot C code runs at this location in RAM
@@ -233,5 +233,5 @@ default CONFIG_CONSOLE_BTEXT=0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/supermicro/x6dhr_ig/Config.lb b/src/mainboard/supermicro/x6dhr_ig/Config.lb
index 7d70dcf5db..e2d37dc7ca 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Config.lb
+++ b/src/mainboard/supermicro/x6dhr_ig/Config.lb
@@ -4,7 +4,7 @@
default CONFIG_USE_OPTION_TABLE = !CONFIG_USE_FALLBACK_IMAGE
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 128 * 1024
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
include /config/nofailovercalculation.lb
##
diff --git a/src/mainboard/supermicro/x6dhr_ig/Options.lb b/src/mainboard/supermicro/x6dhr_ig/Options.lb
index 199394a28b..717f9df150 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Options.lb
+++ b/src/mainboard/supermicro/x6dhr_ig/Options.lb
@@ -147,7 +147,7 @@ default CONFIG_HEAP_SIZE=0x8000
### Compute the location and size of where this firmware image
### (coreboot plus bootloader) will live in the boot rom chip.
###
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Coreboot C code runs at this location in RAM
@@ -232,5 +232,5 @@ default CONFIG_CONSOLE_BTEXT=0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Config.lb b/src/mainboard/supermicro/x6dhr_ig2/Config.lb
index 4aab4fb04b..566b776c15 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Config.lb
+++ b/src/mainboard/supermicro/x6dhr_ig2/Config.lb
@@ -4,7 +4,7 @@
default CONFIG_USE_OPTION_TABLE = !CONFIG_USE_FALLBACK_IMAGE
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 128 * 1024
+default CONFIG_XIP_ROM_SIZE = 64 * 1024
include /config/nofailovercalculation.lb
##
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Options.lb b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
index 199394a28b..717f9df150 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Options.lb
+++ b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
@@ -147,7 +147,7 @@ default CONFIG_HEAP_SIZE=0x8000
### Compute the location and size of where this firmware image
### (coreboot plus bootloader) will live in the boot rom chip.
###
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Coreboot C code runs at this location in RAM
@@ -232,5 +232,5 @@ default CONFIG_CONSOLE_BTEXT=0
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/technexion/tim8690/Options.lb b/src/mainboard/technexion/tim8690/Options.lb
index 133a21de48..fef8a9f1b7 100644
--- a/src/mainboard/technexion/tim8690/Options.lb
+++ b/src/mainboard/technexion/tim8690/Options.lb
@@ -106,9 +106,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
diff --git a/src/mainboard/technologic/ts5300/Options.lb b/src/mainboard/technologic/ts5300/Options.lb
index 5fb92c63e4..c3f0c6e445 100644
--- a/src/mainboard/technologic/ts5300/Options.lb
+++ b/src/mainboard/technologic/ts5300/Options.lb
@@ -108,7 +108,7 @@ default CONFIG_HAVE_OPTION_TABLE=1
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -140,5 +140,5 @@ default HOSTCC="gcc"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/televideo/tc7020/Options.lb b/src/mainboard/televideo/tc7020/Options.lb
index 2690850ead..3c38d53e60 100644
--- a/src/mainboard/televideo/tc7020/Options.lb
+++ b/src/mainboard/televideo/tc7020/Options.lb
@@ -88,7 +88,7 @@ default CONFIG_HAVE_PIRQ_TABLE = 1
default CONFIG_IRQ_SLOT_COUNT = 3 # Soldered NIC, internal USB, mini PCI slot
default CONFIG_HAVE_OPTION_TABLE = 0
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_USE_OPTION_TABLE = 0
@@ -108,5 +108,5 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 6
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/thomson/ip1000/Options.lb b/src/mainboard/thomson/ip1000/Options.lb
index 0be45e1f0c..96ab879fdf 100644
--- a/src/mainboard/thomson/ip1000/Options.lb
+++ b/src/mainboard/thomson/ip1000/Options.lb
@@ -68,7 +68,7 @@ uses CONFIG_XIP_ROM_BASE
default CONFIG_ROM_SIZE = 512 * 1024
default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_FALLBACK_SIZE = 256 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_UDELAY_TSC = 1
default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
default CONFIG_HAVE_PIRQ_TABLE = 1
@@ -100,5 +100,5 @@ default CONFIG_MAINBOARD_PART_NUMBER = "IP1000"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/totalimpact/briq/Options.lb b/src/mainboard/totalimpact/briq/Options.lb
index 92af3dfc86..8cc96d2914 100644
--- a/src/mainboard/totalimpact/briq/Options.lb
+++ b/src/mainboard/totalimpact/briq/Options.lb
@@ -132,5 +132,5 @@ default CONFIG_BRIQ_750FX=1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s1846/Options.lb b/src/mainboard/tyan/s1846/Options.lb
index 51d570ba65..ed3bd641b0 100644
--- a/src/mainboard/tyan/s1846/Options.lb
+++ b/src/mainboard/tyan/s1846/Options.lb
@@ -78,7 +78,7 @@ default CONFIG_IRQ_SLOT_COUNT = 0 # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_VENDOR = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_MAINBOARD_PART_NUMBER = "N/A" # Override this in targets/*/Config.lb.
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = 128 * 1024
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
default CONFIG_HAVE_OPTION_TABLE = 0
@@ -102,5 +102,5 @@ default CONFIG_PCI_ROM_RUN = 1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2735/Options.lb b/src/mainboard/tyan/s2735/Options.lb
index b04ac4b74c..609f266b81 100644
--- a/src/mainboard/tyan/s2735/Options.lb
+++ b/src/mainboard/tyan/s2735/Options.lb
@@ -76,7 +76,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-default CONFIG_FALLBACK_SIZE=131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
###
### Build options
@@ -260,5 +260,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2850/Options.lb b/src/mainboard/tyan/s2850/Options.lb
index 2ae529e2d1..bd4433f7d3 100644
--- a/src/mainboard/tyan/s2850/Options.lb
+++ b/src/mainboard/tyan/s2850/Options.lb
@@ -74,9 +74,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -250,5 +248,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2875/Options.lb b/src/mainboard/tyan/s2875/Options.lb
index ed0ffa8077..8d0357aadb 100644
--- a/src/mainboard/tyan/s2875/Options.lb
+++ b/src/mainboard/tyan/s2875/Options.lb
@@ -74,9 +74,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
@@ -251,5 +249,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2880/Options.lb b/src/mainboard/tyan/s2880/Options.lb
index f2c72a95f5..9006a447c2 100644
--- a/src/mainboard/tyan/s2880/Options.lb
+++ b/src/mainboard/tyan/s2880/Options.lb
@@ -74,9 +74,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -250,5 +248,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2881/Options.lb b/src/mainboard/tyan/s2881/Options.lb
index 0618e5bf28..417e0075bc 100644
--- a/src/mainboard/tyan/s2881/Options.lb
+++ b/src/mainboard/tyan/s2881/Options.lb
@@ -79,9 +79,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -267,5 +265,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2882/Options.lb b/src/mainboard/tyan/s2882/Options.lb
index 6a2e4dfdd5..21bbf00b15 100644
--- a/src/mainboard/tyan/s2882/Options.lb
+++ b/src/mainboard/tyan/s2882/Options.lb
@@ -74,9 +74,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -250,5 +248,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2885/Options.lb b/src/mainboard/tyan/s2885/Options.lb
index f713aa46ff..0b4d9a0980 100644
--- a/src/mainboard/tyan/s2885/Options.lb
+++ b/src/mainboard/tyan/s2885/Options.lb
@@ -85,9 +85,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -277,5 +275,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2891/Options.lb b/src/mainboard/tyan/s2891/Options.lb
index b333a64e39..4b6c226727 100644
--- a/src/mainboard/tyan/s2891/Options.lb
+++ b/src/mainboard/tyan/s2891/Options.lb
@@ -88,9 +88,7 @@ default CONFIG_ROM_SIZE=512*1024
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
###
### Build options
@@ -306,5 +304,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2892/Options.lb b/src/mainboard/tyan/s2892/Options.lb
index f3ae0f8184..c80e772e9d 100644
--- a/src/mainboard/tyan/s2892/Options.lb
+++ b/src/mainboard/tyan/s2892/Options.lb
@@ -82,9 +82,7 @@ default CONFIG_ROM_SIZE=1024*1024
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
###
### Build options
@@ -294,5 +292,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2895/Options.lb b/src/mainboard/tyan/s2895/Options.lb
index e47c6d80e2..7e4da22fa6 100644
--- a/src/mainboard/tyan/s2895/Options.lb
+++ b/src/mainboard/tyan/s2895/Options.lb
@@ -91,11 +91,9 @@ default CONFIG_ROM_SIZE=1024*1024
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#default CONFIG_FALLBACK_SIZE=0x40000
#FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE=0x3f000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#FAILOVER: 4K
default CONFIG_FAILOVER_SIZE=0x01000
@@ -218,7 +216,7 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2895
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
##
## Use a small 8K stack
@@ -313,5 +311,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2912/Options.lb b/src/mainboard/tyan/s2912/Options.lb
index 7009da0a96..640f147296 100644
--- a/src/mainboard/tyan/s2912/Options.lb
+++ b/src/mainboard/tyan/s2912/Options.lb
@@ -129,11 +129,9 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#default CONFIG_FALLBACK_SIZE=0x40000
#FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE=0x3f000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
#FAILOVER: 4K
default CONFIG_FAILOVER_SIZE=0x01000
@@ -261,7 +259,7 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2912
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 65536 - CONFIG_FAILOVER_SIZE
##
## Use a small 8K stack
@@ -357,5 +355,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s2912_fam10/Config.lb b/src/mainboard/tyan/s2912_fam10/Config.lb
index 26977d657d..be6662f889 100644
--- a/src/mainboard/tyan/s2912_fam10/Config.lb
+++ b/src/mainboard/tyan/s2912_fam10/Config.lb
@@ -20,7 +20,7 @@
##
## CONFIG_XIP_ROM_SIZE must be a power of 2.
-default CONFIG_XIP_ROM_SIZE = 64 * 1024
+default CONFIG_XIP_ROM_SIZE = 128 * 1024
include /config/failovercalculation.lb
arch i386 end
diff --git a/src/mainboard/tyan/s2912_fam10/Options.lb b/src/mainboard/tyan/s2912_fam10/Options.lb
index 561e43b703..62b6af985a 100644
--- a/src/mainboard/tyan/s2912_fam10/Options.lb
+++ b/src/mainboard/tyan/s2912_fam10/Options.lb
@@ -133,10 +133,8 @@ default CONFIG_ROM_SIZE=1024*1024
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#default CONFIG_FALLBACK_SIZE=0x40000
-default CONFIG_FALLBACK_SIZE=0x3f000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_FAILOVER_SIZE=0x01000
#more 1M for pgtbl
@@ -270,7 +268,7 @@ default CONFIG_AMD_UCODE_PATCH_FILE="mc_patch_01000095.h"
###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = (128*1024) - CONFIG_FAILOVER_SIZE
##
## Use a small 8K stack
@@ -366,5 +364,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s4880/Options.lb b/src/mainboard/tyan/s4880/Options.lb
index 8821dadaba..c9fa096385 100644
--- a/src/mainboard/tyan/s4880/Options.lb
+++ b/src/mainboard/tyan/s4880/Options.lb
@@ -78,9 +78,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -259,5 +257,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/tyan/s4882/Options.lb b/src/mainboard/tyan/s4882/Options.lb
index 877a23688a..d76d2ec208 100644
--- a/src/mainboard/tyan/s4882/Options.lb
+++ b/src/mainboard/tyan/s4882/Options.lb
@@ -78,9 +78,7 @@ default CONFIG_ROM_SIZE=524288
##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
##
-#default CONFIG_FALLBACK_SIZE=131072
-#256K
-default CONFIG_FALLBACK_SIZE=0x40000
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Build code for the fallback boot
@@ -258,5 +256,5 @@ default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/via/epia-cn/Options.lb b/src/mainboard/via/epia-cn/Options.lb
index 7d45f613e8..1f2b70a908 100644
--- a/src/mainboard/via/epia-cn/Options.lb
+++ b/src/mainboard/via/epia-cn/Options.lb
@@ -85,7 +85,7 @@ default CONFIG_IRQ_SLOT_COUNT = 9
default CONFIG_HAVE_ACPI_TABLES = 0
default CONFIG_HAVE_OPTION_TABLE = 1
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_USE_FALLBACK_IMAGE = 1
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
@@ -109,5 +109,5 @@ default CONFIG_MAX_PCI_BUSES = 3
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb
index 9084a3dd5b..1d3094bf65 100644
--- a/src/mainboard/via/epia-m/Options.lb
+++ b/src/mainboard/via/epia-m/Options.lb
@@ -101,7 +101,7 @@ default CONFIG_HAVE_OPTION_TABLE=1
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -148,5 +148,5 @@ default CONFIG_CONSOLE_SERIAL8250=1
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/via/epia-m700/Options.lb b/src/mainboard/via/epia-m700/Options.lb
index b04013a9da..7f0477f0fc 100644
--- a/src/mainboard/via/epia-m700/Options.lb
+++ b/src/mainboard/via/epia-m700/Options.lb
@@ -124,7 +124,7 @@ default CONFIG_IRQ_SLOT_COUNT = 13
default CONFIG_HAVE_ACPI_TABLES = 1
default CONFIG_HAVE_OPTION_TABLE = 1
default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_USE_FALLBACK_IMAGE = 1
default CONFIG_STACK_SIZE = 16 * 1024
default CONFIG_HEAP_SIZE = 20 * 1024
@@ -137,7 +137,7 @@ default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
default HOSTCC = "gcc"
default CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
-default CONFIG_CBFS = 0
+default CONFIG_CBFS=1
##
## Set this to the max PCI bus number you would ever use for PCI config I/O.
diff --git a/src/mainboard/via/epia-n/Options.lb b/src/mainboard/via/epia-n/Options.lb
index 3eca70e4b1..64e0349028 100644
--- a/src/mainboard/via/epia-n/Options.lb
+++ b/src/mainboard/via/epia-n/Options.lb
@@ -98,7 +98,7 @@ default CONFIG_HAVE_OPTION_TABLE = 1
#default CONFIG_PAYLOAD_SIZE = 125 * 1024
default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
default CONFIG_PAYLOAD_SIZE = 256 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE + CONFIG_PAYLOAD_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_USE_FALLBACK_IMAGE = 1
default CONFIG_STACK_SIZE = 8 * 1024
default CONFIG_HEAP_SIZE = 16 * 1024
@@ -123,5 +123,5 @@ default CONFIG_MAX_PCI_BUSES = 3
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/via/epia/Options.lb b/src/mainboard/via/epia/Options.lb
index effa477180..0d20674aff 100644
--- a/src/mainboard/via/epia/Options.lb
+++ b/src/mainboard/via/epia/Options.lb
@@ -111,7 +111,7 @@ default CONFIG_HAVE_OPTION_TABLE=1
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536
-default CONFIG_FALLBACK_SIZE = 131072
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
##
## Use a small 8K stack
@@ -146,5 +146,5 @@ default HOSTCC="gcc"
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/src/mainboard/via/pc2500e/Options.lb b/src/mainboard/via/pc2500e/Options.lb
index 5713f0c172..ce03e723be 100644
--- a/src/mainboard/via/pc2500e/Options.lb
+++ b/src/mainboard/via/pc2500e/Options.lb
@@ -74,7 +74,7 @@ uses CONFIG_IOAPIC
default CONFIG_ROM_SIZE = 512 * 1024
default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
-default CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
+default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
default CONFIG_IOAPIC = 0
default CONFIG_VIDEO_MB = 32
default CONFIG_CONSOLE_SERIAL8250 = 1
@@ -117,5 +117,5 @@ default CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
# CBFS
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
end
diff --git a/targets/amd/db800/Config.lb b/targets/amd/db800/Config.lb
index a9230f01bd..967eedb878 100644
--- a/targets/amd/db800/Config.lb
+++ b/targets/amd/db800/Config.lb
@@ -32,7 +32,6 @@ option CONFIG_COMPRESSED_PAYLOAD_LZMA=0
# Leave 36k for VSA.
option CONFIG_ROM_SIZE=512*1024-36*1024
# option CONFIG_ROM_SIZE=256*1024-36*1024
-option CONFIG_FALLBACK_SIZE=CONFIG_ROM_SIZE
option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
diff --git a/targets/amd/norwich/Config.lb b/targets/amd/norwich/Config.lb
index 5f927c567a..828c507f4a 100644
--- a/targets/amd/norwich/Config.lb
+++ b/targets/amd/norwich/Config.lb
@@ -32,7 +32,6 @@ option CONFIG_COMPRESSED_PAYLOAD_LZMA=0
option CONFIG_ROM_SIZE=512*1024-36*1024
#option CONFIG_ROM_SIZE=256*1024-36*1024
-option CONFIG_FALLBACK_SIZE=CONFIG_ROM_SIZE
option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
diff --git a/targets/amd/rumba/Config.nofallback.lb b/targets/amd/rumba/Config.nofallback.lb
index d3c5464882..4e73c3afbb 100644
--- a/targets/amd/rumba/Config.nofallback.lb
+++ b/targets/amd/rumba/Config.nofallback.lb
@@ -5,8 +5,6 @@ target rumba
mainboard amd/rumba
option CONFIG_ROM_SIZE=128*1024
-option CONFIG_FALLBACK_SIZE=CONFIG_ROM_SIZE
-#option CONFIG_FALLBACK_SIZE=65535
#romimage "normal"
# option CONFIG_USE_FALLBACK_IMAGE=0
diff --git a/targets/amd/serengeti_cheetah/Config-abuild.lb b/targets/amd/serengeti_cheetah/Config-abuild.lb
index 683a874ad4..22e527e6d4 100644
--- a/targets/amd/serengeti_cheetah/Config-abuild.lb
+++ b/targets/amd/serengeti_cheetah/Config-abuild.lb
@@ -13,7 +13,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
@@ -21,7 +20,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
diff --git a/targets/amd/serengeti_cheetah/Config-lab.lb b/targets/amd/serengeti_cheetah/Config-lab.lb
index bcb443bcac..6577672c43 100644
--- a/targets/amd/serengeti_cheetah/Config-lab.lb
+++ b/targets/amd/serengeti_cheetah/Config-lab.lb
@@ -13,7 +13,6 @@ option CONFIG_FAILOVER_SIZE=0
romimage "fallback"
option CONFIG_PRECOMPRESSED_PAYLOAD=1
option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
- option CONFIG_FALLBACK_SIZE=CONFIG_ROM_SIZE
option CONFIG_USE_FALLBACK_IMAGE=1
option CONFIG_ROM_IMAGE_SIZE=0x1a000
option CONFIG_XIP_ROM_SIZE=0x40000
diff --git a/targets/amd/serengeti_cheetah_fam10/Config-lab.lb b/targets/amd/serengeti_cheetah_fam10/Config-lab.lb
index 7cc594cd7d..88c7f54d36 100644
--- a/targets/amd/serengeti_cheetah_fam10/Config-lab.lb
+++ b/targets/amd/serengeti_cheetah_fam10/Config-lab.lb
@@ -31,7 +31,6 @@ mainboard amd/serengeti_cheetah_fam10
# 1024KB ROM
option CONFIG_ROM_SIZE=1024*1024
-option CONFIG_FALLBACK_SIZE=CONFIG_ROM_SIZE-CONFIG_FAILOVER_SIZE
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
diff --git a/targets/arima/hdama/Config.kernelimage.lb b/targets/arima/hdama/Config.kernelimage.lb
index bf5c59850c..029b32884e 100644
--- a/targets/arima/hdama/Config.kernelimage.lb
+++ b/targets/arima/hdama/Config.kernelimage.lb
@@ -13,7 +13,6 @@ uses CONFIG_ROM_PAYLOAD
uses CONFIG_ROM_PAYLOAD_START
uses CONFIG_UDELAY_TSC
uses CPU_FIXUP
-uses CONFIG_FALLBACK_SIZE
uses CONFIG_HAVE_FALLBACK_BOOT
uses CONFIG_HAVE_MP_TABLE
uses CONFIG_HAVE_PIRQ_TABLE
@@ -71,12 +70,6 @@ option CONFIG_HAVE_OPTION_TABLE=1
option CONFIG_ROM_PAYLOAD=1
option CONFIG_HAVE_FALLBACK_BOOT=1
-###
-### Compute the location and size of where this firmware image
-### (coreboot plus bootloader) will live in the boot rom chip.
-###
-option CONFIG_FALLBACK_SIZE=CONFIG_ROM_SIZE
-
## Coreboot C code runs at this location in RAM
option CONFIG_RAMBASE=0x00004000
diff --git a/targets/artecgroup/dbe61/Config.lb b/targets/artecgroup/dbe61/Config.lb
index 0cd1ee5710..eaa979c6f5 100644
--- a/targets/artecgroup/dbe61/Config.lb
+++ b/targets/artecgroup/dbe61/Config.lb
@@ -21,8 +21,6 @@ option CONFIG_ROM_SIZE = 1024*512 - 36*1024
## not including any payload.
option CONFIG_ROM_IMAGE_SIZE=64*1024
-option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
-
option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
romimage "fallback"
diff --git a/targets/asi/mb_5blmp/Config.lb b/targets/asi/mb_5blmp/Config.lb
index 3dfe28a6f7..f57c13d47c 100644
--- a/targets/asi/mb_5blmp/Config.lb
+++ b/targets/asi/mb_5blmp/Config.lb
@@ -23,7 +23,6 @@ mainboard asi/mb_5blmp
option CONFIG_ROM_SIZE = (256 * 1024)
# option CONFIG_ROM_SIZE = (256 * 1024) - (32 * 1024)
-# option CONFIG_FALLBACK_SIZE = (256 * 1024) - (32 * 1024)
romimage "normal"
option CONFIG_USE_FALLBACK_IMAGE = 0
diff --git a/targets/asus/a8n_e/Config-abuild.lb b/targets/asus/a8n_e/Config-abuild.lb
index 683a874ad4..22e527e6d4 100644
--- a/targets/asus/a8n_e/Config-abuild.lb
+++ b/targets/asus/a8n_e/Config-abuild.lb
@@ -13,7 +13,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
@@ -21,7 +20,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
diff --git a/targets/asus/m2v-mx_se/Config-abuild.lb b/targets/asus/m2v-mx_se/Config-abuild.lb
index 08115a7047..07c6ebd34f 100644
--- a/targets/asus/m2v-mx_se/Config-abuild.lb
+++ b/targets/asus/m2v-mx_se/Config-abuild.lb
@@ -35,15 +35,6 @@ option CONFIG_ROM_SIZE = 512 * 1024
## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
## not including any payload.
-# Please note that 128KB is cached for (XIP) too
-
-option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
-
-## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image
-## (including payload) will use.
-
-option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
-
romimage "fallback"
option CONFIG_USE_FALLBACK_IMAGE=1
payload __PAYLOAD__
diff --git a/targets/asus/m2v-mx_se/Config.lb b/targets/asus/m2v-mx_se/Config.lb
index b091732bdb..4183543be7 100644
--- a/targets/asus/m2v-mx_se/Config.lb
+++ b/targets/asus/m2v-mx_se/Config.lb
@@ -41,11 +41,6 @@ option CONFIG_ROM_SIZE = 512 * 1024
option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
-## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image
-## (including payload) will use.
-
-option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
-
romimage "fallback"
option CONFIG_USE_FALLBACK_IMAGE=1
payload ../payload.elf
diff --git a/targets/digitallogic/msm586seg/Config-abuild.lb b/targets/digitallogic/msm586seg/Config-abuild.lb
index a6b1ddcad5..7193da1677 100644
--- a/targets/digitallogic/msm586seg/Config-abuild.lb
+++ b/targets/digitallogic/msm586seg/Config-abuild.lb
@@ -9,9 +9,7 @@ __COMPRESSION__
__LOGLEVEL__
romimage "fallback"
- option CONFIG_FALLBACK_SIZE = 256 * 1024
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE= 128 * 1024
option COREBOOT_EXTRA_VERSION=".0Fallback"
payload __PAYLOAD__
end
diff --git a/targets/gigabyte/ga_2761gxdk/Config-abuild.lb b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
index fd3fa4822b..d946796d19 100644
--- a/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
+++ b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
@@ -34,8 +34,6 @@ option CONFIG_ROM_SIZE = 512*1024
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x28000
- option CONFIG_XIP_ROM_SIZE=0x40000
option COREBOOT_EXTRA_VERSION=".0-Normal"
payload __PAYLOAD__
end
@@ -43,8 +41,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x20000
- option CONFIG_XIP_ROM_SIZE=0x40000
option COREBOOT_EXTRA_VERSION=".0-Fallback"
payload __PAYLOAD__
end
diff --git a/targets/gigabyte/m57sli/Config-abuild.lb b/targets/gigabyte/m57sli/Config-abuild.lb
index 683a874ad4..22e527e6d4 100644
--- a/targets/gigabyte/m57sli/Config-abuild.lb
+++ b/targets/gigabyte/m57sli/Config-abuild.lb
@@ -13,7 +13,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
@@ -21,7 +20,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
diff --git a/targets/iei/juki-511p/Config-abuild.lb b/targets/iei/juki-511p/Config-abuild.lb
index 7ad4c05735..0f6d5da2be 100644
--- a/targets/iei/juki-511p/Config-abuild.lb
+++ b/targets/iei/juki-511p/Config-abuild.lb
@@ -9,22 +9,15 @@ __COMPRESSION__
__LOGLEVEL__
option CONFIG_ROM_SIZE=256*1024
-###
-### Compute the location and size of where this firmware image
-### (coreboot plus bootloader) will live in the boot rom chip.
-###
-option CONFIG_FALLBACK_SIZE=128*1024
romimage "normal"
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=64*1024
option COREBOOT_EXTRA_VERSION=".0-Normal"
payload __PAYLOAD__
end
romimage "fallback"
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=64*1024
option COREBOOT_EXTRA_VERSION=".0-Fallback"
payload __PAYLOAD__
end
diff --git a/targets/iwill/dk8_htx/Config-abuild.lb b/targets/iwill/dk8_htx/Config-abuild.lb
index 683a874ad4..22e527e6d4 100644
--- a/targets/iwill/dk8_htx/Config-abuild.lb
+++ b/targets/iwill/dk8_htx/Config-abuild.lb
@@ -13,7 +13,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
@@ -21,7 +20,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
diff --git a/targets/msi/ms7135/Config-abuild.lb b/targets/msi/ms7135/Config-abuild.lb
index 683a874ad4..22e527e6d4 100644
--- a/targets/msi/ms7135/Config-abuild.lb
+++ b/targets/msi/ms7135/Config-abuild.lb
@@ -13,7 +13,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
@@ -21,7 +20,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
diff --git a/targets/msi/ms7260/Config-abuild.lb b/targets/msi/ms7260/Config-abuild.lb
index 988e33b351..ab9568fe7f 100644
--- a/targets/msi/ms7260/Config-abuild.lb
+++ b/targets/msi/ms7260/Config-abuild.lb
@@ -31,8 +31,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE = 0
option CONFIG_USE_FALLBACK_IMAGE = 0
- option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
- option CONFIG_XIP_ROM_SIZE = 256 * 1024
option COREBOOT_EXTRA_VERSION = ".0Normal"
payload __PAYLOAD__
end
@@ -40,8 +38,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE = 0
option CONFIG_USE_FALLBACK_IMAGE = 1
- option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
- option CONFIG_XIP_ROM_SIZE = 256 * 1024
option COREBOOT_EXTRA_VERSION = ".0Fallback"
payload __PAYLOAD__
end
diff --git a/targets/nvidia/l1_2pvv/Config-abuild.lb b/targets/nvidia/l1_2pvv/Config-abuild.lb
index 683a874ad4..22e527e6d4 100644
--- a/targets/nvidia/l1_2pvv/Config-abuild.lb
+++ b/targets/nvidia/l1_2pvv/Config-abuild.lb
@@ -13,7 +13,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
@@ -21,7 +20,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
diff --git a/targets/supermicro/h8dme/Config-abuild.lb b/targets/supermicro/h8dme/Config-abuild.lb
index 11a2ae53e5..76ff76613c 100644
--- a/targets/supermicro/h8dme/Config-abuild.lb
+++ b/targets/supermicro/h8dme/Config-abuild.lb
@@ -13,7 +13,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
@@ -21,7 +20,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
diff --git a/targets/technologic/ts5300/Config-abuild.lb b/targets/technologic/ts5300/Config-abuild.lb
index 82566654e7..5ae820b115 100644
--- a/targets/technologic/ts5300/Config-abuild.lb
+++ b/targets/technologic/ts5300/Config-abuild.lb
@@ -9,9 +9,7 @@ __COMPRESSION__
__LOGLEVEL__
romimage "fallback"
- option CONFIG_FALLBACK_SIZE = 256 * 1024
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=128 * 1024 # 0x10000
option COREBOOT_EXTRA_VERSION=".0-Fallback"
payload __PAYLOAD__
end
diff --git a/targets/tyan/s2895/Config-abuild.lb b/targets/tyan/s2895/Config-abuild.lb
index 683a874ad4..22e527e6d4 100644
--- a/targets/tyan/s2895/Config-abuild.lb
+++ b/targets/tyan/s2895/Config-abuild.lb
@@ -13,7 +13,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
@@ -21,7 +20,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
diff --git a/targets/tyan/s2912/Config-abuild.lb b/targets/tyan/s2912/Config-abuild.lb
index 683a874ad4..22e527e6d4 100644
--- a/targets/tyan/s2912/Config-abuild.lb
+++ b/targets/tyan/s2912/Config-abuild.lb
@@ -13,7 +13,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
@@ -21,7 +20,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
diff --git a/targets/tyan/s2912_fam10/Config-abuild.lb b/targets/tyan/s2912_fam10/Config-abuild.lb
index 36284fcb0c..2ec827d3d8 100644
--- a/targets/tyan/s2912_fam10/Config-abuild.lb
+++ b/targets/tyan/s2912_fam10/Config-abuild.lb
@@ -31,8 +31,6 @@ __LOGLEVEL__
romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
- option CONFIG_ROM_IMAGE_SIZE=0x34000
- option CONFIG_XIP_ROM_SIZE=0x40000
option COREBOOT_EXTRA_VERSION=".0-Normal"
payload __PAYLOAD__
end
@@ -40,8 +38,6 @@ end
romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
- option CONFIG_ROM_IMAGE_SIZE=0x34000
- option CONFIG_XIP_ROM_SIZE=0x40000
option COREBOOT_EXTRA_VERSION=".0-Fallback"
payload __PAYLOAD__
end