* fix the automatic build system by compressing payloads if possible

  and leaving enough room for a real payload (not /dev/null)

  This is a wonderful example why "uses" sucks.

* add Config-abuild.lb for those boards that dont build with
  the default settings and a real payload:
  arima/hdama, amd/quartet, amd/serengeti_cheetah, ibm/e326

* if lzma is installed and a real payload is used, try compressing
  it.

* fix a small bug in "abuild --help"

This patch is acked by me because its due to infrastructural changes only.
Flames welcome.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2496 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/agami/aruma/Options.lb b/src/mainboard/agami/aruma/Options.lb
index 575c76a581d5a498594c1da3668ca8d227326507..5c13751fd69ce9e13db26ee1456f992ab73dffba 100644 (file)
--- a/src/mainboard/agami/aruma/Options.lb
+++ b/src/mainboard/agami/aruma/Options.lb
@@ -20,6 +20,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/amd/quartet/Options.lb b/src/mainboard/amd/quartet/Options.lb
index 54e908dd34ef12121b90bda82ad36fb69d549857..db2686cd481daf6bde57beaa1d63030c11225d71 100644 (file)
--- a/src/mainboard/amd/quartet/Options.lb
+++ b/src/mainboard/amd/quartet/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/amd/rumba/Options.lb b/src/mainboard/amd/rumba/Options.lb
index 4c1030a3154e8e5a2cb9010d0e1f244dd8e503df..29ef3094ffa31c61759cd046e94113df4d6f975f 100644 (file)
--- a/src/mainboard/amd/rumba/Options.lb
+++ b/src/mainboard/amd/rumba/Options.lb
@@ -21,7 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/amd/serenade/Options.lb b/src/mainboard/amd/serenade/Options.lb
index 6b686806c1cb1a98267392edba4b4a8cb8f1dd5f..1dfcdcec942c9c5ba5528e8fc07397d830b87635 100644 (file)
--- a/src/mainboard/amd/serenade/Options.lb
+++ b/src/mainboard/amd/serenade/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/amd/serengeti_cheetah/Options.lb b/src/mainboard/amd/serengeti_cheetah/Options.lb
index b4d69ca9dab321700e48ae7aa66e71b845f5ad30..f7df1e63e4719211a8b9a28d2059e052d3865bb8 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/Options.lb
+++ b/src/mainboard/amd/serengeti_cheetah/Options.lb
@@ -23,7 +23,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -267,8 +267,6 @@ default _RAMBASE=0x00100000
 ##
 default CONFIG_ROM_STREAM = 1
 
-#default CONFIG_COMPRESSED_ROM_STREAM = 1
-
 ###
 ### Defaults of options that you may want to override in the target config file
 ### 

