This patch changes the Config.lb files and adds Config-lab.lb files for

architectures supported by buildrom.

Myles

Signed-off-by: Myles Watson <myles@pel.cs.byu.edu>
Acked-by: Ward Vandewege <ward@gnu.org>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3092 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

13 files changed, 263 insertions, 10 deletions

diff --git a/targets/amd/serengeti_cheetah/Config-lab.lb b/targets/amd/serengeti_cheetah/Config-lab.lb
new file mode 100644
index 0000000000..42cefc190e
--- /dev/null
+++ b/targets/amd/serengeti_cheetah/Config-lab.lb
@@ -0,0 +1,24 @@
+# Sample config file for 
+# the amd serengeti_cheetah 
+# This will make a target directory of ./serengeti_cheetah
+
+target serengeti_cheetah
+mainboard amd/serengeti_cheetah
+
+option ROM_SIZE = 0x100000
+option USE_FAILOVER_IMAGE=0
+option HAVE_FAILOVER_BOOT=0
+option FAILOVER_SIZE=0
+
+romimage "fallback"
+	option CONFIG_PRECOMPRESSED_PAYLOAD=1
+	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+	option FALLBACK_SIZE=ROM_SIZE
+	option USE_FALLBACK_IMAGE=1
+	option ROM_IMAGE_SIZE=0x1a000
+	option XIP_ROM_SIZE=0x40000
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	payload ../payload.elf.lzma
+end
+
+buildrom ./coreboot.rom ROM_SIZE "fallback"
diff --git a/targets/amd/serengeti_cheetah/Config.lb b/targets/amd/serengeti_cheetah/Config.lb
index 25280ef29e..a23505f6d3 100644
--- a/targets/amd/serengeti_cheetah/Config.lb
+++ b/targets/amd/serengeti_cheetah/Config.lb
@@ -29,7 +29,7 @@ romimage "normal"
 #	payload ../../../payloads/tg3.zelf
 #	payload ../../../../payloads/tg3_vga.zelf
 #	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
-	payload ../../../../payloads/tg3--filo_hda2_vga_5.4.1.zelf
+#	payload ../../../../payloads/tg3--filo_hda2_vga_5.4.1.zelf
 #	payload ../../../../payloads/e1000_vga.zelf
 #	payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
 #	payload ../../../payloads/tg3_com2.zelf
@@ -38,6 +38,7 @@ romimage "normal"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 #	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
 #	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
+	payload ../payload.elf
 end
 
 romimage "fallback" 
@@ -62,7 +63,7 @@ romimage "fallback"
 #	payload ../../../../payloads/filo_hda.zelf
 #	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
 #	payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
-	payload ../../../../payloads/tg3--filo_hda2_vga_5.4.1.zelf
+#	payload ../../../../payloads/tg3--filo_hda2_vga_5.4.1.zelf
 #	payload ../../../../payloads/filo_hda2_novga.zelf
 #	payload ../../../payloads/tg3_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
@@ -70,6 +71,7 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 #	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
 #	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
+	payload ../payload.elf
 end
 
 romimage "failover"
diff --git a/targets/amd/serengeti_cheetah_fam10/Config-lab.lb b/targets/amd/serengeti_cheetah_fam10/Config-lab.lb
new file mode 100644
index 0000000000..b67e3396fc
--- /dev/null
+++ b/targets/amd/serengeti_cheetah_fam10/Config-lab.lb
@@ -0,0 +1,54 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2007 Advanced Micro Devices, Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+# Sample config file for
+# the amd cheetah_fam10
+# This will make a target directory of ./serengeti_cheetah_fam10
+
+target serengeti_cheetah_fam10
+mainboard amd/serengeti_cheetah_fam10
+# Request this level of debugging output
+	option  DEFAULT_CONSOLE_LOGLEVEL=11
+# At a maximum only compile in this level of debugging
+	option  MAXIMUM_CONSOLE_LOGLEVEL=11
+
+# 1024KB ROM
+option ROM_SIZE=1024*1024
+option FALLBACK_SIZE=ROM_SIZE-FAILOVER_SIZE
+
+romimage "fallback"
+	option USE_FAILOVER_IMAGE=0
+	option USE_FALLBACK_IMAGE=1
+	option ROM_IMAGE_SIZE=0x30000
+	option XIP_ROM_SIZE=0x40000
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	payload ../payload.elf.lzma
+end
+
+romimage "failover"
+	option USE_FAILOVER_IMAGE=1
+	option USE_FALLBACK_IMAGE=0
+	option ROM_IMAGE_SIZE=FAILOVER_SIZE
+	option XIP_ROM_SIZE=FAILOVER_SIZE
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+end
+
+buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
+
diff --git a/targets/emulation/qemu-i386/Config-lab.lb b/targets/emulation/qemu-i386/Config-lab.lb
new file mode 100644
index 0000000000..76e542ac4e
--- /dev/null
+++ b/targets/emulation/qemu-i386/Config-lab.lb
@@ -0,0 +1,22 @@
+# This will make a target directory of ./emulation_qemu-i386
+
+target qemu-i386
+mainboard emulation/qemu-i386
+
+option ROM_SIZE=2048*1024
+option CONFIG_COMPRESSED_PAYLOAD_LZMA=0
+option CONFIG_PRECOMPRESSED_PAYLOAD=0
+
+option CC="gcc -m32"
+
+option HAVE_PIRQ_TABLE=1
+option IRQ_SLOT_COUNT=6
+
+romimage "image" 
+	option ROM_IMAGE_SIZE=0x10000
+	option COREBOOT_EXTRA_VERSION="-LAB"
+	payload ../payload.elf.lzma
+end
+
+buildrom ./qemu.rom ROM_SIZE "image"
+
diff --git a/targets/emulation/qemu-i386/Config.lb b/targets/emulation/qemu-i386/Config.lb
index ca7ae3b034..d3978c3867 100644
--- a/targets/emulation/qemu-i386/Config.lb
+++ b/targets/emulation/qemu-i386/Config.lb
@@ -13,7 +13,8 @@ option IRQ_SLOT_COUNT=6
 romimage "image" 
 	option ROM_IMAGE_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION="-GRUB2"
