coreboot February 2008

coreboot@coreboot.org

77 participants
422 discussions

v3 defconfig
by Myles Watson 06 Feb '08

06 Feb '08

I'd like to make buildrom support v3 in the same way that it supports v2. I don't want buildrom to keep config files if it can help it. I thought it would be the best to support make defconfig in the same way that the kernel does. I'd like to be able to type make defconfig CONFIG_MAINBOARD_NAME=emulation/qemu-i386 and have it do the right thing. This patch doesn't work unfortunately, and I don't know why. Myles Index: util/kconfig/symbol.c =================================================================== --- util/kconfig/symbol.c (revision 574) +++ util/kconfig/symbol.c (working copy) @@ -54,6 +54,13 @@ uname(&uts); + sym = sym_lookup("MAINBOARDDIR", 0); + sym->type = S_STRING; + sym->flags |= SYMBOL_AUTO; + p = getenv("MAINBOARDDIR"); + if (p) + sym_add_default(sym, p); + sym = sym_lookup("ARCH", 0); sym->type = S_STRING; sym->flags |= SYMBOL_AUTO; Index: util/kconfig/confdata.c =================================================================== --- util/kconfig/confdata.c (revision 574) +++ util/kconfig/confdata.c (working copy) @@ -22,7 +22,7 @@ const char conf_def_filename[] = ".config"; -const char conf_defname[] = "arch/$ARCH/defconfig"; +const char conf_defname[] = "mainboard/$MAINBOARDDIR/defconfig"; const char *conf_confnames[] = { ".config",

1 0

r3091 build service
by coreboot information 06 Feb '08

06 Feb '08

Dear coreboot readers! This is the automated build check service of coreboot. The developer "hailfinger" checked in revision 3091 to the coreboot source repository and caused the following changes: Change Log: Handle JEDEC JEP106W continuation codes in SPI RDID. Some vendors like Programmable Micro Corp (PMC) need this. Both the serial and parallel flash JEDEC detection routines would benefit from a parity/sanity check of the vendor ID. Will do this later. Add support for the PMC Pm25LV family of SPI flash chips. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Chris Lingard <chris(a)stockwith.co.uk> Build Log: Compilation of amd:serengeti_cheetah_fam10 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3091&device=serengeti_chee… If something broke during this checkin please be a pain in hailfinger's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

r107 - buildrom-devel/packages/coreboot-v3/conf
by svn＠coreboot.org 06 Feb '08

06 Feb '08

Author: myles Date: 2008-02-06 23:43:44 +0100 (Wed, 06 Feb 2008) New Revision: 107 Modified: buildrom-devel/packages/coreboot-v3/conf/qemu-i386-defconfig Log: This is a trivial fix of a broken config file from the LinuxBIOS -> Coreboot renaming process. Signed-off-by: Myles Watson <myles(a)pel.cs.byu.edu> Acked-by: Myles Watson <myles(a)pel.cs.byu.edu> Modified: buildrom-devel/packages/coreboot-v3/conf/qemu-i386-defconfig =================================================================== --- buildrom-devel/packages/coreboot-v3/conf/qemu-i386-defconfig 2008-02-06 22:39:12 UTC (rev 106) +++ buildrom-devel/packages/coreboot-v3/conf/qemu-i386-defconfig 2008-02-06 22:43:44 UTC (rev 107) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# LinuxBIOS version: 3.0.0 -# Tue Jan 8 12:28:41 2008 +# coreboot version: 3.0.0 +# Wed Feb 6 13:55:31 2008 # # @@ -23,12 +23,12 @@ CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x15ad CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1976 CONFIG_BOARD_EMULATION_QEMU_X86=y -# CONFIG_LINUXBIOS_ROMSIZE_KB_128 is not set -# CONFIG_LINUXBIOS_ROMSIZE_KB_256 is not set -# CONFIG_LINUXBIOS_ROMSIZE_KB_512 is not set -CONFIG_LINUXBIOS_ROMSIZE_KB_1024=y -# CONFIG_LINUXBIOS_ROMSIZE_KB_2048 is not set -CONFIG_LINUXBIOS_ROMSIZE_KB=1024 +# CONFIG_COREBOOT_ROMSIZE_KB_128 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set +# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set +CONFIG_COREBOOT_ROMSIZE_KB_1024=y +# CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set +CONFIG_COREBOOT_ROMSIZE_KB=1024 CONFIG_ARCH_X86=y CONFIG_ARCH="x86" CONFIG_CPU_I586=y

1 0

Coreboot-v2 patch rom names
by Myles Watson 06 Feb '08

06 Feb '08