diff --git a/src/mainboard/amd/serengeti_leopard/Options.lb b/src/mainboard/amd/serengeti_leopard/Options.lb
index b7ea7606ea375c00912919b9f8dcc40368ff2f73..0806555287c6c9ec549e2518351839d91d2212f9 100644 (file)
--- a/src/mainboard/amd/serengeti_leopard/Options.lb
+++ b/src/mainboard/amd/serengeti_leopard/Options.lb
@@ -23,6 +23,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/amd/solo/Options.lb b/src/mainboard/amd/solo/Options.lb
index 18dc596a0c68da2c0815fbd936832fa08930169e..e8636f8293df69e784474149b2df51745b35e1f3 100644 (file)
--- a/src/mainboard/amd/solo/Options.lb
+++ b/src/mainboard/amd/solo/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb
index 43bee1ef5d760402fabe9d841ea7737937138995..ed0b80a1743f6d5f230ad44e3cc34ae4b5ae8abf 100644 (file)
--- a/src/mainboard/arima/hdama/Options.lb
+++ b/src/mainboard/arima/hdama/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/artecgroup/dbe61/Options.lb b/src/mainboard/artecgroup/dbe61/Options.lb
index c5d60bc2fc9b810b6b63236b78e41ace83ab1219..aa1cc0a324fecb151d255f7a14872a8038868216 100644 (file)
--- a/src/mainboard/artecgroup/dbe61/Options.lb
+++ b/src/mainboard/artecgroup/dbe61/Options.lb
@@ -21,7 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/asus/p2b/Options.lb b/src/mainboard/asus/p2b/Options.lb
index 20c1aaa310e4139be2fdd5ee018a3cf9907c2910..a7fc28bbaa2e8fb3823fce5799a018eb88a6d7ac 100644 (file)
--- a/src/mainboard/asus/p2b/Options.lb
+++ b/src/mainboard/asus/p2b/Options.lb
@@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/bitworks/ims/Options.lb b/src/mainboard/bitworks/ims/Options.lb
index a67e1495cb1d4c1809e263f16ac2475d40f17fcc..92a09c791951ca0fb461cd37a7af5d5a48b27d4e 100644 (file)
--- a/src/mainboard/bitworks/ims/Options.lb
+++ b/src/mainboard/bitworks/ims/Options.lb
@@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/broadcom/blast/Options.lb b/src/mainboard/broadcom/blast/Options.lb
index c64c7cf04833b34b8a971351c2d873f03f983354..cf14e1baaafe2fabf52d0b40cb1b70fa9efa0f23 100644 (file)
--- a/src/mainboard/broadcom/blast/Options.lb
+++ b/src/mainboard/broadcom/blast/Options.lb
@@ -19,6 +19,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/dell/s1850/Options.lb b/src/mainboard/dell/s1850/Options.lb
index 8461cdb7d16e8cf2e089f755aa770b21cfe01467..fb46537a1d1683137ee4d2b1fbf24e80edc1482e 100644 (file)
--- a/src/mainboard/dell/s1850/Options.lb
+++ b/src/mainboard/dell/s1850/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/densitron/dpx114/Options.lb b/src/mainboard/densitron/dpx114/Options.lb
index 2073c081e1f531ff5dc1ba70b7cce202c967a5ba..923c9922d6e5421184610fdd8d22ae38d0f8151c 100644 (file)
--- a/src/mainboard/densitron/dpx114/Options.lb
+++ b/src/mainboard/densitron/dpx114/Options.lb
@@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/digitallogic/adl855pc/Options.lb b/src/mainboard/digitallogic/adl855pc/Options.lb
index dc85a6ff17a770cf53b48faab23f7b94e86d0b01..6a66ed76bf7915746114e1ed706ea4cc8a5bbd01 100644 (file)
--- a/src/mainboard/digitallogic/adl855pc/Options.lb
+++ b/src/mainboard/digitallogic/adl855pc/Options.lb
@@ -22,6 +22,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/digitallogic/msm586seg/Options.lb b/src/mainboard/digitallogic/msm586seg/Options.lb
index 1ff28b2eabc8e257cbcfa3332a0ed013ba367f51..ed386f369a3a0b7f5f0a5ed1abb947e6194721e6 100644 (file)
--- a/src/mainboard/digitallogic/msm586seg/Options.lb
+++ b/src/mainboard/digitallogic/msm586seg/Options.lb
@@ -23,6 +23,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/digitallogic/msm800sev/Options.lb b/src/mainboard/digitallogic/msm800sev/Options.lb
index 1eac8243acd04bde657a1122453e0cc5f863a0e0..82f211580a3dd58b37d74ea24ee42085c778aa43 100644 (file)
--- a/src/mainboard/digitallogic/msm800sev/Options.lb
+++ b/src/mainboard/digitallogic/msm800sev/Options.lb
@@ -21,7 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/eaglelion/5bcm/Options.lb b/src/mainboard/eaglelion/5bcm/Options.lb
index df3d1bdfb6e7796bad98ccbc6778f90754acc412..29ef3094ffa31c61759cd046e94113df4d6f975f 100644 (file)
--- a/src/mainboard/eaglelion/5bcm/Options.lb
+++ b/src/mainboard/eaglelion/5bcm/Options.lb
@@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/embeddedplanet/ep405pc/Options.lb b/src/mainboard/embeddedplanet/ep405pc/Options.lb
index 3275aa297db0c45205f58be3c5edaca5cd18efe7..2bede99d331a93bff8d4950eeb38cab8221c09ef 100644 (file)
--- a/src/mainboard/embeddedplanet/ep405pc/Options.lb
+++ b/src/mainboard/embeddedplanet/ep405pc/Options.lb
@@ -24,6 +24,7 @@ uses CONFIG_FS_STREAM
 uses CONFIG_FS_EXT2
 uses CONFIG_FS_ISO9660
 uses CONFIG_FS_FAT
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses AUTOBOOT_CMDLINE
 uses CONFIG_SYS_CLK_FREQ
 uses IDE_BOOT_DRIVE

