Author: ward Date: 2008-10-10 23:28:58 +0200 (Fri, 10 Oct 2008) New Revision: 247
Added: buildrom-devel/packages/coreboot-v2/patches/s2881-lab-vga-fix.patch Modified: buildrom-devel/config/platforms/tyan-s2881.conf buildrom-devel/packages/coreboot-v2/coreboot.inc Log:
The Tyan s2881 ships with a 512KB rom chip. For LAB we require an 1MB chip, but the VGA rom address is hardcoded assuming the 512KB chip.
This patch
a) bumps up the v2 revision to 3646 which actually enables vga on the s2881 b) conditionally patches the v2 tree for a 1MB chip when the s2881 is being built with the LAB config file.
Tested on real hardware.
Signed-off-by: Ward Vandewege ward@gnu.org Acked-by: Jordan Crouse jordan.crouse@amd.com
Modified: buildrom-devel/config/platforms/tyan-s2881.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2881.conf 2008-10-10 19:54:41 UTC (rev 246) +++ buildrom-devel/config/platforms/tyan-s2881.conf 2008-10-10 21:28:58 UTC (rev 247) @@ -30,4 +30,4 @@ COREBOOT_VENDOR=tyan COREBOOT_BOARD=s2881 CBV2_TDIR=s2881 -CBV2_TAG=3131 +CBV2_TAG=3646
Modified: buildrom-devel/packages/coreboot-v2/coreboot.inc =================================================================== --- buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-10-10 19:54:41 UTC (rev 246) +++ buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-10-10 21:28:58 UTC (rev 247) @@ -3,6 +3,9 @@ ifeq ($(CONFIG_USE_LZMA),y) CBV2_CONFIG=Config-lab.lb CBV2_PAYLOAD_FILE_EXT=elf.lzma +ifeq ($(COREBOOT_BOARD),s2881) + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/s2881-lab-vga-fix.patch +endif else CBV2_CONFIG=Config.lb CBV2_PAYLOAD_FILE_EXT=elf @@ -150,6 +153,7 @@
$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_COMPONENTS) @ mkdir -p $(OUTPUT_DIR) + @ echo $(BIN_DIR)/construct-rom.sh $(PLATFORM_DOPAD) $(CBV2_COMPONENTS) @ $(BIN_DIR)/construct-rom.sh $(PLATFORM_DOPAD) $(CBV2_COMPONENTS) > $@
generic-coreboot: $(OUTPUT_DIR)/$(TARGET_ROM)
Added: buildrom-devel/packages/coreboot-v2/patches/s2881-lab-vga-fix.patch =================================================================== --- buildrom-devel/packages/coreboot-v2/patches/s2881-lab-vga-fix.patch (rev 0) +++ buildrom-devel/packages/coreboot-v2/patches/s2881-lab-vga-fix.patch 2008-10-10 21:28:58 UTC (rev 247) @@ -0,0 +1,14 @@ +Index: src/mainboard/tyan/s2881/Config.lb +=================================================================== +--- a/src/mainboard/tyan/s2881/Config.lb (revision 3646) ++++ a/src/mainboard/tyan/s2881/Config.lb (working copy) +@@ -231,7 +231,8 @@ + end + chip drivers/pci/onboard + device pci 6.0 on end +- register "rom_address" = "0xfff80000" ++ #register "rom_address" = "0xfff80000" #for 512K ++ register "rom_address" = "0xfff00000" #for 1M + end + end + device pci 1.0 on