This patch changes all rom names that aren't coreboot.rom in Config.lb files. I think that since the directory specifies the architecture and the board, it is redundant information to name it something else, and it makes it more difficult to automate the build process (buildrom). In buildrom we should just use Config-options.lb files instead of patching or keeping our own. It just adds more to maintain, with very little benefit. The correct place for Config.lb files is in the coreboot-v2 tree. The next patch would add Config-lab.lb files for each architecture supported by buildrom. Another patch would change buildrom to stop patching Config.lb files. There is already a CBV2_CONFIG variable that would work nicely for selecting the correct file. Comments? Signed-off-by: Myles Watson <myles(a)pel.cs.byu.edu>

4 6

r106 - in buildrom-devel: config/platforms packages/coreboot-v2 packages/coreboot-v2/patches
by svn＠coreboot.org 06 Feb '08

06 Feb '08

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(a)pel.cs.byu.edu> Acked-by: Ward Vandewege <ward(a)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

1 0

r3092 - in trunk/coreboot-v2/targets: amd/serengeti_cheetah amd/serengeti_cheetah_fam10 emulation/qemu-i386 gigabyte/ga_2761gxdk gigabyte/m57sli supermicro/h8dmr tyan/s2882 tyan/s2891
by svn＠coreboot.org 06 Feb '08

06 Feb '08

