Trivial fix for tyan/s2912 to build. Remove overspecified options in Config.lb.
Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4950 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
3aa5f6178a
commit
354bde6e0d
|
@ -24,74 +24,19 @@
|
|||
target s2912
|
||||
mainboard tyan/s2912
|
||||
|
||||
# serengeti_leopard
|
||||
romimage "normal"
|
||||
# 48K for SCSI FW
|
||||
# option CONFIG_ROM_SIZE = 475136
|
||||
# 48K for SCSI FW and 48K for ATI ROM
|
||||
# option CONFIG_ROM_SIZE = 425984
|
||||
# 64K for Etherboot
|
||||
# option CONFIG_ROM_SIZE = 458752
|
||||
# 44k for atixx.rom
|
||||
# option CONFIG_ROM_SIZE = 479232
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=0
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x13800
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x18800
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x20000
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x15800
|
||||
option CONFIG_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 CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=1
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x13800
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x19800
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x20000
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x15800
|
||||
option CONFIG_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 ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
|
||||
payload ../payload.elf
|
||||
end
|
||||
|
||||
romimage "failover"
|
||||
|
@ -102,5 +47,4 @@ romimage "failover"
|
|||
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
|
||||
end
|
||||
|
||||
#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
|
||||
|
|
|
@ -30,18 +30,13 @@ option CONFIG_ROM_SIZE=CONFIG_ROM_SIZE-44*1024
|
|||
romimage "normal"
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=0
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x20000
|
||||
option CONFIG_XIP_ROM_SIZE=0x40000
|
||||
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
|
||||
# payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
|
||||
payload ../payload.elf
|
||||
end
|
||||
|
||||
romimage "fallback"
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=1
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x20000
|
||||
option CONFIG_XIP_ROM_SIZE=0x40000
|
||||
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
|
||||
# payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
|
||||
payload ../payload.elf
|
||||
|
|
Loading…
Reference in New Issue