Author: myles Date: 2008-02-06 23:39:12 +0100 (Wed, 06 Feb 2008) New Revision: 106
Removed: buildrom-devel/packages/coreboot-v2/patches/2761gxdk-fix-target.patch buildrom-devel/packages/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch buildrom-devel/packages/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch buildrom-devel/packages/coreboot-v2/patches/qemu-lab.patch buildrom-devel/packages/coreboot-v2/patches/qemu-payload.patch buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-lab.patch buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-payload.patch buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah_fam10-lab.patch buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-filo-Config.lb.patch buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-filo-Config.lb.patch buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch Modified: buildrom-devel/config/platforms/alix1c.conf buildrom-devel/config/platforms/db800.conf buildrom-devel/config/platforms/dbe61.conf buildrom-devel/config/platforms/ga-2761gxdk.conf buildrom-devel/config/platforms/m57sli.conf buildrom-devel/config/platforms/msm800sev.conf buildrom-devel/config/platforms/norwich.conf buildrom-devel/config/platforms/qemu.conf buildrom-devel/config/platforms/serengeti_cheetah.conf buildrom-devel/config/platforms/supermicro-h8dmr.conf buildrom-devel/config/platforms/tyan-s2882.conf buildrom-devel/config/platforms/tyan-s2891.conf buildrom-devel/packages/coreboot-v2/alix1c.mk buildrom-devel/packages/coreboot-v2/coreboot.inc buildrom-devel/packages/coreboot-v2/ga-2761gxdk.mk buildrom-devel/packages/coreboot-v2/generic.mk buildrom-devel/packages/coreboot-v2/m57sli.mk buildrom-devel/packages/coreboot-v2/msm800sev.mk buildrom-devel/packages/coreboot-v2/norwich.mk buildrom-devel/packages/coreboot-v2/qemu.mk buildrom-devel/packages/coreboot-v2/serengeti_cheetah.mk buildrom-devel/packages/coreboot-v2/supermicro-h8dmr.mk buildrom-devel/packages/coreboot-v2/tyan-s2882.mk buildrom-devel/packages/coreboot-v2/tyan-s2891.mk Log: This patch simplifies the handling of Config.lb files in buildrom. We no longer keep or patch config files in the buildrom tree. It also bumps the revision on the platforms to take advantage of the simplified Config.lb and Config-lab.lb files.
Myles
Signed-off-by: Myles Watson myles@pel.cs.byu.edu Acked-by: Ward Vandewege ward@gnu.org
Modified: buildrom-devel/config/platforms/alix1c.conf =================================================================== --- buildrom-devel/config/platforms/alix1c.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/alix1c.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -28,9 +28,9 @@ COREBOOT_VENDOR=pcengines COREBOOT_BOARD=alix1c CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=alix1c CBV2_TAG=3079 -COREBOOT_ROM_NAME=coreboot.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/db800.conf =================================================================== --- buildrom-devel/config/platforms/db800.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/db800.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -31,9 +31,9 @@ COREBOOT_VENDOR=amd COREBOOT_BOARD=db800 CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=db800 CBV2_TAG=3079 -COREBOOT_ROM_NAME=db800.rom
# FILO configuration # Use a new FILO config for the DB800 to autoload an image
Modified: buildrom-devel/config/platforms/dbe61.conf =================================================================== --- buildrom-devel/config/platforms/dbe61.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/dbe61.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -30,9 +30,9 @@ COREBOOT_VENDOR=artecgroup COREBOOT_BOARD=dbe61 CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=dbe61 CBV2_TAG=3079 -COREBOOT_ROM_NAME=dbe61.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/ga-2761gxdk.conf =================================================================== --- buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -35,9 +35,9 @@ COREBOOT_VENDOR=gigabyte COREBOOT_BOARD=ga_2761gxdk CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=ga_2761gxdk -CBV2_TAG=3079 -COREBOOT_ROM_NAME=coreboot.rom +CBV2_TAG=3092
# FILO configuration
Modified: buildrom-devel/config/platforms/m57sli.conf =================================================================== --- buildrom-devel/config/platforms/m57sli.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/m57sli.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -39,9 +39,9 @@ COREBOOT_VENDOR=gigabyte COREBOOT_BOARD=m57sli CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=m57sli -CBV2_TAG=3088 -COREBOOT_ROM_NAME=coreboot.rom +CBV2_TAG=3092
# FILO configuration
Modified: buildrom-devel/config/platforms/msm800sev.conf =================================================================== --- buildrom-devel/config/platforms/msm800sev.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/msm800sev.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -29,9 +29,9 @@ COREBOOT_VENDOR=digitallogic COREBOOT_BOARD=msm800sev CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=msm800sev CBV2_TAG=3079 -COREBOOT_ROM_NAME=coreboot.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/norwich.conf =================================================================== --- buildrom-devel/config/platforms/norwich.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/norwich.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -29,9 +29,9 @@ COREBOOT_VENDOR=amd COREBOOT_BOARD=norwich CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=norwich CBV2_TAG=3079 -COREBOOT_ROM_NAME=norwich.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/qemu.conf =================================================================== --- buildrom-devel/config/platforms/qemu.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/qemu.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -24,15 +24,15 @@ ETHERBOOT_ARCH=i386
# coreboot-v2 configuration -CBV2_TAG=3079 +CBV2_TAG=3092 CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=qemu-i386
# coreboot v3 configuration CBV3_CONFIG=qemu-i386-defconfig CBV3_TAG=HEAD
-COREBOOT_ROM_NAME=qemu.rom COREBOOT_VENDOR=emulation COREBOOT_BOARD=qemu-i386
Modified: buildrom-devel/config/platforms/serengeti_cheetah.conf =================================================================== --- buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -44,18 +44,16 @@
COREBOOT_VENDOR=amd CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf
ifeq ($(CONFIG_PLATFORM_CHEETAH_FAM10),y) COREBOOT_BOARD=serengeti_cheetah_fam10 CBV2_TDIR=serengeti_cheetah_fam10 -CBV2_TAG=3085 -COREBOOT_ROM_NAME=amd-cheetah-fam10.rom +CBV2_TAG=3092 else COREBOOT_BOARD=serengeti_cheetah -CBV2_CONFIG=Config.lb CBV2_TDIR=serengeti_cheetah -CBV2_TAG=3086 -COREBOOT_ROM_NAME=serengeti_cheetah.rom +CBV2_TAG=3092 endif
# FILO configuration
Modified: buildrom-devel/config/platforms/supermicro-h8dmr.conf =================================================================== --- buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -39,9 +39,9 @@ COREBOOT_VENDOR=supermicro COREBOOT_BOARD=h8dmr CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=h8dmr -CBV2_TAG=3079 -COREBOOT_ROM_NAME=coreboot.rom +CBV2_TAG=3092
# FILO configuration
Modified: buildrom-devel/config/platforms/tyan-s2882.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2882.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/tyan-s2882.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -39,9 +39,9 @@ COREBOOT_VENDOR=tyan COREBOOT_BOARD=s2882 CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=s2882 -CBV2_TAG=3079 -COREBOOT_ROM_NAME=coreboot.rom +CBV2_TAG=3092
# FILO configuration
Modified: buildrom-devel/config/platforms/tyan-s2891.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2891.conf 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/config/platforms/tyan-s2891.conf 2008-02-06 22:39:12 UTC (rev 106) @@ -39,9 +39,9 @@ COREBOOT_VENDOR=tyan COREBOOT_BOARD=s2891 CBV2_CONFIG=Config.lb +CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=s2891 -CBV2_TAG=3079 -COREBOOT_ROM_NAME=coreboot.rom +CBV2_TAG=3092
# FILO configuration
Modified: buildrom-devel/packages/coreboot-v2/alix1c.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/alix1c.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/alix1c.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -9,7 +9,7 @@ CBV2_BASE_DIR=svn CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/ CBV2_VSA=lx_vsa.36k.bin TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
Modified: buildrom-devel/packages/coreboot-v2/coreboot.inc =================================================================== --- buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-02-06 22:39:12 UTC (rev 106) @@ -15,7 +15,7 @@ endif endif
-CBV2_OUTPUT=$(CBV2_BUILD_DIR)/$(COREBOOT_ROM_NAME) +CBV2_OUTPUT=$(CBV2_BUILD_DIR)/coreboot.rom CBV2_DIR=$(BUILD_DIR)/coreboot
# If the user wanted to override the build directory - obey that now
Modified: buildrom-devel/packages/coreboot-v2/ga-2761gxdk.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/ga-2761gxdk.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/ga-2761gxdk.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -6,12 +6,12 @@ endif endif
-CBV2_PATCHES=$(PACKAGE_DIR)/coreboot-v2/patches/2761gxdk-fix-target.patch +CBV2_PATCHES=
CBV2_BASE_DIR=svn CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
Modified: buildrom-devel/packages/coreboot-v2/generic.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/generic.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/generic.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -9,7 +9,7 @@ CBV2_BASE_DIR=svn CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
# This is the list of components that comprise the ROM (excluding the payload)
Modified: buildrom-devel/packages/coreboot-v2/m57sli.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/m57sli.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/m57sli.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -1,5 +1,3 @@ -# This is the Generic coreboot target - ifeq ($(CONFIG_PLATFORM),y) ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) @@ -8,27 +6,21 @@
CBV2_PATCHES=
-ifeq ($(CONFIG_PAYLOAD_FILO),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch -endif - -ifeq ($(CONFIG_PAYLOAD_ETHERBOOT),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch -endif - ifeq ($(CONFIG_PAYLOAD_KERNEL),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif
ifeq ($(CONFIG_PAYLOAD_LAB),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif
CBV2_BASE_DIR=svn CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
Modified: buildrom-devel/packages/coreboot-v2/msm800sev.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/msm800sev.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/msm800sev.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -9,7 +9,7 @@ CBV2_BASE_DIR=svn CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/ CBV2_VSA=lx_vsa.36k.bin TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
Modified: buildrom-devel/packages/coreboot-v2/norwich.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/norwich.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/norwich.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -11,7 +11,7 @@ CBV2_BASE_DIR=svn CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/ CBV2_VSA=lx_vsa.36k.bin TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
Deleted: buildrom-devel/packages/coreboot-v2/patches/2761gxdk-fix-target.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/2761gxdk-fix-target.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/2761gxdk-fix-target.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,24 +0,0 @@ -Index: svn/targets/gigabyte/ga_2761gxdk/Config.lb -=================================================================== ---- svn.orig/targets/gigabyte/ga_2761gxdk/Config.lb 2008-01-18 11:50:03.000000000 -0700 -+++ svn/targets/gigabyte/ga_2761gxdk/Config.lb 2008-01-28 11:28:24.000000000 -0700 -@@ -32,7 +32,8 @@ - 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 @@ - 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"
Deleted: buildrom-devel/packages/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,96 +0,0 @@ -Index: svn/targets/gigabyte/m57sli/Config.lb -=================================================================== ---- svn.orig/targets/gigabyte/m57sli/Config.lb 2008-01-18 11:50:03.000000000 -0700 -+++ svn/targets/gigabyte/m57sli/Config.lb 2008-01-18 13:33:03.000000000 -0700 -@@ -22,82 +22,30 @@ - target m57sli - mainboard gigabyte/m57sli - --# serengeti_leopard - romimage "normal" --# 48K for SCSI FW --# option ROM_SIZE = 475136 --# 48K for SCSI FW and 48K for ATI ROM --# option ROM_SIZE = 425984 --# 64K for Etherboot --# option ROM_SIZE = 458752 --# 44k for atixx.rom --# option ROM_SIZE = 479232 -- option USE_FAILOVER_IMAGE=0 -+ option USE_FAILOVER_IMAGE=0 - option USE_FALLBACK_IMAGE=0 --# option ROM_IMAGE_SIZE=0x13800 --# option ROM_IMAGE_SIZE=0x18800 - option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x15800 - option XIP_ROM_SIZE=0x40000 - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# payload ../../../payloads/tg3.zelf --# payload ../../../../payloads/tg3_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf --# payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf -- payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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" -- option USE_FAILOVER_IMAGE=0 -+ option USE_FAILOVER_IMAGE=0 - option USE_FALLBACK_IMAGE=1 --# option ROM_IMAGE_SIZE=0x13800 --# option ROM_IMAGE_SIZE=0x19800 - option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x15800 - option XIP_ROM_SIZE=0x40000 - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# payload ../../../payloads/tg3.zelf --# payload ../../../../payloads/tg3_vga.zelf --# payload ../../../../payloads/memtest --# payload ../../../../payloads/e1000_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga.zelf --# payload ../../../../payloads/filo_hda.zelf --# 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.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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" -- 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" -+ 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 "normal" "fallback"
Deleted: buildrom-devel/packages/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,101 +0,0 @@ ---- LinuxBIOSv2/targets/gigabyte/m57sli/Config.lb-orig 2007-08-14 14:49:13.000000000 -0400 -+++ LinuxBIOSv2/targets/gigabyte/m57sli/Config.lb 2007-08-21 17:56:34.000000000 -0400 -@@ -19,86 +19,32 @@ - ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - ## - -+# Sample config file for -+ - target m57sli - mainboard gigabyte/m57sli - --# serengeti_leopard --romimage "normal" --# 48K for SCSI FW --# option ROM_SIZE = 475136 --# 48K for SCSI FW and 48K for ATI ROM --# option ROM_SIZE = 425984 --# 64K for Etherboot --# option ROM_SIZE = 458752 --# 44k for atixx.rom --# option ROM_SIZE = 479232 -- option USE_FAILOVER_IMAGE=0 -- option USE_FALLBACK_IMAGE=0 --# option ROM_IMAGE_SIZE=0x13800 --# option ROM_IMAGE_SIZE=0x18800 -- option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x15800 -- option XIP_ROM_SIZE=0x40000 -- option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# payload ../../../payloads/tg3.zelf --# payload ../../../../payloads/tg3_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf --# payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf -- payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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 --end -+option ROM_SIZE=0x100000 -+option FALLBACK_SIZE=(ROM_SIZE-0x1000) - - romimage "fallback" -- option USE_FAILOVER_IMAGE=0 -+ option USE_FAILOVER_IMAGE=0 - option USE_FALLBACK_IMAGE=1 --# option ROM_IMAGE_SIZE=0x13800 --# option ROM_IMAGE_SIZE=0x19800 -- option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x15800 -+ 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 ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# payload ../../../payloads/tg3.zelf --# payload ../../../../payloads/tg3_vga.zelf --# payload ../../../../payloads/memtest --# payload ../../../../payloads/e1000_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga.zelf --# payload ../../../../payloads/filo_hda.zelf --# 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.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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" -- option USE_FAILOVER_IMAGE=1 -+ 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 "normal" "fallback" --buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" -+ -+buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
Deleted: buildrom-devel/packages/coreboot-v2/patches/qemu-lab.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/qemu-lab.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/qemu-lab.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,28 +0,0 @@ -Index: svn/targets/emulation/qemu-i386/Config.lb -=================================================================== ---- svn/targets/emulation/qemu-i386/Config.lb (revision 2950) -+++ svn/targets/emulation/qemu-i386/Config.lb (working copy) -@@ -3,7 +3,9 @@ - target qemu-i386 - mainboard emulation/qemu-i386 - --option ROM_SIZE=256*1024 -+option ROM_SIZE=2048*1024 -+option CONFIG_COMPRESSED_PAYLOAD_LZMA=0 -+option CONFIG_PRECOMPRESSED_PAYLOAD=0 - - option CC="gcc -m32" - -@@ -12,9 +14,9 @@ - - romimage "image" - option ROM_IMAGE_SIZE=0x10000 -- option LINUXBIOS_EXTRA_VERSION="-GRUB2" -- payload /home/stepan/core.img -+ option LINUXBIOS_EXTRA_VERSION="-LAB" -+ payload ../payload.elf - end - --buildrom ./qemu-bios.rom ROM_SIZE "image" -+buildrom ./qemu.rom ROM_SIZE "image" -
Deleted: buildrom-devel/packages/coreboot-v2/patches/qemu-payload.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/qemu-payload.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/qemu-payload.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,24 +0,0 @@ -Index: svn/targets/emulation/qemu-i386/Config.lb -=================================================================== ---- svn.orig/targets/emulation/qemu-i386/Config.lb 2008-01-18 11:50:03.000000000 -0700 -+++ svn/targets/emulation/qemu-i386/Config.lb 2008-01-18 13:40:00.000000000 -0700 -@@ -4,6 +4,8 @@ - mainboard emulation/qemu-i386 - - option ROM_SIZE=256*1024 -+option CONFIG_COMPRESSED_PAYLOAD_LZMA=0 -+option CONFIG_PRECOMPRESSED_PAYLOAD=0 - - option CC="gcc -m32" - -@@ -13,8 +15,8 @@ - romimage "image" - option ROM_IMAGE_SIZE=0x10000 - option COREBOOT_EXTRA_VERSION="-GRUB2" -- payload /home/stepan/core.img -+ payload ../payload.elf - end - --buildrom ./qemu-bios.rom ROM_SIZE "image" -+buildrom ./qemu.rom ROM_SIZE "image" -
Deleted: buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-lab.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-lab.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-lab.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,98 +0,0 @@ -Index: svn/targets/amd/serengeti_cheetah/Config.lb -=================================================================== ---- svn/targets/amd/serengeti_cheetah/Config.lb (revision 2950) -+++ svn/targets/amd/serengeti_cheetah/Config.lb (working copy) -@@ -5,81 +5,20 @@ - target serengeti_cheetah - mainboard amd/serengeti_cheetah - --# serengeti_leopard --romimage "normal" --# 48K for SCSI FW --# option ROM_SIZE = 475136 --# 48K for SCSI FW and 48K for ATI ROM --# option ROM_SIZE = 425984 --# 64K for Etherboot --# option ROM_SIZE = 458752 -- option USE_FAILOVER_IMAGE=0 -- option USE_FALLBACK_IMAGE=0 --# option ROM_IMAGE_SIZE=0x13800 --# option ROM_IMAGE_SIZE=0x18800 -- option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x15800 -- option XIP_ROM_SIZE=0x40000 -- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# 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/e1000_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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 --end -+option ROM_SIZE = 0x100000 -+option USE_FAILOVER_IMAGE=0 -+option HAVE_FAILOVER_BOOT=0 -+option FAILOVER_SIZE=0 - --romimage "fallback" -- option USE_FAILOVER_IMAGE=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=0x13800 --# option ROM_IMAGE_SIZE=0x19800 -- option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x15800 -+ option ROM_IMAGE_SIZE=0x1a000 - option XIP_ROM_SIZE=0x40000 -- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# payload ../../../payloads/tg3.zelf --# payload ../../../../payloads/tg3_vga.zelf --# payload ../../../../payloads/memtest --# payload ../../../../payloads/adlo.elf --# payload ../../../../payloads/e1000_vga.zelf --# 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/filo_hda2_novga.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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 -+ option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" -+ payload ../payload.elf - 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 LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover" --end -- -- --buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" --#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" -+buildrom ./serengeti_cheetah.rom ROM_SIZE "fallback"
Deleted: buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-payload.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-payload.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-payload.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,65 +0,0 @@ -Index: svn/targets/amd/serengeti_cheetah/Config.lb -=================================================================== ---- svn.orig/targets/amd/serengeti_cheetah/Config.lb 2008-01-18 11:50:04.000000000 -0700 -+++ svn/targets/amd/serengeti_cheetah/Config.lb 2008-01-28 13:48:15.000000000 -0700 -@@ -21,23 +21,7 @@ - # option ROM_IMAGE_SIZE=0x15800 - option XIP_ROM_SIZE=0x40000 - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# 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/e1000_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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" -@@ -49,27 +33,7 @@ - # option ROM_IMAGE_SIZE=0x15800 - option XIP_ROM_SIZE=0x40000 - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# payload ../../../payloads/tg3.zelf --# payload ../../../../payloads/tg3_vga.zelf --# payload ../../../../payloads/memtest --# payload ../../../../payloads/adlo.elf --# payload ../../../../payloads/e1000_vga.zelf --# 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/filo_hda2_novga.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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" -@@ -81,5 +45,4 @@ - end - - --buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" --#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" -+buildrom ./serengeti_cheetah.rom ROM_SIZE "normal" "fallback" "failover"
Deleted: buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah_fam10-lab.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah_fam10-lab.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah_fam10-lab.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,44 +0,0 @@ -Index: svn/targets/amd/serengeti_cheetah_fam10/Config.lb -=================================================================== ---- svn/targets/amd/serengeti_cheetah_fam10/Config.lb (revision 3018) -+++ svn/targets/amd/serengeti_cheetah_fam10/Config.lb (working copy) -@@ -29,29 +29,14 @@ - # At a maximum only compile in this level of debugging - option MAXIMUM_CONSOLE_LOGLEVEL=11 - --# 512KB ROM --option ROM_SIZE=512*1024 -+# 1024KB ROM -+option ROM_SIZE=1024*1024 -+option FALLBACK_SIZE=ROM_SIZE-FAILOVER_SIZE - --# Cheetah Family 10 --#romimage "normal" --# 1MB ROM --# option ROM_SIZE = 0x100000 --# option USE_FAILOVER_IMAGE=0 --# option USE_FALLBACK_IMAGE=0 --# option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x30000 --# option XIP_ROM_SIZE=0x40000 --# option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../payload.elf --#end -- - romimage "fallback" - option USE_FAILOVER_IMAGE=0 - option USE_FALLBACK_IMAGE=1 --# option ROM_IMAGE_SIZE=0x13800 --# option ROM_IMAGE_SIZE=0x19800 -- option ROM_IMAGE_SIZE=0x3f000 --# option ROM_IMAGE_SIZE=0x15800 -+ option ROM_IMAGE_SIZE=0x30000 - option XIP_ROM_SIZE=0x40000 - option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" - payload ../payload.elf -@@ -65,6 +50,5 @@ - option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover" - end - --#buildrom ./amd-cheetah-fam10.rom ROM_SIZE "normal" "fallback" "failover" - buildrom ./amd-cheetah-fam10.rom ROM_SIZE "fallback" "failover"
Deleted: buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,87 +0,0 @@ -Index: svn/targets/supermicro/h8dmr/Config.lb -=================================================================== ---- svn.orig/targets/supermicro/h8dmr/Config.lb 2008-01-18 13:09:01.000000000 -0700 -+++ svn/targets/supermicro/h8dmr/Config.lb 2008-01-18 13:09:04.000000000 -0700 -@@ -22,73 +22,25 @@ - target h8dmr - mainboard supermicro/h8dmr - -+# 44K for ATI ROM in 1M -+option ROM_SIZE = 1024*1024-44*1024 -+ - romimage "normal" --# 48K for SCSI FW --# option ROM_SIZE = 475136 --# 48K for SCSI FW and 48K for ATI ROM --# option ROM_SIZE = 425984 --# 64K for Etherboot --# option ROM_SIZE = 458752 --# 44k for atixx.rom --# option ROM_SIZE = 479232 -- option USE_FAILOVER_IMAGE=0 -+ # 44K for ATI ROM in 1M -+ #option ROM_SIZE = 1024*1024-44*1024 - option USE_FALLBACK_IMAGE=0 --# option ROM_IMAGE_SIZE=0x13800 --# option ROM_IMAGE_SIZE=0x18800 - option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x15800 -- option XIP_ROM_SIZE=0x40000 -+ option XIP_ROM_SIZE=0x20000 - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# payload ../../../payloads/tg3.zelf --# payload ../../../../payloads/tg3_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf --# payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf -- payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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" -- option USE_FAILOVER_IMAGE=0 - option USE_FALLBACK_IMAGE=1 --# option ROM_IMAGE_SIZE=0x13800 --# option ROM_IMAGE_SIZE=0x19800 - option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x15800 -- option XIP_ROM_SIZE=0x40000 -+ option XIP_ROM_SIZE=0x20000 - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# payload ../../../payloads/tg3.zelf --# payload ../../../../payloads/tg3_vga.zelf --# payload ../../../../payloads/memtest --# payload ../../../../payloads/e1000_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga.zelf --# payload ../../../../payloads/filo_hda.zelf --# 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.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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"
Deleted: buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,102 +0,0 @@ -Index: Config.lb -=================================================================== ---- LinuxBIOSv2/targets/supermicro/h8dmr/Config.lb 2008-05-29 14:42:05.000000000 -0400 -+++ LinuxBIOSv2/targets/supermicro/h8dmr/Config.lb 2007-11-30 13:54:40.000000000 -0500 -@@ -22,82 +22,28 @@ - target h8dmr - mainboard supermicro/h8dmr - --romimage "normal" --# 48K for SCSI FW --# option ROM_SIZE = 475136 --# 48K for SCSI FW and 48K for ATI ROM --# option ROM_SIZE = 425984 --# 64K for Etherboot --# option ROM_SIZE = 458752 --# 44k for atixx.rom --# option ROM_SIZE = 479232 -- option USE_FAILOVER_IMAGE=0 -- option USE_FALLBACK_IMAGE=0 --# option ROM_IMAGE_SIZE=0x13800 --# option ROM_IMAGE_SIZE=0x18800 -- option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x15800 -- option XIP_ROM_SIZE=0x40000 -- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# payload ../../../payloads/tg3.zelf --# payload ../../../../payloads/tg3_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf --# payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf -- payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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 --end -+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_FAILOVER_IMAGE=0 - option USE_FALLBACK_IMAGE=1 --# option ROM_IMAGE_SIZE=0x13800 --# option ROM_IMAGE_SIZE=0x19800 -- option ROM_IMAGE_SIZE=0x20000 --# option ROM_IMAGE_SIZE=0x15800 -+ option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 -+ option CONFIG_PRECOMPRESSED_PAYLOAD=1 -+ option ROM_IMAGE_SIZE=0x18000 - option XIP_ROM_SIZE=0x40000 - option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# payload ../../../payloads/tg3--filo_hda2.zelf --# payload ../../../payloads/tg3.zelf --# payload ../../../../payloads/tg3_vga.zelf --# payload ../../../../payloads/memtest --# payload ../../../../payloads/e1000_vga.zelf --# payload ../../../../payloads/tg3--filo_hda2_vga.zelf --# payload ../../../../payloads/filo_hda.zelf --# 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.zelf --# payload ../../../payloads/tg3_com2.zelf --# payload ../../../payloads/e1000--filo.zelf --# payload ../../../payloads/tg3--e1000--filo.zelf --# 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" -- option USE_FAILOVER_IMAGE=1 -- option USE_FALLBACK_IMAGE=0 -- option ROM_IMAGE_SIZE=FAILOVER_SIZE -- option XIP_ROM_SIZE=FAILOVER_SIZE -- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover" -+ option USE_FAILOVER_IMAGE=1 -+ option USE_FALLBACK_IMAGE=0 -+ option ROM_IMAGE_SIZE=FAILOVER_SIZE -+ option XIP_ROM_SIZE=FAILOVER_SIZE -+ option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover" - end - --#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" --buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" -+ -+buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
Deleted: buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-filo-Config.lb.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-filo-Config.lb.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-filo-Config.lb.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,56 +0,0 @@ -Index: svn/targets/tyan/s2882/Config.lb -=================================================================== ---- svn.orig/targets/tyan/s2882/Config.lb 2008-01-18 11:50:04.000000000 -0700 -+++ svn/targets/tyan/s2882/Config.lb 2008-01-18 13:45:33.000000000 -0700 -@@ -7,45 +7,21 @@ - - # Tyan s2882 - romimage "normal" --# 48K for SCSI FW or ATI ROM -- option ROM_SIZE = 512*1024-48*1024 --# 48K for SCSI FW and 48K for ATI ROM --# option ROM_SIZE = 512*1024-48*1024-48*1024 --# 64K for Etherboot --# option ROM_SIZE = 512*1024-64*1024 -+ # 36K for ATI ROM in 1M -+ option ROM_SIZE = 1024*1024-36*1024 - option USE_FALLBACK_IMAGE=0 --# option ROM_IMAGE_SIZE=0x11800 --# option ROM_IMAGE_SIZE=0x16000 - option ROM_IMAGE_SIZE=0x20000 -- option XIP_ROM_SIZE=0x20000 -+ option XIP_ROM_SIZE=0x20000 - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# 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--eepro100--e1000--filo_hda2.zelf -+ payload ../payload.elf - end - - romimage "fallback" - option USE_FALLBACK_IMAGE=1 --# option ROM_IMAGE_SIZE=0x11800 --# option ROM_IMAGE_SIZE=0x16000 - option ROM_IMAGE_SIZE=0x20000 -- option XIP_ROM_SIZE=0x20000 -+ option XIP_ROM_SIZE=0x20000 - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# 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--eepro100--e1000--filo_hda2.zelf -+ payload ../payload.elf - end - - buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
Deleted: buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,62 +0,0 @@ -Index: LinuxBIOSv2/targets/tyan/s2882/Config.lb -=================================================================== ---- LinuxBIOSv2/targets/tyan/s2882/Config.lb (revision 2867) -+++ LinuxBIOSv2/targets/tyan/s2882/Config.lb (working copy) -@@ -5,47 +5,19 @@ - target s2882 - mainboard tyan/s2882 - --# Tyan s2882 --romimage "normal" --# 48K for SCSI FW or ATI ROM -- option ROM_SIZE = 512*1024-48*1024 --# 48K for SCSI FW and 48K for ATI ROM --# option ROM_SIZE = 512*1024-48*1024-48*1024 --# 64K for Etherboot --# option ROM_SIZE = 512*1024-64*1024 -- option USE_FALLBACK_IMAGE=0 --# option ROM_IMAGE_SIZE=0x11800 --# option ROM_IMAGE_SIZE=0x16000 -- option ROM_IMAGE_SIZE=0x20000 -- option XIP_ROM_SIZE=0x20000 -- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# 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--eepro100--e1000--filo_hda2.zelf --end -+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 ROM_IMAGE_SIZE=0x11800 --# option ROM_IMAGE_SIZE=0x16000 -- option ROM_IMAGE_SIZE=0x20000 -- option XIP_ROM_SIZE=0x20000 -+ option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 -+ option CONFIG_PRECOMPRESSED_PAYLOAD=1 -+ option ROM_IMAGE_SIZE=0x17000 -+ option XIP_ROM_SIZE=0x40000 - option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# payload ../../../payloads/filo_mem.elf --# payload ../../../payloads/filo.zelf --# 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--eepro100--e1000--filo_hda2.zelf -+ payload ../payload.elf - end - --buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" -+buildrom ./coreboot.rom ROM_SIZE "fallback"
Deleted: buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-filo-Config.lb.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-filo-Config.lb.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-filo-Config.lb.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,66 +0,0 @@ -Index: svn/targets/tyan/s2891/Config.lb -=================================================================== ---- svn.orig/targets/tyan/s2891/Config.lb 2008-01-18 11:50:04.000000000 -0700 -+++ svn/targets/tyan/s2891/Config.lb 2008-01-18 13:48:08.000000000 -0700 -@@ -7,55 +7,21 @@ - - # Tyan s2891 - romimage "normal" --# 48K for ATI ROM in 1M -- option ROM_SIZE = 1024*1024-48*1024 --# 48K for SCSI FW or ATI ROM --# option ROM_SIZE = 512*1024-48*1024 --# 48K for SCSI FW and 48K for ATI ROM --# option ROM_SIZE = 512*1024-48*1024-48*1024 --# 64K for Etherboot --# option ROM_SIZE = 512*1024-64*1024 -+ # 36K for ATI ROM in 1M -+ option ROM_SIZE = 1024*1024-36*1024 - option USE_FALLBACK_IMAGE=0 --# option ROM_IMAGE_SIZE=0x11800 --# option ROM_IMAGE_SIZE=0x13000 --# option ROM_IMAGE_SIZE=0x16000 - option ROM_IMAGE_SIZE=0x20000 -- option XIP_ROM_SIZE=0x20000 -+ option XIP_ROM_SIZE=0x20000 - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# 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_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" - option USE_FALLBACK_IMAGE=1 --# option ROM_IMAGE_SIZE=0x11800 --# option ROM_IMAGE_SIZE=0x13000 --# option ROM_IMAGE_SIZE=0x16000 - option ROM_IMAGE_SIZE=0x20000 -- option XIP_ROM_SIZE=0x20000 -+ option XIP_ROM_SIZE=0x20000 - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# 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_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"
Deleted: buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch 2008-02-06 22:39:12 UTC (rev 106) @@ -1,70 +0,0 @@ ---- LinuxBIOSv2/targets/tyan/s2891/Config.lb 2007-09-26 16:37:35.000000000 -0400 -+++ LinuxBIOSv2/targets/tyan/s2891/Config.lb 2007-09-26 18:09:54.000000000 -0400 -@@ -5,57 +5,19 @@ - target s2891 - mainboard tyan/s2891 - --# Tyan s2891 --romimage "normal" --# 48K for ATI ROM in 1M -- option ROM_SIZE = 1024*1024-48*1024 --# 48K for SCSI FW or ATI ROM --# option ROM_SIZE = 512*1024-48*1024 --# 48K for SCSI FW and 48K for ATI ROM --# option ROM_SIZE = 512*1024-48*1024-48*1024 --# 64K for Etherboot --# option ROM_SIZE = 512*1024-64*1024 -- option USE_FALLBACK_IMAGE=0 --# option ROM_IMAGE_SIZE=0x11800 --# option ROM_IMAGE_SIZE=0x13000 --# option ROM_IMAGE_SIZE=0x16000 -- option ROM_IMAGE_SIZE=0x20000 -- option XIP_ROM_SIZE=0x20000 -- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# 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_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 --end -+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 ROM_IMAGE_SIZE=0x11800 --# option ROM_IMAGE_SIZE=0x13000 --# option ROM_IMAGE_SIZE=0x16000 -- option ROM_IMAGE_SIZE=0x20000 -- option XIP_ROM_SIZE=0x20000 -+ option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 -+ option CONFIG_PRECOMPRESSED_PAYLOAD=1 -+ option ROM_IMAGE_SIZE=0x17000 -+ option XIP_ROM_SIZE=0x40000 - option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" --# payload ../../../payloads/tg3--ide_disk.zelf --# payload ../../../payloads/filo.elf --# 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_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" -+buildrom ./coreboot.rom ROM_SIZE "fallback"
Modified: buildrom-devel/packages/coreboot-v2/qemu.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/qemu.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/qemu.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -10,12 +10,11 @@
CBV2_BASE_DIR=svn TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT)
ifeq ($(CONFIG_PAYLOAD_LAB),y) -CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/qemu-lab.patch -else -CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/qemu-payload.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif
CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2
Modified: buildrom-devel/packages/coreboot-v2/serengeti_cheetah.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/serengeti_cheetah.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/serengeti_cheetah.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -18,15 +18,15 @@
ifeq ($(CONFIG_PLATFORM_CHEETAH_FAM10),y) ifeq ($(CONFIG_PAYLOAD_LAB),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/serengeti_cheetah_fam10-lab.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif endif
ifeq ($(CONFIG_PLATFORM_SERENGETI_CHEETAH),y) ifeq ($(CONFIG_PAYLOAD_LAB),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/serengeti_cheetah-lab.patch -else - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/serengeti_cheetah-payload.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif
ifeq ($(CONFIG_SIMNOW),y) @@ -37,7 +37,7 @@ CBV2_BASE_DIR=svn CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
Modified: buildrom-devel/packages/coreboot-v2/supermicro-h8dmr.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/supermicro-h8dmr.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/supermicro-h8dmr.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -1,5 +1,3 @@ -# This is the Generic coreboot target - ifeq ($(CONFIG_PLATFORM),y) ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) @@ -8,27 +6,21 @@
CBV2_PATCHES =
-ifeq ($(CONFIG_PAYLOAD_FILO),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch -endif - -ifeq ($(CONFIG_PAYLOAD_ETHERBOOT),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch -endif - ifeq ($(CONFIG_PAYLOAD_KERNEL),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif
ifeq ($(CONFIG_PAYLOAD_LAB),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif
CBV2_BASE_DIR=svn CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
Modified: buildrom-devel/packages/coreboot-v2/tyan-s2882.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/tyan-s2882.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/tyan-s2882.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -8,23 +8,21 @@
CBV2_PATCHES =
-ifeq ($(CONFIG_PAYLOAD_FILO),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2882-filo-Config.lb.patch -endif - ifeq ($(CONFIG_PAYLOAD_KERNEL),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif
ifeq ($(CONFIG_PAYLOAD_LAB),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif
CBV2_BASE_DIR=svn CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
Modified: buildrom-devel/packages/coreboot-v2/tyan-s2891.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/tyan-s2891.mk 2008-02-06 17:47:15 UTC (rev 105) +++ buildrom-devel/packages/coreboot-v2/tyan-s2891.mk 2008-02-06 22:39:12 UTC (rev 106) @@ -8,23 +8,21 @@
CBV2_PATCHES =
-ifeq ($(CONFIG_PAYLOAD_FILO),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2891-filo-Config.lb.patch -endif - ifeq ($(CONFIG_PAYLOAD_KERNEL),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif
ifeq ($(CONFIG_PAYLOAD_LAB),y) - CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch + CBV2_CONFIG = Config-lab.lb + CBV2_PAYLOAD_FILE_EXT = elf.lzma endif
CBV2_BASE_DIR=svn CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz -CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc