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

3 files changed, 82 insertions, 2 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"
+