* 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

8 files changed, 119 insertions, 19 deletions

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