diff --git a/src/mainboard/ibm/e325/Options.lb b/src/mainboard/ibm/e325/Options.lb
index 64d043cae9209db24031b763474664d083a37872..a732ae862e98b2034d4eced1463fcfe6b4ac0601 100644 (file)
--- a/src/mainboard/ibm/e325/Options.lb
+++ b/src/mainboard/ibm/e325/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/ibm/e326/Options.lb b/src/mainboard/ibm/e326/Options.lb
index 896dcb18e983c667cf3d9c2f4597e4e4dc2bc0cb..495fa14f35fb7baa68df6dc72935bb8499973121 100644 (file)
--- a/src/mainboard/ibm/e326/Options.lb
+++ b/src/mainboard/ibm/e326/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/intel/jarrell/Options.lb b/src/mainboard/intel/jarrell/Options.lb
index a7a5c7288a330eb74015fd0acaf3c8aa8b8e3daf..50fd795697f76692841c3502388604a467f8d46d 100644 (file)
--- a/src/mainboard/intel/jarrell/Options.lb
+++ b/src/mainboard/intel/jarrell/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/intel/xe7501devkit/Options.lb b/src/mainboard/intel/xe7501devkit/Options.lb
index 278c773ab173efb1e658d01da360f22a50f0e63e..aaca1f01c752ae8375f98523c1731bff9765e4e5 100644 (file)
--- a/src/mainboard/intel/xe7501devkit/Options.lb
+++ b/src/mainboard/intel/xe7501devkit/Options.lb
@@ -10,6 +10,7 @@ uses CONFIG_MAX_PHYSICAL_CPUS
 uses CONFIG_IOAPIC
 uses CONFIG_SMP
 uses CONFIG_ROM_STREAM
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses STACK_SIZE
 uses HEAP_SIZE
 uses USE_OPTION_TABLE

diff --git a/src/mainboard/iwill/dk8_htx/Options.lb b/src/mainboard/iwill/dk8_htx/Options.lb
index 993c01183f8b532055b4968d42215d2900360e13..c9f4d48dbee032059141199933ee2a596e521cfd 100644 (file)
--- a/src/mainboard/iwill/dk8_htx/Options.lb
+++ b/src/mainboard/iwill/dk8_htx/Options.lb
@@ -23,7 +23,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -266,8 +266,6 @@ default _RAMBASE=0x00100000
 ##
 default CONFIG_ROM_STREAM = 1
 
-#default CONFIG_COMPRESSED_ROM_STREAM = 1
-
 ###
 ### Defaults of options that you may want to override in the target config file
 ### 

diff --git a/src/mainboard/iwill/dk8s2/Options.lb b/src/mainboard/iwill/dk8s2/Options.lb
index c0a1043c16fb1afc39ec6207d99a5b15a1d7e28b..60f3e438c01ea2a776c326799eb8f34fa513fdc9 100644 (file)
--- a/src/mainboard/iwill/dk8s2/Options.lb
+++ b/src/mainboard/iwill/dk8s2/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/iwill/dk8x/Options.lb b/src/mainboard/iwill/dk8x/Options.lb
index 6265e72fe180ebd5c94bc06588cc9f13406b7633..6b9f6f01df79d8890542cb8ef9a27ab670650183 100644 (file)
--- a/src/mainboard/iwill/dk8x/Options.lb
+++ b/src/mainboard/iwill/dk8x/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/lippert/frontrunner/Options.lb b/src/mainboard/lippert/frontrunner/Options.lb
index df3d1bdfb6e7796bad98ccbc6778f90754acc412..29ef3094ffa31c61759cd046e94113df4d6f975f 100644 (file)
--- a/src/mainboard/lippert/frontrunner/Options.lb
+++ b/src/mainboard/lippert/frontrunner/Options.lb
@@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
index a668999a43eb3c50c44fd4c007b57d570b3395dd..e28cb94507d42f4a9fdd95adc696f9e3560d394d 100644 (file)
--- a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
+++ b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
@@ -21,6 +21,7 @@ uses CONFIG_FS_STREAM
 uses CONFIG_FS_EXT2
 uses CONFIG_FS_ISO9660
 uses CONFIG_FS_FAT
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses AUTOBOOT_CMDLINE
 uses PAYLOAD_SIZE
 uses ROM_SIZE