Author: myles Date: 2008-02-06 23:33:50 +0100 (Wed, 06 Feb 2008) New Revision: 3092 Added: trunk/coreboot-v2/targets/amd/serengeti_cheetah/Config-lab.lb trunk/coreboot-v2/targets/amd/serengeti_cheetah_fam10/Config-lab.lb trunk/coreboot-v2/targets/emulation/qemu-i386/Config-lab.lb trunk/coreboot-v2/targets/gigabyte/m57sli/Config-lab.lb trunk/coreboot-v2/targets/supermicro/h8dmr/Config-lab.lb trunk/coreboot-v2/targets/tyan/s2882/Config-lab.lb trunk/coreboot-v2/targets/tyan/s2891/Config-lab.lb Modified: trunk/coreboot-v2/targets/amd/serengeti_cheetah/Config.lb trunk/coreboot-v2/targets/emulation/qemu-i386/Config.lb trunk/coreboot-v2/targets/gigabyte/ga_2761gxdk/Config.lb trunk/coreboot-v2/targets/gigabyte/m57sli/Config.lb trunk/coreboot-v2/targets/tyan/s2882/Config.lb trunk/coreboot-v2/targets/tyan/s2891/Config.lb Log: This patch changes the Config.lb files and adds Config-lab.lb files for architectures supported by buildrom. Myles Signed-off-by: Myles Watson <myles(a)pel.cs.byu.edu> Acked-by: Ward Vandewege <ward(a)gnu.org> Added: trunk/coreboot-v2/targets/amd/serengeti_cheetah/Config-lab.lb =================================================================== --- trunk/coreboot-v2/targets/amd/serengeti_cheetah/Config-lab.lb (rev 0) +++ trunk/coreboot-v2/targets/amd/serengeti_cheetah/Config-lab.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -0,0 +1,24 @@ +# Sample config file for +# the amd serengeti_cheetah +# This will make a target directory of ./serengeti_cheetah + +target serengeti_cheetah +mainboard amd/serengeti_cheetah + +option ROM_SIZE = 0x100000 +option USE_FAILOVER_IMAGE=0 +option HAVE_FAILOVER_BOOT=0 +option FAILOVER_SIZE=0 + +romimage "fallback" + option CONFIG_PRECOMPRESSED_PAYLOAD=1 + option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 + option FALLBACK_SIZE=ROM_SIZE + option USE_FALLBACK_IMAGE=1 + option ROM_IMAGE_SIZE=0x1a000 + option XIP_ROM_SIZE=0x40000 + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" + payload ../payload.elf.lzma +end + +buildrom ./coreboot.rom ROM_SIZE "fallback" Modified: trunk/coreboot-v2/targets/amd/serengeti_cheetah/Config.lb =================================================================== --- trunk/coreboot-v2/targets/amd/serengeti_cheetah/Config.lb 2008-02-06 22:07:58 UTC (rev 3091) +++ trunk/coreboot-v2/targets/amd/serengeti_cheetah/Config.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -29,7 +29,7 @@ # payload ../../../payloads/tg3.zelf # payload ../../../../payloads/tg3_vga.zelf # payload ../../../../payloads/tg3--filo_hda2_vga.zelf - payload ../../../../payloads/tg3--filo_hda2_vga_5.4.1.zelf +# payload ../../../../payloads/tg3--filo_hda2_vga_5.4.1.zelf # payload ../../../../payloads/e1000_vga.zelf # payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf # payload ../../../payloads/tg3_com2.zelf @@ -38,6 +38,7 @@ # payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf # payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf # payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf + payload ../payload.elf end romimage "fallback" @@ -62,7 +63,7 @@ # payload ../../../../payloads/filo_hda.zelf # payload ../../../../payloads/tg3--filo_hda2_vga.zelf # payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf - payload ../../../../payloads/tg3--filo_hda2_vga_5.4.1.zelf +# payload ../../../../payloads/tg3--filo_hda2_vga_5.4.1.zelf # payload ../../../../payloads/filo_hda2_novga.zelf # payload ../../../payloads/tg3_com2.zelf # payload ../../../payloads/e1000--filo.zelf @@ -70,6 +71,7 @@ # 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" Added: trunk/coreboot-v2/targets/amd/serengeti_cheetah_fam10/Config-lab.lb =================================================================== --- trunk/coreboot-v2/targets/amd/serengeti_cheetah_fam10/Config-lab.lb (rev 0) +++ trunk/coreboot-v2/targets/amd/serengeti_cheetah_fam10/Config-lab.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -0,0 +1,54 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2007 Advanced Micro Devices, Inc. +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +# Sample config file for +# the amd cheetah_fam10 +# This will make a target directory of ./serengeti_cheetah_fam10 + +target serengeti_cheetah_fam10 +mainboard amd/serengeti_cheetah_fam10 +# Request this level of debugging output + option DEFAULT_CONSOLE_LOGLEVEL=11 +# At a maximum only compile in this level of debugging + option MAXIMUM_CONSOLE_LOGLEVEL=11 + +# 1024KB ROM +option ROM_SIZE=1024*1024 +option FALLBACK_SIZE=ROM_SIZE-FAILOVER_SIZE + +romimage "fallback" + option USE_FAILOVER_IMAGE=0 + option USE_FALLBACK_IMAGE=1 + option ROM_IMAGE_SIZE=0x30000 + option XIP_ROM_SIZE=0x40000 + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" + payload ../payload.elf.lzma +end + +romimage "failover" + option USE_FAILOVER_IMAGE=1 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=FAILOVER_SIZE + option XIP_ROM_SIZE=FAILOVER_SIZE + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover" +end + +buildrom ./coreboot.rom ROM_SIZE "fallback" "failover" + Added: trunk/coreboot-v2/targets/emulation/qemu-i386/Config-lab.lb =================================================================== --- trunk/coreboot-v2/targets/emulation/qemu-i386/Config-lab.lb (rev 0) +++ trunk/coreboot-v2/targets/emulation/qemu-i386/Config-lab.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -0,0 +1,22 @@ +# This will make a target directory of ./emulation_qemu-i386 + +target qemu-i386 +mainboard emulation/qemu-i386 + +option ROM_SIZE=2048*1024 +option CONFIG_COMPRESSED_PAYLOAD_LZMA=0 +option CONFIG_PRECOMPRESSED_PAYLOAD=0 + +option CC="gcc -m32" + +option HAVE_PIRQ_TABLE=1 +option IRQ_SLOT_COUNT=6 + +romimage "image" + option ROM_IMAGE_SIZE=0x10000 + option COREBOOT_EXTRA_VERSION="-LAB" + payload ../payload.elf.lzma +end + +buildrom ./qemu.rom ROM_SIZE "image" + Modified: trunk/coreboot-v2/targets/emulation/qemu-i386/Config.lb =================================================================== --- trunk/coreboot-v2/targets/emulation/qemu-i386/Config.lb 2008-02-06 22:07:58 UTC (rev 3091) +++ trunk/coreboot-v2/targets/emulation/qemu-i386/Config.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -13,7 +13,8 @@ romimage "image" option ROM_IMAGE_SIZE=0x10000 option COREBOOT_EXTRA_VERSION="-GRUB2" - payload /home/stepan/core.img +# payload /home/stepan/core.img + payload ../payload.elf end buildrom ./coreboot.rom ROM_SIZE "image" Modified: trunk/coreboot-v2/targets/gigabyte/ga_2761gxdk/Config.lb =================================================================== --- trunk/coreboot-v2/targets/gigabyte/ga_2761gxdk/Config.lb 2008-02-06 22:07:58 UTC (rev 3091) +++ trunk/coreboot-v2/targets/gigabyte/ga_2761gxdk/Config.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -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" Added: trunk/coreboot-v2/targets/gigabyte/m57sli/Config-lab.lb =================================================================== --- trunk/coreboot-v2/targets/gigabyte/m57sli/Config-lab.lb (rev 0) +++ trunk/coreboot-v2/targets/gigabyte/m57sli/Config-lab.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -0,0 +1,49 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2007 AMD +## Written by Yinghai Lu <yinghailu(a)gmail.com> for AMD. +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +# Sample config file for + +target m57sli +mainboard gigabyte/m57sli + +option ROM_SIZE=0x100000 +option FALLBACK_SIZE=(ROM_SIZE-0x1000) + +romimage "fallback" + option USE_FAILOVER_IMAGE=0 + option USE_FALLBACK_IMAGE=1 + option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 + option CONFIG_PRECOMPRESSED_PAYLOAD=1 + option ROM_IMAGE_SIZE=0x17000 + option XIP_ROM_SIZE=0x40000 + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" + payload ../payload.elf.lzma +end + +romimage "failover" + option USE_FAILOVER_IMAGE=1 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=FAILOVER_SIZE + option XIP_ROM_SIZE=FAILOVER_SIZE + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover" +end + +buildrom ./coreboot.rom ROM_SIZE "fallback" "failover" Modified: trunk/coreboot-v2/targets/gigabyte/m57sli/Config.lb =================================================================== --- trunk/coreboot-v2/targets/gigabyte/m57sli/Config.lb 2008-02-06 22:07:58 UTC (rev 3091) +++ trunk/coreboot-v2/targets/gigabyte/m57sli/Config.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -82,7 +82,7 @@ # payload ../../../../payloads/adlo.elf # payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf # payload ../../../../payloads/forcedeth_mcp55_filo_hda2.zelf - payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf +# payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf # payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf # payload ../../../payloads/tg3_com2.zelf # payload ../../../payloads/e1000--filo.zelf @@ -90,6 +90,7 @@ # 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" Added: trunk/coreboot-v2/targets/supermicro/h8dmr/Config-lab.lb =================================================================== --- trunk/coreboot-v2/targets/supermicro/h8dmr/Config-lab.lb (rev 0) +++ trunk/coreboot-v2/targets/supermicro/h8dmr/Config-lab.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -0,0 +1,48 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2007 AMD +## Written by Yinghai Lu <yinghailu(a)gmail.com> for AMD. +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +target h8dmr +mainboard supermicro/h8dmr + +option ROM_SIZE=0x100000 +# 44K for ATI ROM in 1M; 4K for failover +option FALLBACK_SIZE=(ROM_SIZE-0xC000) + +romimage "fallback" + option USE_FAILOVER_IMAGE=0 + option USE_FALLBACK_IMAGE=1 + option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 + option CONFIG_PRECOMPRESSED_PAYLOAD=1 + option ROM_IMAGE_SIZE=0x18000 + option XIP_ROM_SIZE=0x40000 + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" + payload ../payload.elf.lzma +end + +romimage "failover" + option USE_FAILOVER_IMAGE=1 + option USE_FALLBACK_IMAGE=0 + option ROM_IMAGE_SIZE=FAILOVER_SIZE + option XIP_ROM_SIZE=FAILOVER_SIZE + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover" +end + +buildrom ./coreboot.rom ROM_SIZE "fallback" "failover" Added: trunk/coreboot-v2/targets/tyan/s2882/Config-lab.lb =================================================================== --- trunk/coreboot-v2/targets/tyan/s2882/Config-lab.lb (rev 0) +++ trunk/coreboot-v2/targets/tyan/s2882/Config-lab.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -0,0 +1,23 @@ +# Sample config file for +# the Tyan s2882 +# This will make a target directory of ./s2882 + +target s2882 +mainboard tyan/s2882 + +option ROM_SIZE=0x100000 +# 36K for ATI ROM in 1M +option FALLBACK_SIZE=(ROM_SIZE-0x9000) + +# Tyan s2882 +romimage "fallback" + option USE_FALLBACK_IMAGE=1 + option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 + option CONFIG_PRECOMPRESSED_PAYLOAD=1 + option ROM_IMAGE_SIZE=0x17000 + option XIP_ROM_SIZE=0x40000 + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" + payload ../payload.elf.lzma +end + +buildrom ./coreboot.rom ROM_SIZE "fallback" Modified: trunk/coreboot-v2/targets/tyan/s2882/Config.lb =================================================================== --- trunk/coreboot-v2/targets/tyan/s2882/Config.lb 2008-02-06 22:07:58 UTC (rev 3091) +++ trunk/coreboot-v2/targets/tyan/s2882/Config.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -26,8 +26,9 @@ # payload ../../../payloads/tg3--filo.zelf # payload ../../../payloads/e1000--filo.zelf # payload ../../../payloads/tg3--e1000--filo.zelf - payload ../../../../payloads/tg3--filo_hda2_vga.zelf +# payload ../../../../payloads/tg3--filo_hda2_vga.zelf # payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf + payload ../payload.elf end romimage "fallback" @@ -44,8 +45,9 @@ # payload ../../../payloads/tg3--filo.zelf # payload ../../../payloads/e1000--filo.zelf # payload ../../../payloads/tg3--e1000--filo.zelf - payload ../../../../payloads/tg3--filo_hda2_vga.zelf +# payload ../../../../payloads/tg3--filo_hda2_vga.zelf # payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf + payload ../payload.elf end buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" Added: trunk/coreboot-v2/targets/tyan/s2891/Config-lab.lb =================================================================== --- trunk/coreboot-v2/targets/tyan/s2891/Config-lab.lb (rev 0) +++ trunk/coreboot-v2/targets/tyan/s2891/Config-lab.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -0,0 +1,23 @@ +# Sample config file for +# the Tyan s2891 +# This will make a target directory of ./s2891 + +target s2891 +mainboard tyan/s2891 + +option ROM_SIZE=0x100000 +# 36K for ATI ROM in 1M +option FALLBACK_SIZE=(ROM_SIZE-0x9000) + +# Tyan s2891 +romimage "fallback" + option USE_FALLBACK_IMAGE=1 + option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 + option CONFIG_PRECOMPRESSED_PAYLOAD=1 + option ROM_IMAGE_SIZE=0x17000 + option XIP_ROM_SIZE=0x40000 + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" + payload ../payload.elf.lzma +end + +buildrom ./coreboot.rom ROM_SIZE "fallback" Modified: trunk/coreboot-v2/targets/tyan/s2891/Config.lb =================================================================== --- trunk/coreboot-v2/targets/tyan/s2891/Config.lb 2008-02-06 22:07:58 UTC (rev 3091) +++ trunk/coreboot-v2/targets/tyan/s2891/Config.lb 2008-02-06 22:33:50 UTC (rev 3092) @@ -27,13 +27,14 @@ # payload ../../../payloads/filo_mem.elf # payload ../../../payloads/filo.zelf # payload ../../../payloads/tg3--filo.zelf - payload ../../../../payloads/tg3--filo_hda2_vga.zelf +# payload ../../../../payloads/tg3--filo_hda2_vga.zelf # payload ../../../payloads/tg3--filo_hda2_vga_com2.zelf # payload ../../../payloads/tg3--filo_hda2_vga_5_3.zelf # payload ../../../payloads/tg3--filo_btext_hda2.zelf # payload ../../../payloads/e1000--filo.zelf # payload ../../../payloads/tg3--e1000--filo.zelf # payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf + payload ../payload.elf end romimage "fallback" @@ -49,13 +50,14 @@ # payload ../../../payloads/filo_mem.elf # payload ../../../payloads/filo.zelf # payload ../../../payloads/tg3--filo.zelf - payload ../../../../payloads/tg3--filo_hda2_vga.zelf +# payload ../../../../payloads/tg3--filo_hda2_vga.zelf # payload ../../../payloads/tg3--filo_hda2_vga_com2.zelf # payload ../../../payloads/tg3--filo_hda2_vga_5_3.zelf # payload ../../../payloads/e1000--filo.zelf # payload ../../../payloads/tg3--filo_btext_hda2.zelf # payload ../../../payloads/tg3--e1000--filo.zelf # payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf + payload ../payload.elf end buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"

