28 Jan
2008
28 Jan
'08
11:20 p.m.
Hey all. Attached is the final step in the LinuxBIOS->coreboot renaming for buildrom. This revision bumps the coreboot revision on all platforms to handle the renaming, and also to take advantage of some bug fixes. All platforms supported by buildrom are now compiling, even on ubuntu.
Jordan
--
Jordan Crouse
Systems Software Development Engineer
Advanced Micro Devices, Inc.
[BUILDROM]: Fixup all of the coreboot SVN revisions
Bump all platforms to newer versions of the coreboot SVN to take into
account the renaming and bug fixes.
Signed-off-by: Jordan Crouse jordan.crouse@amd.com
Index: buildrom-devel/config/platforms/alix1c.conf
===================================================================
--- buildrom-devel.orig/config/platforms/alix1c.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/alix1c.conf 2008-01-28 16:17:15.000000000 -0700
@@ -29,8 +29,8 @@
COREBOOT_BOARD=alix1c
CBV2_CONFIG=Config.lb
CBV2_TDIR=alix1c
-CBV2_TAG=3047
-COREBOOT_ROM_NAME=linuxbios.rom
+CBV2_TAG=3079
+COREBOOT_ROM_NAME=coreboot.rom
# FILO configuration
Index: buildrom-devel/config/platforms/db800.conf
===================================================================
--- buildrom-devel.orig/config/platforms/db800.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/db800.conf 2008-01-28 16:17:15.000000000 -0700
@@ -32,7 +32,7 @@
COREBOOT_BOARD=db800
CBV2_CONFIG=Config.lb
CBV2_TDIR=db800
-CBV2_TAG=2810
+CBV2_TAG=3079
COREBOOT_ROM_NAME=db800.rom
# FILO configuration
Index: buildrom-devel/config/platforms/dbe61.conf
===================================================================
--- buildrom-devel.orig/config/platforms/dbe61.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/dbe61.conf 2008-01-28 16:17:15.000000000 -0700
@@ -31,7 +31,7 @@
COREBOOT_BOARD=dbe61
CBV2_CONFIG=Config.lb
CBV2_TDIR=dbe61
-CBV2_TAG=2728
+CBV2_TAG=3079
COREBOOT_ROM_NAME=dbe61.rom
# FILO configuration
Index: buildrom-devel/config/platforms/ga-2761gxdk.conf
===================================================================
--- buildrom-devel.orig/config/platforms/ga-2761gxdk.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-01-28 16:17:15.000000000 -0700
@@ -36,8 +36,8 @@
COREBOOT_BOARD=ga_2761gxdk
CBV2_CONFIG=Config.lb
CBV2_TDIR=ga_2761gxdk
-CBV2_TAG=2908
-COREBOOT_ROM_NAME=linuxbios.rom
+CBV2_TAG=3079
+COREBOOT_ROM_NAME=coreboot.rom
# FILO configuration
Index: buildrom-devel/config/platforms/m57sli.conf
===================================================================
--- buildrom-devel.orig/config/platforms/m57sli.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/m57sli.conf 2008-01-28 16:17:15.000000000 -0700
@@ -40,8 +40,8 @@
COREBOOT_BOARD=m57sli
CBV2_CONFIG=Config.lb
CBV2_TDIR=m57sli
-CBV2_TAG=2958
-COREBOOT_ROM_NAME=linuxbios.rom
+CBV2_TAG=3079
+COREBOOT_ROM_NAME=coreboot.rom
# FILO configuration
Index: buildrom-devel/config/platforms/msm800sev.conf
===================================================================
--- buildrom-devel.orig/config/platforms/msm800sev.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/msm800sev.conf 2008-01-28 16:17:15.000000000 -0700
@@ -30,8 +30,8 @@
COREBOOT_BOARD=msm800sev
CBV2_CONFIG=Config.lb
CBV2_TDIR=msm800sev
-CBV2_TAG=3047
-COREBOOT_ROM_NAME=linuxbios.rom
+CBV2_TAG=3079
+COREBOOT_ROM_NAME=coreboot.rom
# FILO configuration
Index: buildrom-devel/config/platforms/norwich.conf
===================================================================
--- buildrom-devel.orig/config/platforms/norwich.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/norwich.conf 2008-01-28 16:17:15.000000000 -0700
@@ -30,7 +30,7 @@
COREBOOT_BOARD=norwich
CBV2_CONFIG=Config.lb
CBV2_TDIR=norwich
-CBV2_TAG=2810
+CBV2_TAG=3079
COREBOOT_ROM_NAME=norwich.rom
# FILO configuration
Index: buildrom-devel/config/platforms/qemu.conf
===================================================================
--- buildrom-devel.orig/config/platforms/qemu.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/qemu.conf 2008-01-28 16:17:15.000000000 -0700
@@ -24,7 +24,7 @@
ETHERBOOT_ARCH=i386
# coreboot-v2 configuration
-CBV2_TAG=2950
+CBV2_TAG=3079
CBV2_CONFIG=Config.lb
CBV2_TDIR=qemu-i386
Index: buildrom-devel/config/platforms/serengeti_cheetah.conf
===================================================================
--- buildrom-devel.orig/config/platforms/serengeti_cheetah.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-01-28 16:17:15.000000000 -0700
@@ -48,13 +48,13 @@
ifeq ($(CONFIG_PLATFORM_CHEETAH_FAM10),y)
COREBOOT_BOARD=serengeti_cheetah_fam10
CBV2_TDIR=serengeti_cheetah_fam10
-CBV2_TAG=3018
+CBV2_TAG=3085
COREBOOT_ROM_NAME=amd-cheetah-fam10.rom
else
COREBOOT_BOARD=serengeti_cheetah
CBV2_CONFIG=Config.lb
CBV2_TDIR=serengeti_cheetah
-CBV2_TAG=2950
+CBV2_TAG=3086
COREBOOT_ROM_NAME=serengeti_cheetah.rom
endif
Index: buildrom-devel/config/platforms/supermicro-h8dmr.conf
===================================================================
--- buildrom-devel.orig/config/platforms/supermicro-h8dmr.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-01-28 16:17:15.000000000 -0700
@@ -40,8 +40,8 @@
COREBOOT_BOARD=h8dmr
CBV2_CONFIG=Config.lb
CBV2_TDIR=h8dmr
-CBV2_TAG=2996
-COREBOOT_ROM_NAME=linuxbios.rom
+CBV2_TAG=3079
+COREBOOT_ROM_NAME=coreboot.rom
# FILO configuration
Index: buildrom-devel/config/platforms/tyan-s2882.conf
===================================================================
--- buildrom-devel.orig/config/platforms/tyan-s2882.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/tyan-s2882.conf 2008-01-28 16:17:15.000000000 -0700
@@ -40,8 +40,8 @@
COREBOOT_BOARD=s2882
CBV2_CONFIG=Config.lb
CBV2_TDIR=s2882
-CBV2_TAG=2887
-COREBOOT_ROM_NAME=linuxbios.rom
+CBV2_TAG=3079
+COREBOOT_ROM_NAME=coreboot.rom
# FILO configuration
Index: buildrom-devel/config/platforms/tyan-s2891.conf
===================================================================
--- buildrom-devel.orig/config/platforms/tyan-s2891.conf 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/config/platforms/tyan-s2891.conf 2008-01-28 16:17:15.000000000 -0700
@@ -40,8 +40,8 @@
COREBOOT_BOARD=s2891
CBV2_CONFIG=Config.lb
CBV2_TDIR=s2891
-CBV2_TAG=2792
-COREBOOT_ROM_NAME=linuxbios.rom
+CBV2_TAG=3079
+COREBOOT_ROM_NAME=coreboot.rom
# FILO configuration
Index: buildrom-devel/Makefile
===================================================================
--- buildrom-devel.orig/Makefile 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/Makefile 2008-01-28 16:17:15.000000000 -0700
@@ -43,7 +43,7 @@
# TARGET_ROM is what we are ultimately building - this should be
# specified by the platform files
-TARGET_ROM ?= linuxbios.rom
+TARGET_ROM ?= coreboot.rom
TARGET_ROM_FILE=$(OUTPUT_DIR)/$(TARGET_ROM)
# Choose the version of coreboot to build - this might be better
Index: buildrom-devel/packages/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch 2008-01-28 16:17:15.000000000 -0700
@@ -1,8 +1,8 @@
-Index: Config.lb
+Index: svn/targets/gigabyte/m57sli/Config.lb
===================================================================
---- 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
-@@ -22,83 +22,30 @@
+--- 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
@@ -24,7 +24,7 @@
option ROM_IMAGE_SIZE=0x20000
-# option ROM_IMAGE_SIZE=0x15800
option XIP_ROM_SIZE=0x40000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
-# payload ../../../payloads/tg3--ide_disk.zelf
-# payload ../../../payloads/filo.elf
-# payload ../../../payloads/filo_mem.elf
@@ -54,7 +54,7 @@
option ROM_IMAGE_SIZE=0x20000
-# option ROM_IMAGE_SIZE=0x15800
option XIP_ROM_SIZE=0x40000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
-# payload ../../../payloads/tg3--ide_disk.zelf
-# payload ../../../payloads/filo.elf
-# payload ../../../payloads/filo_mem.elf
@@ -85,13 +85,12 @@
- 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 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 LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
++ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
end
--#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
- buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+ #buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
Index: buildrom-devel/packages/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch 2008-01-28 16:17:15.000000000 -0700
@@ -95,7 +95,7 @@
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
end
--#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
--buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+-#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+
-+buildrom ./linuxbios.rom ROM_SIZE "fallback" "failover"
++buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
Index: buildrom-devel/packages/coreboot-v2/patches/qemu-payload.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/qemu-payload.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/qemu-payload.patch 2008-01-28 16:17:15.000000000 -0700
@@ -1,7 +1,7 @@
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)
+--- 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
@@ -14,7 +14,7 @@
@@ -13,8 +15,8 @@
romimage "image"
option ROM_IMAGE_SIZE=0x10000
- option LINUXBIOS_EXTRA_VERSION="-GRUB2"
+ option COREBOOT_EXTRA_VERSION="-GRUB2"
- payload /home/stepan/core.img
+ payload ../payload.elf
end
Index: buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-lab.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/serengeti_cheetah-lab.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-lab.patch 2008-01-28 16:17:15.000000000 -0700
@@ -93,6 +93,6 @@
-end
-
-
--buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
--#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+-#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./serengeti_cheetah.rom ROM_SIZE "fallback"
Index: buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-payload.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/serengeti_cheetah-payload.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/serengeti_cheetah-payload.patch 2008-01-28 16:17:15.000000000 -0700
@@ -1,27 +1,11 @@
Index: svn/targets/amd/serengeti_cheetah/Config.lb
===================================================================
---- svn/targets/amd/serengeti_cheetah/Config.lb (revision 2880)
-+++ svn/targets/amd/serengeti_cheetah/Config.lb (working copy)
-@@ -5,71 +5,22 @@
- 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
+--- 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 LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
-# payload ../../../payloads/tg3--ide_disk.zelf
-# payload ../../../payloads/filo.elf
-# payload ../../../payloads/filo_mem.elf
@@ -43,14 +27,10 @@
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
+@@ -49,27 +33,7 @@
+ # option ROM_IMAGE_SIZE=0x15800
option XIP_ROM_SIZE=0x40000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
-# payload ../../../payloads/tg3--ide_disk.zelf
-# payload ../../../payloads/filo.elf
-# payload ../../../payloads/filo_mem.elf
@@ -76,10 +56,10 @@
end
romimage "failover"
-@@ -81,5 +32,4 @@
+@@ -81,5 +45,4 @@
end
--buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
--#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+-#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./serengeti_cheetah.rom ROM_SIZE "normal" "fallback" "failover"
Index: buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch 2008-01-28 16:17:15.000000000 -0700
@@ -1,5 +1,7 @@
---- LinuxBIOSv2/targets/supermicro/h8dmr/Config.lb 2007-11-30 10:42:05.000000000 -0500
-+++ LinuxBIOSv2/targets/supermicro/h8dmr/Config.lb 2007-11-30 11:21:15.000000000 -0500
+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
@@ -26,7 +28,7 @@
-# option ROM_IMAGE_SIZE=0x15800
- option XIP_ROM_SIZE=0x40000
+ option XIP_ROM_SIZE=0x20000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
-# payload ../../../payloads/tg3--ide_disk.zelf
-# payload ../../../payloads/filo.elf
-# payload ../../../payloads/filo_mem.elf
@@ -56,7 +58,7 @@
-# option ROM_IMAGE_SIZE=0x15800
- option XIP_ROM_SIZE=0x40000
+ option XIP_ROM_SIZE=0x20000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
-# payload ../../../payloads/tg3--ide_disk.zelf
-# payload ../../../payloads/filo.elf
-# payload ../../../payloads/filo_mem.elf
@@ -83,9 +85,3 @@
end
romimage "failover"
-@@ -99,5 +51,4 @@
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
- end
-
--#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
- buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
Index: buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch 2008-01-28 16:17:15.000000000 -0700
@@ -96,7 +96,7 @@
+ option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
end
--#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
--buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+-#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+
-+buildrom ./linuxbios.rom ROM_SIZE "fallback" "failover"
++buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
Index: buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-filo-Config.lb.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/tyan-s2882-filo-Config.lb.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-filo-Config.lb.patch 2008-01-28 16:17:15.000000000 -0700
@@ -1,7 +1,7 @@
-Index: LinuxBIOSv2/targets/tyan/s2882/Config.lb
+Index: svn/targets/tyan/s2882/Config.lb
===================================================================
---- LinuxBIOSv2/targets/tyan/s2882/Config.lb (revision 2867)
-+++ LinuxBIOSv2/targets/tyan/s2882/Config.lb (working copy)
+--- 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
@@ -20,7 +20,7 @@
option ROM_IMAGE_SIZE=0x20000
- option XIP_ROM_SIZE=0x20000
+ option XIP_ROM_SIZE=0x20000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
-# payload ../../../payloads/tg3--ide_disk.zelf
-# payload ../../../payloads/filo.elf
-# payload ../../../payloads/filo_mem.elf
@@ -40,7 +40,7 @@
option ROM_IMAGE_SIZE=0x20000
- option XIP_ROM_SIZE=0x20000
+ option XIP_ROM_SIZE=0x20000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
-# payload ../../../payloads/tg3--ide_disk.zelf
-# payload ../../../payloads/filo.elf
-# payload ../../../payloads/filo_mem.elf
@@ -53,4 +53,4 @@
+ payload ../payload.elf
end
- buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+ buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
Index: buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch 2008-01-28 16:17:15.000000000 -0700
@@ -58,5 +58,5 @@
+ payload ../payload.elf
end
--buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-+buildrom ./linuxbios.rom ROM_SIZE "fallback"
+-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
++buildrom ./coreboot.rom ROM_SIZE "fallback"
Index: buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-filo-Config.lb.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/tyan-s2891-filo-Config.lb.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-filo-Config.lb.patch 2008-01-28 16:17:15.000000000 -0700
@@ -1,7 +1,7 @@
-Index: targets/tyan/s2891/Config.lb
+Index: svn/targets/tyan/s2891/Config.lb
===================================================================
---- LinuxBIOSv2/targets/tyan/s2891/Config.lb (revision 2742)
-+++ LinuxBIOSv2/targets/tyan/s2891/Config.lb (working copy)
+--- 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
@@ -23,7 +23,7 @@
option ROM_IMAGE_SIZE=0x20000
- option XIP_ROM_SIZE=0x20000
+ option XIP_ROM_SIZE=0x20000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
-# payload ../../../payloads/tg3--ide_disk.zelf
-# payload ../../../payloads/filo.elf
-# payload ../../../payloads/filo_mem.elf
@@ -47,7 +47,7 @@
option ROM_IMAGE_SIZE=0x20000
- option XIP_ROM_SIZE=0x20000
+ option XIP_ROM_SIZE=0x20000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+ option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
-# payload ../../../payloads/tg3--ide_disk.zelf
-# payload ../../../payloads/filo.elf
-# payload ../../../payloads/filo_mem.elf
@@ -63,4 +63,4 @@
+ payload ../payload.elf
end
- buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+ buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
Index: buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch 2008-01-28 16:16:28.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch 2008-01-28 16:17:15.000000000 -0700
@@ -66,5 +66,5 @@
+ payload ../payload.elf
end
--buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-+buildrom ./linuxbios.rom ROM_SIZE "fallback"
+-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
++buildrom ./coreboot.rom ROM_SIZE "fallback"
Index: buildrom-devel/packages/coreboot-v2/patches/2761gxdk-fix-target.patch
===================================================================
--- buildrom-devel.orig/packages/coreboot-v2/patches/2761gxdk-fix-target.patch 2008-01-28 16:17:23.000000000 -0700
+++ buildrom-devel/packages/coreboot-v2/patches/2761gxdk-fix-target.patch 2008-01-28 16:17:31.000000000 -0700
@@ -1,21 +1,21 @@
Index: svn/targets/gigabyte/ga_2761gxdk/Config.lb
===================================================================
---- svn.orig/targets/gigabyte/ga_2761gxdk/Config.lb
-+++ svn/targets/gigabyte/ga_2761gxdk/Config.lb
-@@ -42,7 +42,8 @@ romimage "normal"
- # option ROM_IMAGE_SIZE=0x15800
- option XIP_ROM_SIZE=0x40000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+--- 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"
-@@ -55,7 +56,8 @@ romimage "fallback"
- # option ROM_IMAGE_SIZE=0x15800
- option XIP_ROM_SIZE=0x40000
- option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+ 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