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

diff --git a/documentation/RFC/config.tex b/documentation/RFC/config.tex
index d73f96db836a1cf6855dc84ca72e519965af936d..fe58b5046b72b8d924bfb394ce5610a94076c027 100644 (file)
--- 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 784fde27e1339b9190c3031fa15bfe4922c18cf7..6da5a0782ea1ea520025cc1ae8a228e4567e477d 100644 (file)
--- 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 de29b5671c432c9121cdf5c84ed50d3f7b5a3e70..2da6d3078151150b57d6868dd193000c68529fd8 100644 (file)
--- 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 1cdd0d9839d8124359104cd59111e75035dad60f..64419756e4de55856988fec76b099db89ff979a9 100644 (file)
--- 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 d6809f73cee2372f4173df72035e8f461f7bd284..da0ce1f634a3236fd8d5c91a96e9ea96c9a15cb7 100644 (file)
--- 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 184e9edd6c8ce8a593edd0b68e9214758f14792c..de6433259110d1328eff8bd0e3d530ab320746de 100644 (file)
--- 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 7a5644ae1d7e9d245fc62fdc0447737d30433b4a..e2083cc469b9bd618e37858db51ae75c81873889 100644 (file)
--- 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 a815b2b7541531c14b81ffcd2703bafe64690d05..2d32a3650ef0371dfb3af0a0c55fd8e50930bce9 100644 (file)
--- 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 a0fa1e12ef2f006aedea3702b8b338aab7cf88fc..75304d16d7f66674c015dae3e22da69c7ae500d1 100644 (file)
--- 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 ad3ef9f697d399b6783b6f93a15d9b014da9b990..b75cb9ba234f68f879064593a5863a95ca89cd5a 100644 (file)
--- 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 5c45251349fbbe7437b4ee310b278f874eaf1eb1..a80eb2b9a58286851a5524c1daf6c202767ddcae 100644 (file)
--- 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 2c13196dca48564d6c5bcc94df6c02c205a3293e..6c5cabcad12f4a7caf9b2271632575f3868e6aa1 100644 (file)
--- 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 d81c110a980e1535d46235cfb11c63a8882046d0..973cf74de82459f3029dee203c9e00dc08ac0fe0 100644 (file)
--- 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 5aa341dabe22914a36ca3147b0cc6ae047807ba3..061a1cced2b42a903ef1cc841e5dadada6f5a355 100644 (file)
--- 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 0330eef6e2241cbbb9be899508e701fa9c481dad..2302608501adaa21a2b7407e1196347f80b17b0a 100644 (file)
--- 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 5f8f7fc4e1c9dd08806cbf0f35216ea78b0c477f..9071ad33d42b7950cafcfad4240bc694a2d6b3cd 100644 (file)
--- 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 8862a8566bbd55ed5baba265cc4dc7f7d99d22de..f434bfaf95b0e62bfdf953949f0f9d83e7c950b6 100644 (file)
--- 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 9c49ff1408e701abfee7b7ad3c22c258cd182dfd..529eb9dfb2ffaf9278147616812b0d00ebea9b83 100644 (file)
--- 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 1322afb122078a16a9caf6cc10ef8d7dfe416c4b..9660d0ebffecf54124f4720fc9e9f3a106cfbeea 100644 (file)
--- a/targets/intel/xe7501devkit/Config.lb
+++ b/targets/intel/xe7501devkit/Config.lb
@@ -1,37 +1,37 @@
-target xe7501devkit\r
-mainboard intel/xe7501devkit\r
-\r
-## ROM_SIZE is the total number of bytes allocated for LinuxBIOS use\r
-## (normal AND fallback images and payloads).\r
-option ROM_SIZE = 0x30000\r
-\r
-## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a LinuxBIOS image,\r
-## not including any payload.\r
-option ROM_IMAGE_SIZE = 0x1B000\r
-\r
-## FALLBACK_SIZE is the amount of the ROM the complete fallback image \r
-## (including payload) will use\r
-option FALLBACK_SIZE = 0\r
-\r
-\r
-\r
-romimage "normal"\r
-       option USE_FALLBACK_IMAGE=0\r
-#      option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"\r
-#       payload ../../../../../../../memtest86/memtest\r
-#       payload ../../../../../../../etherboot/src/bin/e1000.zelf\r
-        payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf\r
-#       payload ../../../../../../../QNX/BSP/images/qnxbasesmp.elf\r
-end\r
-\r
-#NOTE: CMOS currently not supported due to conflicts with factory BIOS\r
-#      Thus no support for fallback boot.\r
-#romimage "fallback" \r
-#      option USE_FALLBACK_IMAGE=1\r
-#      option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"\r
-#       payload ../../../../../../../memtest86/memtest\r
-#       payload ../../../../../../../etherboot/src/bin/e1000.zelf\r
-#       payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf\r
-#end\r
-\r
-buildrom ./linuxbios.rom ROM_SIZE "normal"\r
+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 5702147c9b8dfb49507a1d170a2b1cc66c6eb6c7..6b29b5aa0fa72f7abb52eba020fee36ee6ea47a8 100644 (file)
--- 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 144713d2e049bccfabe9ee2e2826977a4d1be845..c9b77c36db077168e8a2924018641fea588eeb07 100644 (file)
--- 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 d56fb74d4e8639d2974353664b03fb70c1002801..7755066eff1a66e7f6018c8e0fc2e253ec9dcf62 100644 (file)
--- 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 f58d63bcdf0c3322330e89e2d715afd060e342d6..0509c7f39af3b0bdd114146417b3168b47076fb8 100644 (file)
--- 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 de7f94193ff4058c161ca696aa0efcdc7eb54c42..fa6441d86fac41536b21b24d5a60b03b19efe79a 100644 (file)
--- 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 5374168b948a5fcd17dbd8c9173a550226d09b75..8edcff4cf1a5ec9fa1130b7f7bfe84f3622312d2 100644 (file)
--- 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 5933e1a8906b3b341b50dccc9483e5afb5e4a4c0..0e16ec3787e007da4dca3fae2835c432aa44a15b 100644 (file)
--- 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 8dab1aeb99b882f9197ba0b8fdf91e9174d13f67..ed1b1512612e0430f070cd1cad29c32ef2837dd7 100644 (file)
--- 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 24bb2bd344327917640053fc073064e36adc0b10..9cd107e4acc706d51db5787f1278df966993c1be 100644 (file)
--- 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 56702d55b1f20ab544a3dc9640aa2d9c0e947599..6647a82f53cffd904b0861a1a86a5e4aded362c8 100644 (file)
--- 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 bbbf3854f8b9f2068b0bfd08dbdb2d3888882ff8..889e8e2836c3a5ee4e72a284db6edc9ce32d26a1 100644 (file)
--- 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 6946696e55256705daa8ac9e4a3b7904272404ac..b02b9d88d8afd868b2811a566d3fcc5928a655df 100644 (file)
--- 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 54d6ae13b7cda76ad22207b246459db0d9000e78..a1321978b311ad7bd59fbeac004a59fed8434d4a 100644 (file)
--- 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 004b9d7bb0db43d2c98e5001b9d52fc8d3708aba..254b961946252e6871c88326f07ab1ac5391311b 100644 (file)
--- 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 8eee626369548e516eae5cfa9989f2e01aeaf3fc..c12db5e07efbad41c97f62c93668710f25e8feb7 100644 (file)
--- 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 4232fa8a299b38100308dd1d4cced7fc19b39bcc..aabdf5938a8e187f4a528ce9d48ddb14cdb84218 100644 (file)
--- 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 3afb2732f562fa1314f069af48fded7f70590d7e..3b4145873ceaf24b40c9e7287512cddddad65638 100644 (file)
--- 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 54c5a6cad69f01953a1063bd5b77c75fb98e6811..c6ef62fb0a8f46cb9f1553e6699d988d22a4ed19 100644 (file)
--- 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 f0846bff9b92b24bf596fdcee9ec24cb3d7028c8..42a795cee821daf7d8b0e5f09f157db752456553 100644 (file)
--- 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 ad5cc11e5d5c494b33b890ed4491216c2775ca1b..e86d26ea7e3631e7f8265ab1b94a2f1dd7e90904 100644 (file)
--- 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 dd48e6b56a9775ef4b45806667334606d5f6425f..7c728ba7a1df3c64ae815d0185da57ec388692ab 100644 (file)
--- 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 c440de983ba649993c324d84f8f6694e41ea8408..2c65687185821526c57f5ab4d5cfb7f639ad8f5c 100644 (file)
--- 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 e4980b92ce79f08721e4ce8265a0bc6258d3b424..3df36840245779da78e760213608ecf6a70377b8 100644 (file)
--- 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 8056fb3ed5fecf0baedba390ef8439a06ac1699f..c034e66182741d71c5e978b9c121b896929f5f8b 100644 (file)
--- 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