1 0

Problem with M57SLI and newly installed MX25L4005
by Chris Lingard 06 Feb '08

06 Feb '08

I recently found someone who could do the work of modifying the motherboard, Harald kindly posted me the chip. The machine came back and it would not boot with the switch up I then probably made a mistake, I used the BIOS itself to dump the factory BIOS to several floppies; then flipped the switch and wrote the factory BIOS to the new chip. The machine now boots from either BIOS. Using flashrom to detect the chip I get: Calibrating delay loop... 853M loops per second. OK. No coreboot table found. Found chipset "NVIDIA MCP55", enabling flash write... OK. Found board "GIGABYTE GA-M57SLI-S4": enabling flash write... Serial flash segment 0xfffe0000-0xffffffff enabled Serial flash segment 0x000e0000-0x000fffff enabled Serial flash segment 0xffee0000-0xffefffff disabled Serial flash segment 0xfff80000-0xfffeffff enabled LPC write to serial flash enabled serial flash pin 29 OK. <snip> Probing for MX25L4005, 512 KB RDID returned 7f 9d 7e. probe_spi: id1 0x7f, id2 0x9d7e <snip> No EEPROM/flash device found. The factory BIOS is the same except that it returns Probing for MX25L4005, 512 KB RDID returned 7f 9d 7e. <snip> No EEPROM/flash device found. I have tried coreboot v2 and v3; and have also tried compiling 32 bit on another machine and copyied the binary across. Both by machines have recent compilers, nothing earlier that gcc-4 series, but get no errors or warnings. Also a very recent glibc version 2.6. I tried writing the LinuxBios from a floppy, but the BIOS refuses saying there is a checksum error On running superiotool there is no BIOS chip connected to the 8716? (should there be?) superiotool r3064 Found ITE IT8716F (id=0x8716, rev=0x0) at 0x2e Register dump: idx 07 20 21 22 23 24 2b val 0a 87 16 00 11 1a 00 def NA 87 16 01 00 00 00 LDN 0x00 (Floppy) idx 30 60 61 70 74 f0 f1 val 01 03 f0 06 02 00 80 def 00 03 f0 06 02 00 00 LDN 0x01 (COM1) idx 30 60 61 70 f0 f1 f2 f3 val 00 00 00 00 00 50 00 7f def 00 03 f8 04 00 50 00 7f LDN 0x02 (COM2) idx 30 60 61 70 f0 f1 f2 f3 val 00 00 00 00 00 50 00 7f def 00 02 f8 03 00 50 00 7f LDN 0x03 (Parallel port) idx 30 60 61 62 63 70 74 f0 val 00 00 00 00 00 00 04 08 def 00 03 78 07 78 07 03 03 LDN 0x04 (Environment controller) idx 30 60 61 62 63 70 f0 f1 f2 f3 f4 f5 f6 val 01 02 90 00 00 00 80 00 0a 00 80 00 ff def 00 02 90 02 30 09 00 00 00 00 00 NA NA LDN 0x05 (Keyboard) idx 30 60 61 62 63 70 71 f0 val 01 00 60 00 64 01 02 68 def 01 00 60 00 64 01 02 00 LDN 0x06 (Mouse) idx 30 70 71 f0 val 01 0c 02 00 def 00 0c 02 00 LDN 0x07 (GPIO) idx 25 26 27 28 29 2a 2c 60 61 62 63 64 65 70 71 72 73 74 b0 b1 b2 b3 b4 b5 b 8 b9 ba bb bc bd c0 c1 c2 c3 c4 c8 c9 ca cb cc e0 e1 e2 e3 e4 f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd val 00 43 20 00 81 00 1f 00 00 08 00 08 20 00 00 00 38 00 00 00 00 00 00 00 0 0 00 00 00 01 00 00 43 20 00 00 00 40 00 00 00 00 00 00 00 00 10 40 00 00 00 00 28 00 00 00 00 00 32 00 def 01 00 00 40 00 00 00 00 00 00 00 00 00 00 00 20 38 00 00 00 00 00 00 00 0 0 00 00 00 00 00 01 00 00 40 00 01 00 00 40 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 NA 00 LDN 0x08 (MIDI port) idx 30 60 61 70 f0 val 00 03 00 0a 00 def 00 03 00 0a 00 LDN 0x09 (Game port) idx 30 60 61 val 00 02 01 def 00 02 01 LDN 0x0a (Consumer IR) idx 30 60 61 70 f0 val 00 03 10 0b 06 def 00 03 10 0b 00 The block diagram shows the BIOS connected directly to the 570-SLI and not via the 8716 Could someone please give me a clue of either what I have missed out, or how to proceed? Chris Lingard