diff --git a/src/mainboard/msi/ms9185/Options.lb b/src/mainboard/msi/ms9185/Options.lb
index da8eee4f3a5690412933fd305c710ed04b52eb9a..b08b65aca1a6c63e644514ffedec621cc2918bf4 100644 (file)
--- a/src/mainboard/msi/ms9185/Options.lb
+++ b/src/mainboard/msi/ms9185/Options.lb
@@ -44,6 +44,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/newisys/khepri/Options.lb b/src/mainboard/newisys/khepri/Options.lb
index 69af4c8442e2ad16931156c45496f794785d0c1c..5a15cd09b67d60410c9dde628fb1f68649db7753 100644 (file)
--- a/src/mainboard/newisys/khepri/Options.lb
+++ b/src/mainboard/newisys/khepri/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/sunw/ultra40/Options.lb b/src/mainboard/sunw/ultra40/Options.lb
index a81745390da8a48462a0967e1e3ff03fe28b40ce..a904524fa2749353f9a97441ef7e6c24dfca6ab8 100644 (file)
--- a/src/mainboard/sunw/ultra40/Options.lb
+++ b/src/mainboard/sunw/ultra40/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/supermicro/x6dai_g/Options.lb b/src/mainboard/supermicro/x6dai_g/Options.lb
index 822e31f03ffd60d6ee1eeaebe88c134645b6b05b..fcfd38e5cca68bdb0f1237eb57ec6bd67e6a545e 100644 (file)
--- a/src/mainboard/supermicro/x6dai_g/Options.lb
+++ b/src/mainboard/supermicro/x6dai_g/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/supermicro/x6dhe_g/Options.lb b/src/mainboard/supermicro/x6dhe_g/Options.lb
index d09effc37ea40b65091782f8c3224b6b5c23baba..3b284181db1b7c99bc3b23c1176be0ecefa19879 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g/Options.lb
+++ b/src/mainboard/supermicro/x6dhe_g/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/supermicro/x6dhe_g2/Options.lb b/src/mainboard/supermicro/x6dhe_g2/Options.lb
index d09effc37ea40b65091782f8c3224b6b5c23baba..3b284181db1b7c99bc3b23c1176be0ecefa19879 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g2/Options.lb
+++ b/src/mainboard/supermicro/x6dhe_g2/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/supermicro/x6dhr_ig/Options.lb b/src/mainboard/supermicro/x6dhr_ig/Options.lb
index 8461cdb7d16e8cf2e089f755aa770b21cfe01467..fb46537a1d1683137ee4d2b1fbf24e80edc1482e 100644 (file)
--- a/src/mainboard/supermicro/x6dhr_ig/Options.lb
+++ b/src/mainboard/supermicro/x6dhr_ig/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/supermicro/x6dhr_ig2/Options.lb b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
index 8461cdb7d16e8cf2e089f755aa770b21cfe01467..fb46537a1d1683137ee4d2b1fbf24e80edc1482e 100644 (file)
--- a/src/mainboard/supermicro/x6dhr_ig2/Options.lb
+++ b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/technologic/ts5300/Options.lb b/src/mainboard/technologic/ts5300/Options.lb
index 79c57d6e59faee4a441b521683433bd3bb67c79e..2e7e63681b1a879db665b1cc3ed88cebac7172a9 100644 (file)
--- a/src/mainboard/technologic/ts5300/Options.lb
+++ b/src/mainboard/technologic/ts5300/Options.lb
@@ -6,7 +6,6 @@ uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
 uses CONFIG_COMPRESS
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
 uses CONFIG_ROM_STREAM
 uses CONFIG_USE_INIT
 uses IRQ_SLOT_COUNT
@@ -24,6 +23,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -134,7 +134,6 @@ default USE_OPTION_TABLE = 0
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_COMPRESSED_ROM_STREAM_NRV2B     = 1
 default CONFIG_ROM_STREAM     = 1
 
 ##

diff --git a/src/mainboard/totalimpact/briq/Options.lb b/src/mainboard/totalimpact/briq/Options.lb
index 4c6f22980387d86d572d06aa27924ef65e8a0d28..5a69147d837504cae08cb002bde21a9b35c23ab0 100644 (file)
--- a/src/mainboard/totalimpact/briq/Options.lb
+++ b/src/mainboard/totalimpact/briq/Options.lb
@@ -19,6 +19,7 @@ uses CONFIG_USE_INIT
 uses NO_POST
 uses CONFIG_CONSOLE_SERIAL8250 
 uses CONFIG_IDE_STREAM 
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses IDE_BOOT_DRIVE
 uses IDE_SWAB IDE_OFFSET 
 uses ROM_SIZE

