summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@openbios.org>2006-09-06 16:42:51 +0000
committerStefan Reinauer <stepan@openbios.org>2006-09-06 16:42:51 +0000
commit42fb3164ed84b6c768c4c1ce3cf8b298cb9a569f (patch)
tree351d4481a35f83735774fca4a33d6cf49fd1e7dd
parentca98f32dd558a9e03c09e7635ef951a80f90e48a (diff)
downloadcoreboot-42fb3164ed84b6c768c4c1ce3cf8b298cb9a569f.tar.xz
Uwe Hermann:
Here's a patch which makes all "option ROM_SIZE" lines use x*y format which is a lot easier to read and modify, without having to use your brain or a calculator ;-) Tested with abuild, no errors. git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2398 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--documentation/RFC/config.tex2
-rw-r--r--src/drivers/pci/onboard/onboard.c2
-rw-r--r--targets/Iwill/dk8htx/Config.lb4
-rw-r--r--targets/Iwill/dk8s2/Config.lb6
-rw-r--r--targets/advantech/som_gx533c/Config.lb2
-rw-r--r--targets/agami/aruma/Config.lb3
-rw-r--r--targets/amd/rumba/Config.lb2
-rw-r--r--targets/amd/rumba/Config.nofallback.lb2
-rw-r--r--targets/amd/serengeti_leopard/Config.lb6
-rw-r--r--targets/amd/solo/Config-8MBit.lb2
-rw-r--r--targets/arima/hdama/Config.kernelimage.lb2
-rw-r--r--targets/arima/hdama/Config.lb2
-rw-r--r--targets/bitworks/ims/Config.lb2
-rw-r--r--targets/broadcom/blast/Config.lb6
-rw-r--r--targets/dell/s1850/Config.lb2
-rw-r--r--targets/eaglelion/5bcm/Config.lb2
-rw-r--r--targets/embeddedplanet/ep405pc/Config.lb2
-rw-r--r--targets/emulation/qemu-i386/Config.lb2
-rw-r--r--targets/intel/xe7501devkit/Config.lb74
-rw-r--r--targets/lippert/frontrunner/Config.lb2
-rw-r--r--targets/motorola/sandpoint/Config.lb.ide_stream2
-rw-r--r--targets/newisys/khepri/Config.lb2
-rw-r--r--targets/olpc/rev_a/Config.kernel.lb2
-rw-r--r--targets/olpc/rev_a/Config.lb2
-rw-r--r--targets/sunw/ultra40/Config.lb8
-rw-r--r--targets/totalimpact/briq/Config.lb2
-rw-r--r--targets/tyan/s2735/Config.lb6
-rw-r--r--targets/tyan/s2850/Config.lb6
-rw-r--r--targets/tyan/s2875/Config.lb6
-rw-r--r--targets/tyan/s2880/Config.lb6
-rw-r--r--targets/tyan/s2881/Config.lb6
-rw-r--r--targets/tyan/s2882/Config.lb6
-rw-r--r--targets/tyan/s2885/Config.lb6
-rw-r--r--targets/tyan/s2891/Config.lb8
-rw-r--r--targets/tyan/s2891/Config.lb.com26
-rw-r--r--targets/tyan/s2892/Config.lb8
-rw-r--r--targets/tyan/s2895/Config.lb8
-rw-r--r--targets/tyan/s4880/Config.lb6
-rw-r--r--targets/tyan/s4882/Config.lb6
-rw-r--r--targets/via/epia-m/Config-abuild.lb2
-rw-r--r--targets/via/epia-m/Config.512kflash.lb2
-rw-r--r--targets/via/epia/Config.512kflash.lb2
-rw-r--r--targets/via/epia/Config.512kflash.linuxtiny.lb2
43 files changed, 118 insertions, 119 deletions
diff --git a/documentation/RFC/config.tex b/documentation/RFC/config.tex
index d73f96db83..fe58b5046b 100644
--- a/documentation/RFC/config.tex
+++ b/documentation/RFC/config.tex
@@ -173,7 +173,7 @@ A sample file:
target x
# over-ride the default rom size in the mainboard file
-option ROM_SIZE=0x100000
+option ROM_SIZE=1024*1024
mainboard amd/solo
end
diff --git a/src/drivers/pci/onboard/onboard.c b/src/drivers/pci/onboard/onboard.c
index 784fde27e1..6da5a0782e 100644
--- a/src/drivers/pci/onboard/onboard.c
+++ b/src/drivers/pci/onboard/onboard.c
@@ -20,7 +20,7 @@
in your MB mainboard Config.lb
2. add
# 48K for SCSI FW or ATI ROM
- option ROM_SIZE = 475136
+ option ROM_SIZE = 512*1024-48*1024
in your MB targets Config.lb, afer romimage "normal"
3. create you vgabios.bin under normal bios and put that in dir that targets Config residues.
# dd if=/dev/mem of=atix.rom skip=1536 count=96
diff --git a/targets/Iwill/dk8htx/Config.lb b/targets/Iwill/dk8htx/Config.lb
index de29b5671c..2da6d30781 100644
--- a/targets/Iwill/dk8htx/Config.lb
+++ b/targets/Iwill/dk8htx/Config.lb
@@ -125,9 +125,9 @@ option CONFIG_ROM_STREAM = 1
#
romimage "normal"
# 48K for SCSI FW
-# option ROM_SIZE = 475136
+# option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
option USE_FALLBACK_IMAGE=0
option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE)
diff --git a/targets/Iwill/dk8s2/Config.lb b/targets/Iwill/dk8s2/Config.lb
index 1cdd0d9839..64419756e4 100644
--- a/targets/Iwill/dk8s2/Config.lb
+++ b/targets/Iwill/dk8s2/Config.lb
@@ -10,7 +10,7 @@ option HAVE_HARD_RESET=1
option HAVE_OPTION_TABLE=1
option HAVE_MP_TABLE=1
-option ROM_SIZE=1048576
+option ROM_SIZE=1024*1024
option HAVE_FALLBACK_BOOT=1
@@ -125,9 +125,9 @@ option CONFIG_ROM_STREAM = 1
#
romimage "normal"
# 48K for SCSI FW
-# option ROM_SIZE = 475136
+# option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
option USE_FALLBACK_IMAGE=0
option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE)
diff --git a/targets/advantech/som_gx533c/Config.lb b/targets/advantech/som_gx533c/Config.lb
index d6809f73ce..da0ce1f634 100644
--- a/targets/advantech/som_gx533c/Config.lb
+++ b/targets/advantech/som_gx533c/Config.lb
@@ -5,7 +5,7 @@
target som_gx533c
mainboard advantech/som_gx533c
-option ROM_SIZE=1024*512
+option ROM_SIZE=512*1024
option MAXIMUM_CONSOLE_LOGLEVEL=9
option DEFAULT_CONSOLE_LOGLEVEL=9
diff --git a/targets/agami/aruma/Config.lb b/targets/agami/aruma/Config.lb
index 184e9edd6c..de64332591 100644
--- a/targets/agami/aruma/Config.lb
+++ b/targets/agami/aruma/Config.lb
@@ -15,8 +15,7 @@ option CONFIG_MAX_CPUS=4
option HAVE_ACPI_TABLES=1
romimage "normal"
- # 512-36 k
- option ROM_SIZE = 487424
+ option ROM_SIZE = 512*1024-36*1024
option USE_FALLBACK_IMAGE=0
option ROM_IMAGE_SIZE=0x20000
option XIP_ROM_SIZE=0x20000
diff --git a/targets/amd/rumba/Config.lb b/targets/amd/rumba/Config.lb
index 7a5644ae1d..e2083cc469 100644
--- a/targets/amd/rumba/Config.lb
+++ b/targets/amd/rumba/Config.lb
@@ -4,7 +4,7 @@
target rumba
mainboard amd/rumba
-option ROM_SIZE=1024*256
+option ROM_SIZE=256*1024
romimage "normal"
option USE_FALLBACK_IMAGE=0
diff --git a/targets/amd/rumba/Config.nofallback.lb b/targets/amd/rumba/Config.nofallback.lb
index a815b2b754..2d32a3650e 100644
--- a/targets/amd/rumba/Config.nofallback.lb
+++ b/targets/amd/rumba/Config.nofallback.lb
@@ -4,7 +4,7 @@
target rumba
mainboard amd/rumba
-option ROM_SIZE=1024*128
+option ROM_SIZE=128*1024
option FALLBACK_SIZE=ROM_SIZE
#option FALLBACK_SIZE=65535
diff --git a/targets/amd/serengeti_leopard/Config.lb b/targets/amd/serengeti_leopard/Config.lb
index a0fa1e12ef..75304d16d7 100644
--- a/targets/amd/serengeti_leopard/Config.lb
+++ b/targets/amd/serengeti_leopard/Config.lb
@@ -8,11 +8,11 @@ mainboard amd/serengeti_leopard
# serengeti_leopard
romimage "normal"
# 48K for SCSI FW
-# option ROM_SIZE = 475136
+# option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x13800
# option ROM_IMAGE_SIZE=0x17800
diff --git a/targets/amd/solo/Config-8MBit.lb b/targets/amd/solo/Config-8MBit.lb
index ad3ef9f697..b75cb9ba23 100644
--- a/targets/amd/solo/Config-8MBit.lb
+++ b/targets/amd/solo/Config-8MBit.lb
@@ -5,7 +5,7 @@
target solo-8mbit
mainboard amd/solo
-option ROM_SIZE=0x100000
+option ROM_SIZE=1024*1024
romimage "only"
option USE_FALLBACK_IMAGE=1
diff --git a/targets/arima/hdama/Config.kernelimage.lb b/targets/arima/hdama/Config.kernelimage.lb
index 5c45251349..a80eb2b9a5 100644
--- a/targets/arima/hdama/Config.kernelimage.lb
+++ b/targets/arima/hdama/Config.kernelimage.lb
@@ -64,7 +64,7 @@ option INTEL_PPRO_MTRR=1
option k7=1
option k8=1
-option ROM_SIZE=0x100000
+option ROM_SIZE=1024*1024
option HAVE_OPTION_TABLE=1
diff --git a/targets/arima/hdama/Config.lb b/targets/arima/hdama/Config.lb
index 2c13196dca..6c5cabcad1 100644
--- a/targets/arima/hdama/Config.lb
+++ b/targets/arima/hdama/Config.lb
@@ -6,7 +6,7 @@
target hdama
mainboard arima/hdama
-option ROM_SIZE=487424
+option ROM_SIZE=512*1024-36*1024
# Arima hdama
romimage "normal"
diff --git a/targets/bitworks/ims/Config.lb b/targets/bitworks/ims/Config.lb
index d81c110a98..973cf74de8 100644
--- a/targets/bitworks/ims/Config.lb
+++ b/targets/bitworks/ims/Config.lb
@@ -4,7 +4,7 @@
target ims
mainboard bitworks/ims
-option ROM_SIZE=524288
+option ROM_SIZE=512*1024
romimage "normal"
option USE_FALLBACK_IMAGE=0
diff --git a/targets/broadcom/blast/Config.lb b/targets/broadcom/blast/Config.lb
index 5aa341dabe..061a1cced2 100644
--- a/targets/broadcom/blast/Config.lb
+++ b/targets/broadcom/blast/Config.lb
@@ -7,11 +7,11 @@ mainboard broadcom/blast
romimage "normal"
# 48K for ATI rom
- option ROM_SIZE = 475136
+ option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x13800
# option ROM_IMAGE_SIZE=0x17800
diff --git a/targets/dell/s1850/Config.lb b/targets/dell/s1850/Config.lb
index 0330eef6e2..2302608501 100644
--- a/targets/dell/s1850/Config.lb
+++ b/targets/dell/s1850/Config.lb
@@ -1,7 +1,7 @@
target s1850
mainboard dell/s1850
-option ROM_SIZE=0x100000
+option ROM_SIZE=1024*1024
option MAXIMUM_CONSOLE_LOGLEVEL=10
option DEFAULT_CONSOLE_LOGLEVEL=10
diff --git a/targets/eaglelion/5bcm/Config.lb b/targets/eaglelion/5bcm/Config.lb
index 5f8f7fc4e1..9071ad33d4 100644
--- a/targets/eaglelion/5bcm/Config.lb
+++ b/targets/eaglelion/5bcm/Config.lb
@@ -4,7 +4,7 @@
target 5bcm
mainboard eaglelion/5bcm
-option ROM_SIZE=1024*256
+option ROM_SIZE=256*1024
romimage "normal"
option USE_FALLBACK_IMAGE=0
diff --git a/targets/embeddedplanet/ep405pc/Config.lb b/targets/embeddedplanet/ep405pc/Config.lb
index 8862a8566b..f434bfaf95 100644
--- a/targets/embeddedplanet/ep405pc/Config.lb
+++ b/targets/embeddedplanet/ep405pc/Config.lb
@@ -38,7 +38,7 @@ romimage "normal"
option CONFIG_FS_FAT=1
option AUTOBOOT_CMDLINE="hda1:/vmlinuz"
- option ROM_SIZE=1048576
+ option ROM_SIZE=1024*1024
## Board has fixed size RAM
option EMBEDDED_RAM_SIZE=64*1024*1024
diff --git a/targets/emulation/qemu-i386/Config.lb b/targets/emulation/qemu-i386/Config.lb
index 9c49ff1408..529eb9dfb2 100644
--- a/targets/emulation/qemu-i386/Config.lb
+++ b/targets/emulation/qemu-i386/Config.lb
@@ -3,7 +3,7 @@
target qemu-i386
mainboard emulation/qemu-i386
-option ROM_SIZE=0x40000
+option ROM_SIZE=256*1024
option CC="gcc -m32"
diff --git a/targets/intel/xe7501devkit/Config.lb b/targets/intel/xe7501devkit/Config.lb
index 1322afb122..9660d0ebff 100644
--- a/targets/intel/xe7501devkit/Config.lb
+++ b/targets/intel/xe7501devkit/Config.lb
@@ -1,37 +1,37 @@
-target xe7501devkit
-mainboard intel/xe7501devkit
-
-## ROM_SIZE is the total number of bytes allocated for LinuxBIOS use
-## (normal AND fallback images and payloads).
-option ROM_SIZE = 0x30000
-
-## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a LinuxBIOS image,
-## not including any payload.
-option ROM_IMAGE_SIZE = 0x1B000
-
-## FALLBACK_SIZE is the amount of the ROM the complete fallback image
-## (including payload) will use
-option FALLBACK_SIZE = 0
-
-
-
-romimage "normal"
- option USE_FALLBACK_IMAGE=0
-# option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
-# payload ../../../../../../../memtest86/memtest
-# payload ../../../../../../../etherboot/src/bin/e1000.zelf
- payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf
-# payload ../../../../../../../QNX/BSP/images/qnxbasesmp.elf
-end
-
-#NOTE: CMOS currently not supported due to conflicts with factory BIOS
-# Thus no support for fallback boot.
-#romimage "fallback"
-# option USE_FALLBACK_IMAGE=1
-# option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
-# payload ../../../../../../../memtest86/memtest
-# payload ../../../../../../../etherboot/src/bin/e1000.zelf
-# payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf
-#end
-
-buildrom ./linuxbios.rom ROM_SIZE "normal"
+target xe7501devkit
+mainboard intel/xe7501devkit
+
+## ROM_SIZE is the total number of bytes allocated for LinuxBIOS use
+## (normal AND fallback images and payloads).
+option ROM_SIZE = 192*1024
+
+## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a LinuxBIOS image,
+## not including any payload.
+option ROM_IMAGE_SIZE = 0x1B000
+
+## FALLBACK_SIZE is the amount of the ROM the complete fallback image
+## (including payload) will use
+option FALLBACK_SIZE = 0
+
+
+
+romimage "normal"
+ option USE_FALLBACK_IMAGE=0
+# option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+# payload ../../../../../../../memtest86/memtest
+# payload ../../../../../../../etherboot/src/bin/e1000.zelf
+ payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf
+# payload ../../../../../../../QNX/BSP/images/qnxbasesmp.elf
+end
+
+#NOTE: CMOS currently not supported due to conflicts with factory BIOS
+# Thus no support for fallback boot.
+#romimage "fallback"
+# option USE_FALLBACK_IMAGE=1
+# option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+# payload ../../../../../../../memtest86/memtest
+# payload ../../../../../../../etherboot/src/bin/e1000.zelf
+# payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf
+#end
+
+buildrom ./linuxbios.rom ROM_SIZE "normal"
diff --git a/targets/lippert/frontrunner/Config.lb b/targets/lippert/frontrunner/Config.lb
index 5702147c9b..6b29b5aa0f 100644
--- a/targets/lippert/frontrunner/Config.lb
+++ b/targets/lippert/frontrunner/Config.lb
@@ -4,7 +4,7 @@
target frontrunner
mainboard lippert/frontrunner
-option ROM_SIZE=1024*256
+option ROM_SIZE=256*1024
romimage "normal"
option USE_FALLBACK_IMAGE=0
diff --git a/targets/motorola/sandpoint/Config.lb.ide_stream b/targets/motorola/sandpoint/Config.lb.ide_stream
index 144713d2e0..c9b77c36db 100644
--- a/targets/motorola/sandpoint/Config.lb.ide_stream
+++ b/targets/motorola/sandpoint/Config.lb.ide_stream
@@ -57,7 +57,7 @@ option IDE_SWAB=1
option IDE_OFFSET=0
# ROM is 1Mb
-option ROM_SIZE=1048576
+option ROM_SIZE=1024*1024
# Set stack and heap sizes (stage 2)
option STACK_SIZE=0x10000
diff --git a/targets/newisys/khepri/Config.lb b/targets/newisys/khepri/Config.lb
index d56fb74d4e..7755066eff 100644
--- a/targets/newisys/khepri/Config.lb
+++ b/targets/newisys/khepri/Config.lb
@@ -17,7 +17,7 @@ option DEFAULT_CONSOLE_LOGLEVEL=8
option CONFIG_CONSOLE_SERIAL8250=1
# Size of the image. Khepri comes with 512k per default.
-option ROM_SIZE=524288
+option ROM_SIZE=512*1024
option HAVE_OPTION_TABLE=1
option CONFIG_ROM_STREAM=1
diff --git a/targets/olpc/rev_a/Config.kernel.lb b/targets/olpc/rev_a/Config.kernel.lb
index f58d63bcdf..0509c7f39a 100644
--- a/targets/olpc/rev_a/Config.kernel.lb
+++ b/targets/olpc/rev_a/Config.kernel.lb
@@ -3,7 +3,7 @@
target rev_a
mainboard olpc/rev_a
-option ROM_SIZE=1024*128*7
+option ROM_SIZE=7*128*1024
option FALLBACK_SIZE=ROM_SIZE
#romimage "normal"
diff --git a/targets/olpc/rev_a/Config.lb b/targets/olpc/rev_a/Config.lb
index de7f94193f..fa6441d86f 100644
--- a/targets/olpc/rev_a/Config.lb
+++ b/targets/olpc/rev_a/Config.lb
@@ -5,7 +5,7 @@ mainboard olpc/rev_a
# leave 64k for vsa
option CONFIG_COMPRESSED_ROM_STREAM=0
-option ROM_SIZE=1024*512-64*1024
+option ROM_SIZE=512*1024-64*1024
option FALLBACK_SIZE=ROM_SIZE
option DEFAULT_CONSOLE_LOGLEVEL = 11
diff --git a/targets/sunw/ultra40/Config.lb b/targets/sunw/ultra40/Config.lb
index 5374168b94..8edcff4cf1 100644
--- a/targets/sunw/ultra40/Config.lb
+++ b/targets/sunw/ultra40/Config.lb
@@ -9,13 +9,13 @@ option ROM_SIZE=512*1024
# sunw ultra40
romimage "normal"
# 48K for SCSI FW
-# option ROM_SIZE = 475136
+# option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
# 64K for NIC option 48K for Raid option rom
-# option ROM_SIZE = 409600
+# option ROM_SIZE = 512*1024-64*1024-48*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13800
diff --git a/targets/totalimpact/briq/Config.lb b/targets/totalimpact/briq/Config.lb
index 5933e1a890..0e16ec3787 100644
--- a/targets/totalimpact/briq/Config.lb
+++ b/targets/totalimpact/briq/Config.lb
@@ -25,7 +25,7 @@ option IDE_SWAB=1
option IDE_OFFSET=0
# ROM is 1Mb
-option ROM_SIZE=1048576
+option ROM_SIZE=1024*1024
# Set stack and heap sizes (stage 2)
option STACK_SIZE=0x10000
diff --git a/targets/tyan/s2735/Config.lb b/targets/tyan/s2735/Config.lb
index 8dab1aeb99..ed1b151261 100644
--- a/targets/tyan/s2735/Config.lb
+++ b/targets/tyan/s2735/Config.lb
@@ -8,11 +8,11 @@ mainboard tyan/s2735
# Tyan s2735
romimage "normal"
# 48K for SCSI FW
-# option ROM_SIZE = 475136
+# option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
option ROM_IMAGE_SIZE=0x11800
option XIP_ROM_SIZE=0x20000
diff --git a/targets/tyan/s2850/Config.lb b/targets/tyan/s2850/Config.lb
index 24bb2bd344..9cd107e4ac 100644
--- a/targets/tyan/s2850/Config.lb
+++ b/targets/tyan/s2850/Config.lb
@@ -8,11 +8,11 @@ mainboard tyan/s2850
# Tyan s2850
romimage "normal"
# 48K for SCSI FW or ATI ROM
- option ROM_SIZE = 475136
+ option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x16000
diff --git a/targets/tyan/s2875/Config.lb b/targets/tyan/s2875/Config.lb
index 56702d55b1..6647a82f53 100644
--- a/targets/tyan/s2875/Config.lb
+++ b/targets/tyan/s2875/Config.lb
@@ -8,11 +8,11 @@ mainboard tyan/s2875
# Tyan s2875
romimage "normal"
# 48K for SCSI FW or ATI ROM
- option ROM_SIZE = 475136
+ option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13800
diff --git a/targets/tyan/s2880/Config.lb b/targets/tyan/s2880/Config.lb
index bbbf3854f8..889e8e2836 100644
--- a/targets/tyan/s2880/Config.lb
+++ b/targets/tyan/s2880/Config.lb
@@ -8,11 +8,11 @@ mainboard tyan/s2880
# Tyan s2880
romimage "normal"
# 48K for SCSI FW or ATI ROM
- option ROM_SIZE = 475136
+ option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13800
diff --git a/targets/tyan/s2881/Config.lb b/targets/tyan/s2881/Config.lb
index 6946696e55..b02b9d88d8 100644
--- a/targets/tyan/s2881/Config.lb
+++ b/targets/tyan/s2881/Config.lb
@@ -8,11 +8,11 @@ mainboard tyan/s2881
# Tyan s2881
romimage "normal"
# 48K for SCSI FW or ATI ROM
- option ROM_SIZE = 475136
+ option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13000
diff --git a/targets/tyan/s2882/Config.lb b/targets/tyan/s2882/Config.lb
index 54d6ae13b7..a1321978b3 100644
--- a/targets/tyan/s2882/Config.lb
+++ b/targets/tyan/s2882/Config.lb
@@ -8,11 +8,11 @@ mainboard tyan/s2882
# Tyan s2882
romimage "normal"
# 48K for SCSI FW or ATI ROM
- option ROM_SIZE = 475136
+ option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x16000
diff --git a/targets/tyan/s2885/Config.lb b/targets/tyan/s2885/Config.lb
index 004b9d7bb0..254b961946 100644
--- a/targets/tyan/s2885/Config.lb
+++ b/targets/tyan/s2885/Config.lb
@@ -8,11 +8,11 @@ mainboard tyan/s2885
# Tyan s2895
romimage "normal"
# 48K for SCSI FW
-# option ROM_SIZE = 475136
+# option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x13800
# option ROM_IMAGE_SIZE=0x17800
diff --git a/targets/tyan/s2891/Config.lb b/targets/tyan/s2891/Config.lb
index 8eee626369..c12db5e07e 100644
--- a/targets/tyan/s2891/Config.lb
+++ b/targets/tyan/s2891/Config.lb
@@ -8,13 +8,13 @@ mainboard tyan/s2891
# Tyan s2891
romimage "normal"
# 48K for ATI ROM in 1M
- option ROM_SIZE = 999424
+ option ROM_SIZE = 1024*1024-48*1024
# 48K for SCSI FW or ATI ROM
-# option ROM_SIZE = 475136
+# option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13000
diff --git a/targets/tyan/s2891/Config.lb.com2 b/targets/tyan/s2891/Config.lb.com2
index 4232fa8a29..aabdf5938a 100644
--- a/targets/tyan/s2891/Config.lb.com2
+++ b/targets/tyan/s2891/Config.lb.com2
@@ -8,11 +8,11 @@ mainboard tyan/s2891
# Tyan s2891
romimage "normal"
# 48K for SCSI FW or ATI ROM
- option ROM_SIZE = 475136
+ option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13000
diff --git a/targets/tyan/s2892/Config.lb b/targets/tyan/s2892/Config.lb
index 3afb2732f5..3b4145873c 100644
--- a/targets/tyan/s2892/Config.lb
+++ b/targets/tyan/s2892/Config.lb
@@ -8,13 +8,13 @@ mainboard tyan/s2892
# Tyan s2892
romimage "normal"
# 48K for ATI ROM in 1M
- option ROM_SIZE = 999424
+ option ROM_SIZE = 1024*1024-48*1024
# 48K for SCSI FW or ATI ROM
-# option ROM_SIZE = 475136
+# option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13800
diff --git a/targets/tyan/s2895/Config.lb b/targets/tyan/s2895/Config.lb
index 54c5a6cad6..c6ef62fb0a 100644
--- a/targets/tyan/s2895/Config.lb
+++ b/targets/tyan/s2895/Config.lb
@@ -8,13 +8,13 @@ mainboard tyan/s2895
# Tyan s2895
romimage "normal"
# 48K for SCSI FW
-# option ROM_SIZE = 475136
+# option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
# 64K for NIC option 48K for Raid option rom
-# option ROM_SIZE = 409600
+# option ROM_SIZE = 512*1024-64*1024-48*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13800
diff --git a/targets/tyan/s4880/Config.lb b/targets/tyan/s4880/Config.lb
index f0846bff9b..42a795cee8 100644
--- a/targets/tyan/s4880/Config.lb
+++ b/targets/tyan/s4880/Config.lb
@@ -8,11 +8,11 @@ mainboard tyan/s4880
# Tyan s4880
romimage "normal"
# 48K for SCSI FW or ATI ROM
- option ROM_SIZE = 475136
+ option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x19000
# option ROM_IMAGE_SIZE=0x19c00
diff --git a/targets/tyan/s4882/Config.lb b/targets/tyan/s4882/Config.lb
index ad5cc11e5d..e86d26ea7e 100644
--- a/targets/tyan/s4882/Config.lb
+++ b/targets/tyan/s4882/Config.lb
@@ -8,11 +8,11 @@ mainboard tyan/s4882
# Tyan s4882
romimage "normal"
# 48K for SCSI FW or ATI ROM
- option ROM_SIZE = 475136
+ option ROM_SIZE = 512*1024-48*1024
# 48K for SCSI FW and 48K for ATI ROM
-# option ROM_SIZE = 425984
+# option ROM_SIZE = 512*1024-48*1024-48*1024
# 64K for Etherboot
-# option ROM_SIZE = 458752
+# option ROM_SIZE = 512*1024-64*1024
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x19000
# option ROM_IMAGE_SIZE=0x19c00
diff --git a/targets/via/epia-m/Config-abuild.lb b/targets/via/epia-m/Config-abuild.lb
index dd48e6b56a..7c728ba7a1 100644
--- a/targets/via/epia-m/Config-abuild.lb
+++ b/targets/via/epia-m/Config-abuild.lb
@@ -7,7 +7,7 @@ option MAXIMUM_CONSOLE_LOGLEVEL=8
option DEFAULT_CONSOLE_LOGLEVEL=8
option CONFIG_CONSOLE_SERIAL8250=1
-option ROM_SIZE=524288
+option ROM_SIZE=512*1024
option HAVE_OPTION_TABLE=1
diff --git a/targets/via/epia-m/Config.512kflash.lb b/targets/via/epia-m/Config.512kflash.lb
index c440de983b..2c65687185 100644
--- a/targets/via/epia-m/Config.512kflash.lb
+++ b/targets/via/epia-m/Config.512kflash.lb
@@ -9,7 +9,7 @@ option MAXIMUM_CONSOLE_LOGLEVEL=8
option DEFAULT_CONSOLE_LOGLEVEL=8
option CONFIG_CONSOLE_SERIAL8250=1
-option ROM_SIZE=524288
+option ROM_SIZE=512*1024
option HAVE_OPTION_TABLE=1
diff --git a/targets/via/epia/Config.512kflash.lb b/targets/via/epia/Config.512kflash.lb
index e4980b92ce..3df3684024 100644
--- a/targets/via/epia/Config.512kflash.lb
+++ b/targets/via/epia/Config.512kflash.lb
@@ -4,7 +4,7 @@
target epia.512kflash
mainboard via/epia
-option ROM_SIZE=524288
+option ROM_SIZE=512*1024
#
# Via Epia
diff --git a/targets/via/epia/Config.512kflash.linuxtiny.lb b/targets/via/epia/Config.512kflash.linuxtiny.lb
index 8056fb3ed5..c034e66182 100644
--- a/targets/via/epia/Config.512kflash.linuxtiny.lb
+++ b/targets/via/epia/Config.512kflash.linuxtiny.lb
@@ -4,7 +4,7 @@
target epia.512kflash.linuxtiny
mainboard via/epia
-option ROM_SIZE=524288
+option ROM_SIZE=512*1024
option FALLBACK_SIZE=ROM_SIZE
option MAXIMUM_CONSOLE_LOGLEVEL=10
option DEFAULT_CONSOLE_LOGLEVEL=10