-	payload /home/stepan/core.img
+#	payload /home/stepan/core.img
+	payload ../payload.elf
 end
 
 buildrom ./coreboot.rom ROM_SIZE "image"
diff --git a/targets/gigabyte/ga_2761gxdk/Config.lb b/targets/gigabyte/ga_2761gxdk/Config.lb
index 1016f3a717..fc802f24a2 100644
--- a/targets/gigabyte/ga_2761gxdk/Config.lb
+++ b/targets/gigabyte/ga_2761gxdk/Config.lb
@@ -32,7 +32,8 @@ romimage "normal"
         option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x40000
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
-        payload ../../../../payloads/filo_uda1.elf
+#	payload ../../../../payloads/filo_uda1.elf
+	payload ../payload.elf
 end
 
 romimage "fallback"
@@ -41,7 +42,8 @@ romimage "fallback"
         option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x40000
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
-        payload ../../../../payloads/filo_uda1.elf
+#	payload ../../../../payloads/filo_uda1.elf
+	payload ../payload.elf
 end
 
 romimage "failover"
diff --git a/targets/gigabyte/m57sli/Config-lab.lb b/targets/gigabyte/m57sli/Config-lab.lb
new file mode 100644
index 0000000000..06435429d9
--- /dev/null
+++ b/targets/gigabyte/m57sli/Config-lab.lb
@@ -0,0 +1,49 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2007 AMD
+## Written by Yinghai Lu <yinghailu@gmail.com> for AMD.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+# Sample config file for 
+
+target m57sli
+mainboard gigabyte/m57sli
+
+option ROM_SIZE=0x100000
+option FALLBACK_SIZE=(ROM_SIZE-0x1000)
+
+romimage "fallback" 
+	option USE_FAILOVER_IMAGE=0
+	option USE_FALLBACK_IMAGE=1
+	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+	option CONFIG_PRECOMPRESSED_PAYLOAD=1
+	option ROM_IMAGE_SIZE=0x17000
+	option XIP_ROM_SIZE=0x40000
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	payload ../payload.elf.lzma
+end
+
+romimage "failover"
+	option USE_FAILOVER_IMAGE=1
+	option USE_FALLBACK_IMAGE=0
+	option ROM_IMAGE_SIZE=FAILOVER_SIZE
+	option XIP_ROM_SIZE=FAILOVER_SIZE
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+end
+
+buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
diff --git a/targets/gigabyte/m57sli/Config.lb b/targets/gigabyte/m57sli/Config.lb
index 75adcfc244..cf6bb1bb7b 100644
--- a/targets/gigabyte/m57sli/Config.lb
+++ b/targets/gigabyte/m57sli/Config.lb
@@ -82,7 +82,7 @@ romimage "fallback"
 #	payload ../../../../payloads/adlo.elf
 #	payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
 #	payload ../../../../payloads/forcedeth_mcp55_filo_hda2.zelf
-	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
+#	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
 #	payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf
 #	payload ../../../payloads/tg3_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
@@ -90,6 +90,7 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 #	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
 #	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
+	payload ../payload.elf
 end
 
 romimage "failover"