diff --git a/src/mainboard/tyan/s2735/Options.lb b/src/mainboard/tyan/s2735/Options.lb
index ada1beb5934c2fd1cd9a2403b0d93e9802b55b6b..2690b5b0d9b39a733ff1e268bd6fe77105ebed06 100644 (file)
--- a/src/mainboard/tyan/s2735/Options.lb
+++ b/src/mainboard/tyan/s2735/Options.lb
@@ -19,6 +19,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s2850/Options.lb b/src/mainboard/tyan/s2850/Options.lb
index ca1aa186c709d9fdd2fecf829b4e476dd0c547d3..fefe9d9866dde2de3a2c08cf0da3ba380f7c2af6 100644 (file)
--- a/src/mainboard/tyan/s2850/Options.lb
+++ b/src/mainboard/tyan/s2850/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s2875/Options.lb b/src/mainboard/tyan/s2875/Options.lb
index 092aefb98c5acd59d8d805eaa3b9a4153c67614d..36061c453f64805b7ef387a61b50b03dab9cf8b5 100644 (file)
--- a/src/mainboard/tyan/s2875/Options.lb
+++ b/src/mainboard/tyan/s2875/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s2880/Options.lb b/src/mainboard/tyan/s2880/Options.lb
index bcb7a1e4c23703947fa75f0aef606f9851539246..7a6a8558f31e676a30c2f0e75ee35d9b5e34a783 100644 (file)
--- a/src/mainboard/tyan/s2880/Options.lb
+++ b/src/mainboard/tyan/s2880/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s2881/Options.lb b/src/mainboard/tyan/s2881/Options.lb
index 7d39b92fb58d2911f620a83693bcc7ef1a940fa8..5e519469605078dbe5a4574eec94d01412751d71 100644 (file)
--- a/src/mainboard/tyan/s2881/Options.lb
+++ b/src/mainboard/tyan/s2881/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s2882/Options.lb b/src/mainboard/tyan/s2882/Options.lb
index da382282c99bcf1f8a741743cf78244c25f947f7..11e1205adb6465201eb848e11840b3f57c3179e6 100644 (file)
--- a/src/mainboard/tyan/s2882/Options.lb
+++ b/src/mainboard/tyan/s2882/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s2885/Options.lb b/src/mainboard/tyan/s2885/Options.lb
index 9828e61c1e6b17e7df78123dbeaaac0998c9f5df..2f48ef0ed212af6e05e68dd1b737197d1b7993a6 100644 (file)
--- a/src/mainboard/tyan/s2885/Options.lb
+++ b/src/mainboard/tyan/s2885/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s2891/Options.lb b/src/mainboard/tyan/s2891/Options.lb
index 933390b025ca414c5f49c115d1c2395f90dd9c95..2fd91f19a08ce9126ec172c12d024e53e89f1a17 100644 (file)
--- a/src/mainboard/tyan/s2891/Options.lb
+++ b/src/mainboard/tyan/s2891/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s2892/Options.lb b/src/mainboard/tyan/s2892/Options.lb
index 92ebe2e7383883b65cec28a0eb87d37dcac30bb7..dd94661d72690519dc98a6018185d44333889671 100644 (file)
--- a/src/mainboard/tyan/s2892/Options.lb
+++ b/src/mainboard/tyan/s2892/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s2895/Options.lb b/src/mainboard/tyan/s2895/Options.lb
index b1ee5367e8f7a77e920542b938a538fcccfddab8..1ce9000bf1cfa9542bd3d012061ab65d055859a4 100644 (file)
--- a/src/mainboard/tyan/s2895/Options.lb
+++ b/src/mainboard/tyan/s2895/Options.lb
@@ -21,6 +21,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s4880/Options.lb b/src/mainboard/tyan/s4880/Options.lb
index 9e74b1121462228dc13d91f2b4fd6eb28dac86e7..34c89f7dd015e8cee3d8e5a6e8f54a36cdbfcd42 100644 (file)
--- a/src/mainboard/tyan/s4880/Options.lb
+++ b/src/mainboard/tyan/s4880/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/tyan/s4882/Options.lb b/src/mainboard/tyan/s4882/Options.lb
index cd31cfed6b222f14dfcd71a0a31c619dcfd30d97..1235d8a85648676fb532697c4e9abb58edf91c2b 100644 (file)
--- a/src/mainboard/tyan/s4882/Options.lb
+++ b/src/mainboard/tyan/s4882/Options.lb
@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb
index 7342a5e07e2e876bede986044c1afa401ceecc9e..4489b2250a6c24604024842ccd94422eee772ed3 100644 (file)
--- a/src/mainboard/via/epia-m/Options.lb
+++ b/src/mainboard/via/epia-m/Options.lb
@@ -21,7 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/src/mainboard/via/epia/Options.lb b/src/mainboard/via/epia/Options.lb
index 97b5ad3859847f9a2e972d3baff42d3125313425..6cd9691f5bc1f82850326f9e9a320dfd56e2b0fe 100644 (file)
--- a/src/mainboard/via/epia/Options.lb
+++ b/src/mainboard/via/epia/Options.lb
@@ -29,6 +29,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