3 17

[PATCH] flashrom: Support Pm25LV*
by Carl-Daniel Hailfinger 06 Feb '08

06 Feb '08

Chris: Please try this against latest flashrom with the switch in both positions. It supersedes all previous patches. Handle JEDEC JEP106W continuation codes in SPI RDID. Some vendors like Programmable Micro Corp need this. Both the serial and parallel flash JEDEC detection routines would benefit from a parity/sanity check of the vendor ID. Will do this later. Add untested support for the PMC Pm25LV family of SPI flash chips. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> http://www.hailfinger.org/ Index: flashrom-spi_pm25/flash.h =================================================================== --- flashrom-spi_pm25/flash.h (Revision 3090) +++ flashrom-spi_pm25/flash.h (Arbeitskopie) @@ -158,7 +158,20 @@ /* Programmable Micro Corp is listed in JEP106W in bank 2, so it should have * a 0x7F continuation code prefix. */ -#define PMC_ID 0x9D /* PMC */ +#define PMC_ID 0x7F9D /* PMC */ +#define PMC_ID_NOPREFIX 0x9D /* PMC, missing 0x7F prefix */ +#define PMC_25LV512 0x7B +#define PMC_25LV010 0x7C +#define PMC_25LV020 0x7D +#define PMC_25LV040 0x7E +#define PMC_25LV080B 0x13 +#define PMC_25LV016B 0x14 +#define PMC_39LV512 0x1B +#define PMC_39F010 0x1C /* also Pm39LV010 */ +#define PMC_39LV020 0x3D +#define PMC_39LV040 0x3E +#define PMC_39F020 0x4D +#define PMC_39F040 0x4E #define PMC_49FL002 0x6D #define PMC_49FL004 0x6E Index: flashrom-spi_pm25/flashchips.c =================================================================== --- flashrom-spi_pm25/flashchips.c (Revision 3090) +++ flashrom-spi_pm25/flashchips.c (Arbeitskopie) @@ -100,10 +100,22 @@ probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, {"SST49LF160C", SST_ID, SST_49LF160C, 2048, 4 * 1024 , probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, - {"Pm49FL002", PMC_ID, PMC_49FL002, 256, 16 * 1024, + {"Pm49FL002", PMC_ID_NOPREFIX, PMC_49FL002, 256, 16 * 1024, probe_jedec, erase_chip_jedec, write_49fl004}, - {"Pm49FL004", PMC_ID, PMC_49FL004, 512, 64 * 1024, + {"Pm49FL004", PMC_ID_NOPREFIX, PMC_49FL004, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_49fl004}, + {"Pm25LV512", PMC_ID, PMC_25LV512, 64, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV010", PMC_ID, PMC_25LV010, 128, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV020", PMC_ID, PMC_25LV020, 256, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV040", PMC_ID, PMC_25LV040, 512, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV080B", PMC_ID, PMC_25LV080B, 1024, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV016B", PMC_ID, PMC_25LV016B, 2048, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, {"W29C011", WINBOND_ID, W_29C011, 128, 128, probe_jedec, erase_chip_jedec, write_jedec}, {"W29C040P", WINBOND_ID, W_29C040P, 512, 256, @@ -205,6 +217,8 @@ probe_spi, NULL, NULL}, {"MX unknown SPI chip", MX_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, + {"PMC unknown SPI chip", PMC_ID, GENERIC_DEVICE_ID, 0, 0, + probe_spi, NULL, NULL}, {"SST unknown SPI chip", SST_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, {"ST unknown SPI chip", ST_ID, GENERIC_DEVICE_ID, 0, 0, Index: flashrom-spi_pm25/spi.c =================================================================== --- flashrom-spi_pm25/spi.c (Revision 3090) +++ flashrom-spi_pm25/spi.c (Arbeitskopie) @@ -278,11 +278,17 @@ int probe_spi(struct flashchip *flash) { unsigned char readarr[3]; - uint8_t manuf_id; - uint16_t model_id; + uint32_t manuf_id; + uint32_t model_id; if (!generic_spi_rdid(readarr)) { - manuf_id = readarr[0]; - model_id = (readarr[1] << 8) | readarr[2]; + /* Check if this is a continuation vendor ID */ + if (readarr[0] == 0x7f) { + manuf_id = (readarr[0] << 8) | readarr[1]; + model_id = readarr[2]; + } else { + manuf_id = readarr[0]; + model_id = (readarr[1] << 8) | readarr[2]; + } printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, manuf_id, model_id); if (manuf_id == flash->manufacture_id && model_id == flash->model_id) {

