Author: ward Date: 2007-12-07 20:18:55 +0100 (Fri, 07 Dec 2007) New Revision: 79
Added: buildrom-devel/packages/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch Removed: buildrom-devel/packages/linuxbios/patches/m57sli-filo-Config.lb.patch Modified: buildrom-devel/Config.in buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk Log:
This patch fixes etherboot booting for the gigabyte m57sli-s4 board by disabling LZMA payload compression for the etherboot payload (they don't get along).
And it renames the linuxbios Config.lb patch so that it's more clear that it is now used by both the etherboot and filo payloads.
This is a trivial patch.
Signed-off-by: Ward Vandewege ward@gnu.org Acked-by: Ward Vandewege ward@gnu.org
Modified: buildrom-devel/Config.in =================================================================== --- buildrom-devel/Config.in 2007-12-06 16:38:25 UTC (rev 78) +++ buildrom-devel/Config.in 2007-12-07 19:18:55 UTC (rev 79) @@ -64,6 +64,7 @@ bool "Enable LZMA compression" depends !PAYLOAD_OFW depends !PAYLOAD_FILO + depends !PAYLOAD_ETHERBOOT default y help Allow LZMA compression for the payload. This doesn't work
Modified: buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk 2007-12-06 16:38:25 UTC (rev 78) +++ buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk 2007-12-07 19:18:55 UTC (rev 79) @@ -9,9 +9,13 @@ LINUXBIOS_PATCHES=
ifeq ($(CONFIG_PAYLOAD_FILO),y) - LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-filo-Config.lb.patch + LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch endif
+ifeq ($(CONFIG_PAYLOAD_ETHERBOOT),y) + LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch +endif + ifeq ($(CONFIG_PAYLOAD_KERNEL),y) LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-kernel-and-lab-Config.lb.patch endif
Deleted: buildrom-devel/packages/linuxbios/patches/m57sli-filo-Config.lb.patch =================================================================== --- buildrom-devel/packages/linuxbios/patches/m57sli-filo-Config.lb.patch 2007-12-06 16:38:25 UTC (rev 78) +++ buildrom-devel/packages/linuxbios/patches/m57sli-filo-Config.lb.patch 2007-12-07 19:18:55 UTC (rev 79) @@ -1,97 +0,0 @@ -Index: Config.lb -=================================================================== ---- LinuxBIOSv2/targets/gigabyte/m57sli/Config.lb-orig 2007-08-14 14:49:13.000000000 -0400 -+++ LinuxBIOSv2/targets/gigabyte/m57sli/Config.lb 2007-08-21 17:56:34.000000000 -0400 -@@ -22,83 +22,30 @@ - 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 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 -+ 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 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 ./linuxbios.rom ROM_SIZE "normal" "fallback" - buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
Copied: buildrom-devel/packages/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch (from rev 78, buildrom-devel/packages/linuxbios/patches/m57sli-filo-Config.lb.patch) =================================================================== --- buildrom-devel/packages/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch (rev 0) +++ buildrom-devel/packages/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch 2007-12-07 19:18:55 UTC (rev 79) @@ -0,0 +1,97 @@ +Index: Config.lb +=================================================================== +--- LinuxBIOSv2/targets/gigabyte/m57sli/Config.lb-orig 2007-08-14 14:49:13.000000000 -0400 ++++ LinuxBIOSv2/targets/gigabyte/m57sli/Config.lb 2007-08-21 17:56:34.000000000 -0400 +@@ -22,83 +22,30 @@ + 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 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 ++ 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 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 ./linuxbios.rom ROM_SIZE "normal" "fallback" + buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"