diff --git a/src/mainboard/agami/aruma/Options.lb b/src/mainboard/agami/aruma/Options.lb index 575c76a581..5c13751fd6 100644 --- 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 54e908dd34..db2686cd48 100644 --- 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 4c1030a315..29ef3094ff 100644 --- 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 6b686806c1..1dfcdcec94 100644 --- 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 b4d69ca9da..f7df1e63e4 100644 --- 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 b7ea7606ea..0806555287 100644 --- 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 18dc596a0c..e8636f8293 100644 --- 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 43bee1ef5d..ed0b80a174 100644 --- 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 c5d60bc2fc..aa1cc0a324 100644 --- 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 20c1aaa310..a7fc28bbaa 100644 --- 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 a67e1495cb..92a09c7919 100644 --- 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 c64c7cf048..cf14e1baaa 100644 --- 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 8461cdb7d1..fb46537a1d 100644 --- 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 2073c081e1..923c9922d6 100644 --- 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 dc85a6ff17..6a66ed76bf 100644 --- 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 1ff28b2eab..ed386f369a 100644 --- 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 1eac8243ac..82f211580a 100644 --- 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 df3d1bdfb6..29ef3094ff 100644 --- 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 3275aa297d..2bede99d33 100644 --- 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 64d043cae9..a732ae862e 100644 --- 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 896dcb18e9..495fa14f35 100644 --- 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 a7a5c7288a..50fd795697 100644 --- 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 278c773ab1..aaca1f01c7 100644 --- 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 993c01183f..c9f4d48dbe 100644 --- 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 c0a1043c16..60f3e438c0 100644 --- 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 6265e72fe1..6b9f6f01df 100644 --- 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 df3d1bdfb6..29ef3094ff 100644 --- 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 a668999a43..e28cb94507 100644 --- 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 da8eee4f3a..b08b65aca1 100644 --- 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 69af4c8442..5a15cd09b6 100644 --- 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 a81745390d..a904524fa2 100644 --- 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 822e31f03f..fcfd38e5cc 100644 --- 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 d09effc37e..3b284181db 100644 --- 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 d09effc37e..3b284181db 100644 --- 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 8461cdb7d1..fb46537a1d 100644 --- 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 8461cdb7d1..fb46537a1d 100644 --- 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 79c57d6e59..2e7e63681b 100644 --- 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 4c6f229803..5a69147d83 100644 --- 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 ada1beb593..2690b5b0d9 100644 --- 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 ca1aa186c7..fefe9d9866 100644 --- 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 092aefb98c..36061c453f 100644 --- 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 bcb7a1e4c2..7a6a8558f3 100644 --- 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 7d39b92fb5..5e51946960 100644 --- 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 da382282c9..11e1205adb 100644 --- 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 9828e61c1e..2f48ef0ed2 100644 --- 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 933390b025..2fd91f19a0 100644 --- 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 92ebe2e738..dd94661d72 100644 --- 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 b1ee5367e8..1ce9000bf1 100644 --- 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 9e74b11214..34c89f7dd0 100644 --- 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 cd31cfed6b..1235d8a856 100644 --- 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 7342a5e07e..4489b2250a 100644 --- 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 97b5ad3859..6cd9691f5b 100644 --- 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 index 0000000000..0034d9bb6b --- /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 index 0000000000..b4a4ae6922 --- /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 index 0000000000..b4a4ae6922 --- /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 9c91c33829..81d7bc853f 100644 --- 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 e8b581906d..02016b8603 100644 --- 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 index 0000000000..b4a4ae6922 --- /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 063918f1c1..2775ee5743 100644 --- 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 953c59bb19..194f25baca 100644 --- 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 6a5c808e44..db84debd23 100755 --- 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 < $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 ] [-p ] [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"