diff --git a/targets/amd/quartet/Config-abuild.lb b/targets/amd/quartet/Config-abuild.lb
new file mode 100644 (file)
index 0000000..0034d9b
--- /dev/null
+++ b/targets/amd/quartet/Config-abuild.lb
@@ -0,0 +1,28 @@
+# This will make a target directory of ./VENDOR_MAINBOARD
+
+target VENDOR_MAINBOARD
+mainboard VENDOR/MAINBOARD
+
+option CC="CROSSCC"
+option CROSS_COMPILE="CROSS_PREFIX"
+option HOSTCC="CROSS_HOSTCC"
+
+__COMPRESSION__
+
+option ROM_SIZE=512*1024
+
+
+romimage "normal"
+       option USE_FALLBACK_IMAGE=0
+       option ROM_IMAGE_SIZE=0x20000
+       option LINUXBIOS_EXTRA_VERSION=".0-normal"
+       payload PAYLOAD
+end
+
+romimage "fallback" 
+       option USE_FALLBACK_IMAGE=1
+       option ROM_IMAGE_SIZE=0x20000
+       option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+       payload PAYLOAD
+end
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"

diff --git a/targets/amd/serengeti_cheetah/Config-abuild.lb b/targets/amd/serengeti_cheetah/Config-abuild.lb
new file mode 100644 (file)
index 0000000..b4a4ae6
--- /dev/null
+++ b/targets/amd/serengeti_cheetah/Config-abuild.lb
@@ -0,0 +1,27 @@
+# This will make a target directory of ./VENDOR_MAINBOARD
+
+target VENDOR_MAINBOARD
+mainboard VENDOR/MAINBOARD
+
+option CC="CROSSCC"
+option CROSS_COMPILE="CROSS_PREFIX"
+option HOSTCC="CROSS_HOSTCC"
+
+__COMPRESSION__
+
+option ROM_SIZE=512*1024
+
+romimage "normal"
+       option USE_FALLBACK_IMAGE=0
+       option ROM_IMAGE_SIZE=0x20000
+       option LINUXBIOS_EXTRA_VERSION=".0-normal"
+       payload PAYLOAD
+end
+
+romimage "fallback" 
+       option USE_FALLBACK_IMAGE=1
+       option ROM_IMAGE_SIZE=0x20000
+       option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+       payload PAYLOAD
+end
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"

diff --git a/targets/arima/hdama/Config-abuild.lb b/targets/arima/hdama/Config-abuild.lb
new file mode 100644 (file)
index 0000000..b4a4ae6
--- /dev/null
+++ b/targets/arima/hdama/Config-abuild.lb
@@ -0,0 +1,27 @@
+# This will make a target directory of ./VENDOR_MAINBOARD
+
+target VENDOR_MAINBOARD
+mainboard VENDOR/MAINBOARD
+
+option CC="CROSSCC"
+option CROSS_COMPILE="CROSS_PREFIX"
+option HOSTCC="CROSS_HOSTCC"
+
+__COMPRESSION__
+
+option ROM_SIZE=512*1024
+
+romimage "normal"
+       option USE_FALLBACK_IMAGE=0
+       option ROM_IMAGE_SIZE=0x20000
+       option LINUXBIOS_EXTRA_VERSION=".0-normal"
+       payload PAYLOAD
+end
+
+romimage "fallback" 
+       option USE_FALLBACK_IMAGE=1
+       option ROM_IMAGE_SIZE=0x20000
+       option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+       payload PAYLOAD
+end
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"

