From 76c6c95c1ee3d231ee861afba8dbc341f4c02e07 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 20 Nov 2008 20:07:38 +0000 Subject: [PATCH] fix Config-abuild.lb for all targets that need a failover image and don't have one (by fixing it for amd/serengeti_cheetah and copying the same file to all other broken targets) Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3763 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- .../amd/serengeti_cheetah/Config-abuild.lb | 16 +++++-- targets/asus/a8n_e/Config-abuild.lb | 35 ++++++++++++++ targets/gigabyte/m57sli/Config-abuild.lb | 47 ++++++++----------- targets/iwill/dk8_htx/Config-abuild.lb | 32 ++++++++----- targets/msi/ms7135/Config-abuild.lb | 35 ++++++++++++++ targets/nvidia/l1_2pvv/Config-abuild.lb | 47 ++++++++----------- targets/tyan/s2895/Config-abuild.lb | 35 ++++++++++++++ targets/tyan/s2912/Config-abuild.lb | 47 ++++++++----------- 8 files changed, 198 insertions(+), 96 deletions(-) create mode 100644 targets/asus/a8n_e/Config-abuild.lb create mode 100644 targets/msi/ms7135/Config-abuild.lb create mode 100644 targets/tyan/s2895/Config-abuild.lb diff --git a/targets/amd/serengeti_cheetah/Config-abuild.lb b/targets/amd/serengeti_cheetah/Config-abuild.lb index 57bc20faf6..322da5bfbd 100644 --- a/targets/amd/serengeti_cheetah/Config-abuild.lb +++ b/targets/amd/serengeti_cheetah/Config-abuild.lb @@ -9,19 +9,27 @@ option HOSTCC="CROSS_HOSTCC" __COMPRESSION__ -option ROM_SIZE=512*1024 - romimage "normal" + option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=0 option ROM_IMAGE_SIZE=0x20000 option COREBOOT_EXTRA_VERSION=".0-normal" payload __PAYLOAD__ end -romimage "fallback" +romimage "fallback" + option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=1 option ROM_IMAGE_SIZE=0x20000 option COREBOOT_EXTRA_VERSION=".0-fallback" payload __PAYLOAD__ end -buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" + +romimage "failover" + option USE_FAILOVER_IMAGE=1 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=FAILOVER_SIZE + option XIP_ROM_SIZE=FAILOVER_SIZE +end + +buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" diff --git a/targets/asus/a8n_e/Config-abuild.lb b/targets/asus/a8n_e/Config-abuild.lb new file mode 100644 index 0000000000..322da5bfbd --- /dev/null +++ b/targets/asus/a8n_e/Config-abuild.lb @@ -0,0 +1,35 @@ +# 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__ + +romimage "normal" + option USE_FAILOVER_IMAGE=0 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=0x20000 + option COREBOOT_EXTRA_VERSION=".0-normal" + payload __PAYLOAD__ +end + +romimage "fallback" + option USE_FAILOVER_IMAGE=0 + option USE_FALLBACK_IMAGE=1 + option ROM_IMAGE_SIZE=0x20000 + option COREBOOT_EXTRA_VERSION=".0-fallback" + payload __PAYLOAD__ +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 +end + +buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" diff --git a/targets/gigabyte/m57sli/Config-abuild.lb b/targets/gigabyte/m57sli/Config-abuild.lb index 18cad76c24..322da5bfbd 100644 --- a/targets/gigabyte/m57sli/Config-abuild.lb +++ b/targets/gigabyte/m57sli/Config-abuild.lb @@ -1,42 +1,35 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 Uwe Hermann -## -## 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 -## +# This will make a target directory of ./VENDOR_MAINBOARD -target gigabyte_m57sli -mainboard gigabyte/m57sli +target VENDOR_MAINBOARD +mainboard VENDOR/MAINBOARD + +option CC="CROSSCC" +option CROSS_COMPILE="CROSS_PREFIX" +option HOSTCC="CROSS_HOSTCC" __COMPRESSION__ romimage "normal" + option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=0 option ROM_IMAGE_SIZE=0x20000 - option XIP_ROM_SIZE=0x40000 - option COREBOOT_EXTRA_VERSION=".0-Normal" + option COREBOOT_EXTRA_VERSION=".0-normal" payload __PAYLOAD__ end -romimage "fallback" +romimage "fallback" + option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=1 option ROM_IMAGE_SIZE=0x20000 - option XIP_ROM_SIZE=0x40000 - option COREBOOT_EXTRA_VERSION=".0-Fallback" + option COREBOOT_EXTRA_VERSION=".0-fallback" payload __PAYLOAD__ end -buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" +romimage "failover" + option USE_FAILOVER_IMAGE=1 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=FAILOVER_SIZE + option XIP_ROM_SIZE=FAILOVER_SIZE +end + +buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" diff --git a/targets/iwill/dk8_htx/Config-abuild.lb b/targets/iwill/dk8_htx/Config-abuild.lb index 8332de0f18..322da5bfbd 100644 --- a/targets/iwill/dk8_htx/Config-abuild.lb +++ b/targets/iwill/dk8_htx/Config-abuild.lb @@ -1,25 +1,35 @@ -# This will make a target directory of ./iwill_dk8_htx +# This will make a target directory of ./VENDOR_MAINBOARD -target iwill_dk8_htx -mainboard iwill/dk8_htx +target VENDOR_MAINBOARD +mainboard VENDOR/MAINBOARD -option CC="gcc -m32" -option CROSS_COMPILE="" -option HOSTCC="gcc" +option CC="CROSSCC" +option CROSS_COMPILE="CROSS_PREFIX" +option HOSTCC="CROSS_HOSTCC" -option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 +__COMPRESSION__ romimage "normal" + option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=0 - option ROM_IMAGE_SIZE=0x17000 + option ROM_IMAGE_SIZE=0x20000 option COREBOOT_EXTRA_VERSION=".0-normal" payload __PAYLOAD__ end -romimage "fallback" +romimage "fallback" + option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=1 - option ROM_IMAGE_SIZE=0x17000 + option ROM_IMAGE_SIZE=0x20000 option COREBOOT_EXTRA_VERSION=".0-fallback" payload __PAYLOAD__ end -buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" + +romimage "failover" + option USE_FAILOVER_IMAGE=1 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=FAILOVER_SIZE + option XIP_ROM_SIZE=FAILOVER_SIZE +end + +buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" diff --git a/targets/msi/ms7135/Config-abuild.lb b/targets/msi/ms7135/Config-abuild.lb new file mode 100644 index 0000000000..322da5bfbd --- /dev/null +++ b/targets/msi/ms7135/Config-abuild.lb @@ -0,0 +1,35 @@ +# 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__ + +romimage "normal" + option USE_FAILOVER_IMAGE=0 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=0x20000 + option COREBOOT_EXTRA_VERSION=".0-normal" + payload __PAYLOAD__ +end + +romimage "fallback" + option USE_FAILOVER_IMAGE=0 + option USE_FALLBACK_IMAGE=1 + option ROM_IMAGE_SIZE=0x20000 + option COREBOOT_EXTRA_VERSION=".0-fallback" + payload __PAYLOAD__ +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 +end + +buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" diff --git a/targets/nvidia/l1_2pvv/Config-abuild.lb b/targets/nvidia/l1_2pvv/Config-abuild.lb index 5026ac4b3a..322da5bfbd 100644 --- a/targets/nvidia/l1_2pvv/Config-abuild.lb +++ b/targets/nvidia/l1_2pvv/Config-abuild.lb @@ -1,42 +1,35 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 Uwe Hermann -## -## 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 -## +# This will make a target directory of ./VENDOR_MAINBOARD -target nvidia_l1_2pvv -mainboard nvidia/l1_2pvv +target VENDOR_MAINBOARD +mainboard VENDOR/MAINBOARD + +option CC="CROSSCC" +option CROSS_COMPILE="CROSS_PREFIX" +option HOSTCC="CROSS_HOSTCC" __COMPRESSION__ romimage "normal" + option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=0 option ROM_IMAGE_SIZE=0x20000 - option XIP_ROM_SIZE=0x40000 - option COREBOOT_EXTRA_VERSION=".0-Normal" + option COREBOOT_EXTRA_VERSION=".0-normal" payload __PAYLOAD__ end -romimage "fallback" +romimage "fallback" + option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=1 option ROM_IMAGE_SIZE=0x20000 - option XIP_ROM_SIZE=0x40000 - option COREBOOT_EXTRA_VERSION=".0-Fallback" + option COREBOOT_EXTRA_VERSION=".0-fallback" payload __PAYLOAD__ end -buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" +romimage "failover" + option USE_FAILOVER_IMAGE=1 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=FAILOVER_SIZE + option XIP_ROM_SIZE=FAILOVER_SIZE +end + +buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" diff --git a/targets/tyan/s2895/Config-abuild.lb b/targets/tyan/s2895/Config-abuild.lb new file mode 100644 index 0000000000..322da5bfbd --- /dev/null +++ b/targets/tyan/s2895/Config-abuild.lb @@ -0,0 +1,35 @@ +# 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__ + +romimage "normal" + option USE_FAILOVER_IMAGE=0 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=0x20000 + option COREBOOT_EXTRA_VERSION=".0-normal" + payload __PAYLOAD__ +end + +romimage "fallback" + option USE_FAILOVER_IMAGE=0 + option USE_FALLBACK_IMAGE=1 + option ROM_IMAGE_SIZE=0x20000 + option COREBOOT_EXTRA_VERSION=".0-fallback" + payload __PAYLOAD__ +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 +end + +buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" diff --git a/targets/tyan/s2912/Config-abuild.lb b/targets/tyan/s2912/Config-abuild.lb index fc53090fd2..322da5bfbd 100644 --- a/targets/tyan/s2912/Config-abuild.lb +++ b/targets/tyan/s2912/Config-abuild.lb @@ -1,42 +1,35 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 Uwe Hermann -## -## 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 -## +# This will make a target directory of ./VENDOR_MAINBOARD -target tyan_s2912 -mainboard tyan/s2912 +target VENDOR_MAINBOARD +mainboard VENDOR/MAINBOARD + +option CC="CROSSCC" +option CROSS_COMPILE="CROSS_PREFIX" +option HOSTCC="CROSS_HOSTCC" __COMPRESSION__ romimage "normal" + option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=0 option ROM_IMAGE_SIZE=0x20000 - option XIP_ROM_SIZE=0x40000 - option COREBOOT_EXTRA_VERSION=".0-Normal" + option COREBOOT_EXTRA_VERSION=".0-normal" payload __PAYLOAD__ end -romimage "fallback" +romimage "fallback" + option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=1 option ROM_IMAGE_SIZE=0x20000 - option XIP_ROM_SIZE=0x40000 - option COREBOOT_EXTRA_VERSION=".0-Fallback" + option COREBOOT_EXTRA_VERSION=".0-fallback" payload __PAYLOAD__ end -buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" +romimage "failover" + option USE_FAILOVER_IMAGE=1 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=FAILOVER_SIZE + option XIP_ROM_SIZE=FAILOVER_SIZE +end + +buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"