diff options
| author | Myles Watson <mylesgw@gmail.com> | 2009-09-22 18:53:50 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2009-09-22 18:53:50 +0000 |
| commit | a74ae635caeb0598fc1422356f13722c03262e8e (patch) | |
| tree | e63eb2aceef7c3fce36778d4628a6940c1dfb527 /targets/tyan/s2895 | |
| parent | 45bb25f36f05df7bf9ccbf9e038169d6619aba48 (diff) | |
failoverR.diff: Revert my failover change since Kconfig only supports fallback.
kconfig_s2892.dif: Add support for Tyan s2891, s2892, and s2895 to Kconfig.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4656 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'targets/tyan/s2895')
| -rw-r--r-- | targets/tyan/s2895/Config-abuild.lb | 9 | ||||
| -rw-r--r-- | targets/tyan/s2895/Config.lb | 61 |
2 files changed, 2 insertions, 68 deletions
diff --git a/targets/tyan/s2895/Config-abuild.lb b/targets/tyan/s2895/Config-abuild.lb index 22e527e6d4..1f26bbea6c 100644 --- a/targets/tyan/s2895/Config-abuild.lb +++ b/targets/tyan/s2895/Config-abuild.lb @@ -24,11 +24,4 @@ romimage "fallback" payload __PAYLOAD__ end -romimage "failover" - option CONFIG_USE_FAILOVER_IMAGE=1 - option CONFIG_USE_FALLBACK_IMAGE=0 - option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE - option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE -end - -buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" diff --git a/targets/tyan/s2895/Config.lb b/targets/tyan/s2895/Config.lb index 69a83f1fe7..122716b299 100644 --- a/targets/tyan/s2895/Config.lb +++ b/targets/tyan/s2895/Config.lb @@ -7,80 +7,21 @@ mainboard tyan/s2895 # Tyan s2895 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 -# 64K for NIC option 48K for Raid option rom -# option CONFIG_ROM_SIZE = 409600 option CONFIG_USE_FAILOVER_IMAGE=0 option CONFIG_USE_FALLBACK_IMAGE=0 -# option CONFIG_ROM_IMAGE_SIZE=0x11800 -# option CONFIG_ROM_IMAGE_SIZE=0x13800 -# option CONFIG_ROM_IMAGE_SIZE=0x15000 option CONFIG_ROM_IMAGE_SIZE=0x20000 -# option CONFIG_ROM_IMAGE_SIZE=0x17800 option CONFIG_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.zelf -# payload ../../../payloads/tg3--filo_hda2_vga.zelf -# payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf -# payload ../../../payloads/forcedeth_vga.zelf -# payload ../../../payloads/forcedeth--filo_hda2_vga_5_4.zelf -# payload ../../../../../../elf/ram0_2.5_2.6.11.tiny.elf -# payload ../../../../../../elf/ram0_2.5_2.6.12.tiny.elf -# payload ../../../payloads/tg3--filo_hda2_vga_5_4.zelf -# payload ../../../payloads/tg3_vga.zelf -# payload ../../../payloads/tg3--filo_hda2_vgax.zelf -# payload ../../../payloads/tg3--filo_hda2_com2.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 CONFIG_USE_FAILOVER_IMAGE=0 option CONFIG_USE_FALLBACK_IMAGE=1 -# option CONFIG_ROM_IMAGE_SIZE=0x11800 -# option CONFIG_ROM_IMAGE_SIZE=0x13800 -# option CONFIG_ROM_IMAGE_SIZE=0x15000 option CONFIG_ROM_IMAGE_SIZE=0x20000 -# option CONFIG_ROM_IMAGE_SIZE=0x17800 option CONFIG_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.zelf -# payload ../../../payloads/tg3--filo_hda2_vga.zelf -# payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf -# payload ../../../payloads/forcedeth_vga.zelf -# payload ../../../payloads/tg3--filo_hda2_vga_5_4.zelf -# payload ../../../payloads/tg3_vga.zelf -# payload ../../../payloads/tg3--filo_hda2_vgax.zelf -# payload ../../../payloads/tg3--filo_hda2_com2.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 "failover" - option CONFIG_USE_FAILOVER_IMAGE=1 - option CONFIG_USE_FALLBACK_IMAGE=0 - option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE - option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE - option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover" -end - - -buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover" -#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" |