diff --git a/targets/digitallogic/msm586seg/Config-abuild.lb b/targets/digitallogic/msm586seg/Config-abuild.lb
index 9c91c3382947ff1625baa681824cedf940ac128b..81d7bc853f56a2c76e29f6f0e0c5eeb617c25cc0 100644 (file)
--- a/targets/digitallogic/msm586seg/Config-abuild.lb
+++ b/targets/digitallogic/msm586seg/Config-abuild.lb
@@ -7,14 +7,9 @@ option DEFAULT_CONSOLE_LOGLEVEL=10
 option MAXIMUM_CONSOLE_LOGLEVEL=10
 option CONFIG_COMPRESS=0
 
-option CONFIG_CONSOLE_VGA=1
+__COMPRESSION__
 
-#romimage "normal"
-#      option USE_FALLBACK_IMAGE=0
-#      option ROM_IMAGE_SIZE=0x10000
-#      option LINUXBIOS_EXTRA_VERSION=".0Normal"
-#      payload /etc/hosts
-#end
+option CONFIG_CONSOLE_VGA=1
 
 romimage "fallback" 
        option FALLBACK_SIZE = 256 * 1024
@@ -25,7 +20,7 @@ romimage "fallback"
        option ROM_IMAGE_SIZE=128 * 1024 # 0x10000
 #      option ROM_IMAGE_SIZE=512 * 1024 # 0x10000
        option LINUXBIOS_EXTRA_VERSION=".0Fallback"
-       payload /dev/null
+       payload PAYLOAD
 end
 
 buildrom ./linuxbios.rom ROM_SIZE  "fallback"

diff --git a/targets/emulation/qemu-i386/Config-abuild.lb b/targets/emulation/qemu-i386/Config-abuild.lb
index e8b581906dcc4f1dc862305c007d4f234f84ad46..02016b86032d6c90ed55db04856bb38b2dbebfde 100644 (file)
--- a/targets/emulation/qemu-i386/Config-abuild.lb
+++ b/targets/emulation/qemu-i386/Config-abuild.lb
@@ -3,6 +3,8 @@
 target emulation_qemu-i386
 mainboard emulation/qemu-i386
 
+__COMPRESSION__
+
 option ROM_SIZE=256*1024
 
 option CC="gcc -m32"

diff --git a/targets/ibm/e326/Config-abuild.lb b/targets/ibm/e326/Config-abuild.lb
new file mode 100644 (file)
index 0000000..b4a4ae6
--- /dev/null
+++ b/targets/ibm/e326/Config-abuild.lb
@@ -0,0 +1,27 @@
+# This will make a target directory of ./VENDOR_MAINBOARD
+
+target VENDOR_MAINBOARD
+mainboard VENDOR/MAINBOARD
+
+option CC="CROSSCC"
+option CROSS_COMPILE="CROSS_PREFIX"
+option HOSTCC="CROSS_HOSTCC"
+
+__COMPRESSION__
+
+option ROM_SIZE=512*1024
+
+romimage "normal"
+       option USE_FALLBACK_IMAGE=0
+       option ROM_IMAGE_SIZE=0x20000
+       option LINUXBIOS_EXTRA_VERSION=".0-normal"
+       payload PAYLOAD
+end
+
+romimage "fallback" 
+       option USE_FALLBACK_IMAGE=1
+       option ROM_IMAGE_SIZE=0x20000
+       option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+       payload PAYLOAD
+end
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"

diff --git a/targets/technologic/ts5300/Config-abuild.lb b/targets/technologic/ts5300/Config-abuild.lb
index 063918f1c165a73758dd6b4227cc1b9723f05991..2775ee57438ab3f9e9de849de50a1277ded048c4 100644 (file)
--- a/targets/technologic/ts5300/Config-abuild.lb
+++ b/targets/technologic/ts5300/Config-abuild.lb
@@ -1,20 +1,13 @@
 target technologic_ts5300
 mainboard technologic/ts5300
 
-
-
 option DEFAULT_CONSOLE_LOGLEVEL=10
 option MAXIMUM_CONSOLE_LOGLEVEL=10
 option CONFIG_COMPRESS=0
 
-option CONFIG_CONSOLE_VGA=1
+__COMPRESSION__
 
-#romimage "normal"
-#      option USE_FALLBACK_IMAGE=0
-#      option ROM_IMAGE_SIZE=0x10000
-#      option LINUXBIOS_EXTRA_VERSION=".0Normal"
-#      payload /etc/hosts
-#end
+option CONFIG_CONSOLE_VGA=1
 
 romimage "fallback" 
        option FALLBACK_SIZE = 256 * 1024