diff --git a/targets/supermicro/h8dmr/Config-lab.lb b/targets/supermicro/h8dmr/Config-lab.lb
new file mode 100644
index 0000000000..47cdc6454e
--- /dev/null
+++ b/targets/supermicro/h8dmr/Config-lab.lb
@@ -0,0 +1,48 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2007 AMD
+## Written by Yinghai Lu <yinghailu@gmail.com> for AMD.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+target h8dmr
+mainboard supermicro/h8dmr
+
+option ROM_SIZE=0x100000
+# 44K for ATI ROM in 1M; 4K for failover
+option FALLBACK_SIZE=(ROM_SIZE-0xC000)
+
+romimage "fallback" 
+	option USE_FAILOVER_IMAGE=0
+	option USE_FALLBACK_IMAGE=1
+	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+	option CONFIG_PRECOMPRESSED_PAYLOAD=1
+	option ROM_IMAGE_SIZE=0x18000
+	option XIP_ROM_SIZE=0x40000
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	payload ../payload.elf.lzma
+end
+
+romimage "failover"
+	option USE_FAILOVER_IMAGE=1
+	option USE_FALLBACK_IMAGE=0
+	option ROM_IMAGE_SIZE=FAILOVER_SIZE
+	option XIP_ROM_SIZE=FAILOVER_SIZE
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+end
+
+buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
diff --git a/targets/tyan/s2882/Config-lab.lb b/targets/tyan/s2882/Config-lab.lb
new file mode 100644
index 0000000000..b54dcd8d43
--- /dev/null
+++ b/targets/tyan/s2882/Config-lab.lb
@@ -0,0 +1,23 @@
+# Sample config file for 
+# the Tyan s2882 
+# This will make a target directory of ./s2882
+
+target s2882
+mainboard tyan/s2882
+
+option ROM_SIZE=0x100000
+# 36K for ATI ROM in 1M
+option FALLBACK_SIZE=(ROM_SIZE-0x9000)
+
+# Tyan s2882
+romimage "fallback" 
+	option USE_FALLBACK_IMAGE=1
+	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+	option CONFIG_PRECOMPRESSED_PAYLOAD=1
+	option ROM_IMAGE_SIZE=0x17000
+	option XIP_ROM_SIZE=0x40000
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	payload ../payload.elf.lzma
+end
+
+buildrom ./coreboot.rom ROM_SIZE "fallback"
diff --git a/targets/tyan/s2882/Config.lb b/targets/tyan/s2882/Config.lb
index 2e044c310c..f1f78cc2b3 100644
--- a/targets/tyan/s2882/Config.lb
+++ b/targets/tyan/s2882/Config.lb
@@ -26,8 +26,9 @@ romimage "normal"
 #        payload ../../../payloads/tg3--filo.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
+#	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+	payload ../payload.elf
 end
 
 romimage "fallback" 
@@ -44,8 +45,9 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--filo.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
+#	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+	payload ../payload.elf
 end
 
 buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2891/Config-lab.lb b/targets/tyan/s2891/Config-lab.lb
new file mode 100644
index 0000000000..24b5d066b6
--- /dev/null
+++ b/targets/tyan/s2891/Config-lab.lb
@@ -0,0 +1,23 @@
+# Sample config file for 
+# the Tyan s2891 
+# This will make a target directory of ./s2891
+
+target s2891
+mainboard tyan/s2891
+
+option ROM_SIZE=0x100000
+# 36K for ATI ROM in 1M
+option FALLBACK_SIZE=(ROM_SIZE-0x9000)
+
+# Tyan s2891
+romimage "fallback" 
+	option USE_FALLBACK_IMAGE=1
+	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+	option CONFIG_PRECOMPRESSED_PAYLOAD=1
+	option ROM_IMAGE_SIZE=0x17000
+	option XIP_ROM_SIZE=0x40000
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	payload ../payload.elf.lzma
+end
+
+buildrom ./coreboot.rom ROM_SIZE "fallback"
diff --git a/targets/tyan/s2891/Config.lb b/targets/tyan/s2891/Config.lb
index a42a21ffc6..8b4e0b01a7 100644
--- a/targets/tyan/s2891/Config.lb
+++ b/targets/tyan/s2891/Config.lb
@@ -27,13 +27,14 @@ romimage "normal"
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
 #        payload ../../../payloads/tg3--filo.zelf
-	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
+#	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga_com2.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga_5_3.zelf
 #	payload ../../../payloads/tg3--filo_btext_hda2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+	payload ../payload.elf
 end
 
 romimage "fallback" 
@@ -49,13 +50,14 @@ romimage "fallback"
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
 #        payload ../../../payloads/tg3--filo.zelf
-	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
+#	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga_com2.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga_5_3.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #	payload ../../../payloads/tg3--filo_btext_hda2.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+	payload ../payload.elf
 end
 
 buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"