2 2

r3091 - trunk/util/flashrom
by svn＠coreboot.org 06 Feb '08

06 Feb '08

Author: hailfinger Date: 2008-02-06 23:07:58 +0100 (Wed, 06 Feb 2008) New Revision: 3091 Modified: trunk/util/flashrom/flash.h trunk/util/flashrom/flashchips.c trunk/util/flashrom/spi.c Log: Handle JEDEC JEP106W continuation codes in SPI RDID. Some vendors like Programmable Micro Corp (PMC) need this. Both the serial and parallel flash JEDEC detection routines would benefit from a parity/sanity check of the vendor ID. Will do this later. Add support for the PMC Pm25LV family of SPI flash chips. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Chris Lingard <chris(a)stockwith.co.uk> Modified: trunk/util/flashrom/flash.h =================================================================== --- trunk/util/flashrom/flash.h 2008-02-05 21:53:15 UTC (rev 3090) +++ trunk/util/flashrom/flash.h 2008-02-06 22:07:58 UTC (rev 3091) @@ -158,7 +158,20 @@ /* Programmable Micro Corp is listed in JEP106W in bank 2, so it should have * a 0x7F continuation code prefix. */ -#define PMC_ID 0x9D /* PMC */ +#define PMC_ID 0x7F9D /* PMC */ +#define PMC_ID_NOPREFIX 0x9D /* PMC, missing 0x7F prefix */ +#define PMC_25LV512 0x7B +#define PMC_25LV010 0x7C +#define PMC_25LV020 0x7D +#define PMC_25LV040 0x7E +#define PMC_25LV080B 0x13 +#define PMC_25LV016B 0x14 +#define PMC_39LV512 0x1B +#define PMC_39F010 0x1C /* also Pm39LV010 */ +#define PMC_39LV020 0x3D +#define PMC_39LV040 0x3E +#define PMC_39F020 0x4D +#define PMC_39F040 0x4E #define PMC_49FL002 0x6D #define PMC_49FL004 0x6E Modified: trunk/util/flashrom/flashchips.c =================================================================== --- trunk/util/flashrom/flashchips.c 2008-02-05 21:53:15 UTC (rev 3090) +++ trunk/util/flashrom/flashchips.c 2008-02-06 22:07:58 UTC (rev 3091) @@ -100,10 +100,22 @@ probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, {"SST49LF160C", SST_ID, SST_49LF160C, 2048, 4 * 1024 , probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc}, - {"Pm49FL002", PMC_ID, PMC_49FL002, 256, 16 * 1024, + {"Pm49FL002", PMC_ID_NOPREFIX, PMC_49FL002, 256, 16 * 1024, probe_jedec, erase_chip_jedec, write_49fl004}, - {"Pm49FL004", PMC_ID, PMC_49FL004, 512, 64 * 1024, + {"Pm49FL004", PMC_ID_NOPREFIX, PMC_49FL004, 512, 64 * 1024, probe_jedec, erase_chip_jedec, write_49fl004}, + {"Pm25LV512", PMC_ID, PMC_25LV512, 64, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV010", PMC_ID, PMC_25LV010, 128, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV020", PMC_ID, PMC_25LV020, 256, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV040", PMC_ID, PMC_25LV040, 512, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV080B", PMC_ID, PMC_25LV080B, 1024, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, + {"Pm25LV016B", PMC_ID, PMC_25LV016B, 2048, 256, + probe_spi, generic_spi_chip_erase_c7, generic_spi_chip_write, generic_spi_chip_read}, {"W29C011", WINBOND_ID, W_29C011, 128, 128, probe_jedec, erase_chip_jedec, write_jedec}, {"W29C040P", WINBOND_ID, W_29C040P, 512, 256, @@ -205,6 +217,8 @@ probe_spi, NULL, NULL}, {"MX unknown SPI chip", MX_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, + {"PMC unknown SPI chip", PMC_ID, GENERIC_DEVICE_ID, 0, 0, + probe_spi, NULL, NULL}, {"SST unknown SPI chip", SST_ID, GENERIC_DEVICE_ID, 0, 0, probe_spi, NULL, NULL}, {"ST unknown SPI chip", ST_ID, GENERIC_DEVICE_ID, 0, 0, Modified: trunk/util/flashrom/spi.c =================================================================== --- trunk/util/flashrom/spi.c 2008-02-05 21:53:15 UTC (rev 3090) +++ trunk/util/flashrom/spi.c 2008-02-06 22:07:58 UTC (rev 3091) @@ -278,11 +278,17 @@ int probe_spi(struct flashchip *flash) { unsigned char readarr[3]; - uint8_t manuf_id; - uint16_t model_id; + uint32_t manuf_id; + uint32_t model_id; if (!generic_spi_rdid(readarr)) { - manuf_id = readarr[0]; - model_id = (readarr[1] << 8) | readarr[2]; + /* Check if this is a continuation vendor ID */ + if (readarr[0] == 0x7f) { + manuf_id = (readarr[0] << 8) | readarr[1]; + model_id = readarr[2]; + } else { + manuf_id = readarr[0]; + model_id = (readarr[1] << 8) | readarr[2]; + } printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, manuf_id, model_id); if (manuf_id == flash->manufacture_id && model_id == flash->model_id) {

1 0

[LinuxBIOS] [PATCH] buildrom: add extract and busybox-config, uclibc-config targets
by Ward Vandewege 06 Feb '08

06 Feb '08

-- Ward Vandewege <ward(a)fsf.org> Free Software Foundation - Senior System Administrator

2 8

← Newer
1
...
33
34
35
36
37
38
39
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot February 2008