@@ -23,9 +16,8 @@ romimage "fallback"
        option USE_FALLBACK_IMAGE=1
 #      option ROM_IMAGE_SIZE=32 * 1024 # 0x8000
        option ROM_IMAGE_SIZE=128 * 1024 # 0x10000
-#      option ROM_IMAGE_SIZE=512 * 1024 # 0x10000
        option LINUXBIOS_EXTRA_VERSION=".0Fallback"
-       payload /dev/null
+       payload PAYLOAD
 end
 
 buildrom ./linuxbios.rom ROM_SIZE  "fallback"

diff --git a/targets/via/epia-m/Config-abuild.lb b/targets/via/epia-m/Config-abuild.lb
index 953c59bb1988647ba7f5acf66e5337a4a3ebb756..194f25bacad10c87e594aa71ea19ad86e7fa956b 100644 (file)
--- a/targets/via/epia-m/Config-abuild.lb
+++ b/targets/via/epia-m/Config-abuild.lb
@@ -7,6 +7,8 @@ option  MAXIMUM_CONSOLE_LOGLEVEL=8
 option  DEFAULT_CONSOLE_LOGLEVEL=8
 option  CONFIG_CONSOLE_SERIAL8250=1
 
+__COMPRESSION__
+
 option ROM_SIZE=256*1024
 
 option HAVE_OPTION_TABLE=1

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 6a5c808e44a1d1ae126096cd978a9394f8ebc3b7..db84debd2328f2cd0dc4de9a491493fbc3bd90a7 100755 (executable)
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -105,10 +105,14 @@ function create_config
        TARGCONFIG=$LBROOT/targets/$VENDOR/$MAINBOARD/Config-abuild.lb
 
         # get a working payload for the board if we have one.
+        # the --payload option expects a directory containing 
+       # an executable shell script payload.sh
+       #   Usage: payload.sh [VENDOR] [DEVICE]
+       # the script returns an absolute path to the payload binary.
 
        if [ -x $payloads/payload.sh ]; then
                PAYLOAD=`$payloads/payload.sh $VENDOR $MAINBOARD`
-               printf "Using custom payload $PAYLOAD\n"
+               printf "Using payload $PAYLOAD\n"
        fi
        
        mkdir -p $TARGET
@@ -131,19 +135,21 @@ option CC="CROSSCC"
 option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
+__COMPRESSION__
+
 EOF
                if [ "$TARCH" == i386 ] ; then
                        cat <<EOF
 romimage "normal"
        option USE_FALLBACK_IMAGE=0
-       option ROM_IMAGE_SIZE=0x20000
+       option ROM_IMAGE_SIZE=0x16000
        option LINUXBIOS_EXTRA_VERSION=".0-normal"
        payload PAYLOAD
 end
 
 romimage "fallback" 
        option USE_FALLBACK_IMAGE=1
-       option ROM_IMAGE_SIZE=0x20000
+       option ROM_IMAGE_SIZE=0x16000
        option LINUXBIOS_EXTRA_VERSION=".0-fallback"
        payload PAYLOAD
 end
@@ -161,14 +167,20 @@ EOF
                ) > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
        fi
 
+       if [ "`which lzma`" != "" -a "$PAYLOAD" != /dev/null ]; then
+               COMPRESSION="option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1"
+       else
+               COMPRESSION="# no compression"
+       fi
+
        sed -i.pre -e s,VENDOR,$VENDOR,g \
                -e s,MAINBOARD,$MAINBOARD,g \
                -e s,payload\ PAYLOAD,payload\ $PAYLOAD,g \
                -e s,CROSSCC,"$CC",g \
                -e s,CROSS_PREFIX,"$CROSS_COMPILE",g \
                -e s,CROSS_HOSTCC,"$HOSTCC",g \
+               -e s,__COMPRESSION__,"$COMPRESSION",g \
                $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
-               
        printf " ok\n"
 }
 
@@ -422,8 +434,8 @@ function myhelp
 {
        printf "Usage: $0 [-v] [-a] [-b] [-t <vendor/board>] [-p <dir>] [lbroot]\n"
        printf "       $0 [-V|--version]\n"
-       printf "       $0 [-h|--help]\n"
-       printf
+       printf "       $0 [-h|--help]\n\n"
+
        printf "Options:\n"
        printf "    [-v|--verbose]                print more messages\n"
        printf "    [-a|--all]                    build previously succeeded ports as well\n"