Here's a patch towards r3690 upping the ROM size for the S2912 Fam10 target to 1M.

Both regular and abuild images have been boot tested successfully. 

Signed-off-by: Arne Georg Gleditsch <arne.gleditsch@numascale.com>
Acked-by: Marc Jones <marc.jones@amd.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3711 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Arne Georg Gleditsch 2008-10-30 20:17:11 +00:00 committed by Marc Jones
parent edc7ef2b76
commit 429d6b6692
4 changed files with 31 additions and 77 deletions

View File

@ -92,7 +92,7 @@ if USE_DCACHE_RAM
else else
makerule ./cache_as_ram_auto.inc makerule ./cache_as_ram_auto.inc
depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h" depends "$(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) option_table.h"
action "$(CC) -I$(TOP)/src -I. $(CFLAGS) $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -S -o $@" action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CFLAGS) $(CPPFLAGS) $(MAINBOARD)/$(CACHE_AS_RAM_AUTO_C) -Os -nostdinc -nostdlib -fno-builtin -Wall -c -S -o $@"
action "perl -e 's/.rodata/.rom.data/g' -pi $@" action "perl -e 's/.rodata/.rom.data/g' -pi $@"
action "perl -e 's/.text/.section .rom.text/g' -pi $@" action "perl -e 's/.text/.section .rom.text/g' -pi $@"
end end
@ -105,7 +105,7 @@ else
if CONFIG_AP_CODE_IN_CAR if CONFIG_AP_CODE_IN_CAR
makerule ./apc_auto.o makerule ./apc_auto.o
depends "$(MAINBOARD)/apc_auto.c option_table.h" depends "$(MAINBOARD)/apc_auto.c option_table.h"
action "$(CC) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/apc_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@" action "$(CC) $(DISTRO_CFLAGS) -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/apc_auto.c -Os -nostdinc -nostdlib -fno-builtin -Wall -c -o $@"
end end
ldscript /arch/i386/init/ldscript_apc.lb ldscript /arch/i386/init/ldscript_apc.lb
end end
@ -345,7 +345,7 @@ chip northbridge/amd/amdfam10/root_complex
device pci 6.0 on device pci 6.0 on
chip drivers/pci/onboard chip drivers/pci/onboard
device pci 4.0 on end device pci 4.0 on end
register "rom_address" = "0xfff80000" register "rom_address" = "0xfff00000"
end end
end # PCI end # PCI
device pci 6.1 off end # AZA device pci 6.1 off end # AZA

View File

@ -126,7 +126,7 @@ uses AMD_UCODE_PATCH_FILE
## ##
## ROM_SIZE is the size of boot ROM that this board will use. ## ROM_SIZE is the size of boot ROM that this board will use.
## ##
default ROM_SIZE=524288 default ROM_SIZE=1024*1024
#default ROM_SIZE=0x100000 #default ROM_SIZE=0x100000
## ##
@ -135,9 +135,7 @@ default ROM_SIZE=524288
#default FALLBACK_SIZE=131072 #default FALLBACK_SIZE=131072
#default FALLBACK_SIZE=0x40000 #default FALLBACK_SIZE=0x40000
#FALLBACK: ROM_SIZE-4K default FALLBACK_SIZE=0x3f000
default FALLBACK_SIZE=ROM_SIZE-0x01000
#FAILOVER: 4K
default FAILOVER_SIZE=0x01000 default FAILOVER_SIZE=0x01000
#more 1M for pgtbl #more 1M for pgtbl

View File

@ -21,26 +21,36 @@
target tyan_s2912_fam10 target tyan_s2912_fam10
mainboard tyan/s2912_fam10 mainboard tyan/s2912_fam10
option CC="CROSSCC"
option CROSS_COMPILE="CROSS_PREFIX"
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__ __COMPRESSION__
option ROM_SIZE = 0x80000
option FALLBACK_SIZE = 0x40000
option FAILOVER_SIZE = 0x00
romimage "normal" romimage "normal"
option USE_FAILOVER_IMAGE=0
option USE_FALLBACK_IMAGE=0 option USE_FALLBACK_IMAGE=0
option ROM_IMAGE_SIZE=0x24000 option ROM_IMAGE_SIZE=0x20000
option XIP_ROM_SIZE=0x40000 option XIP_ROM_SIZE=0x40000
option COREBOOT_EXTRA_VERSION=".0-Normal" option COREBOOT_EXTRA_VERSION=".0-Normal"
payload __PAYLOAD__ payload __PAYLOAD__
end end
romimage "fallback" romimage "fallback"
option USE_FAILOVER_IMAGE=0
option USE_FALLBACK_IMAGE=1 option USE_FALLBACK_IMAGE=1
option ROM_IMAGE_SIZE=0x24000 option ROM_IMAGE_SIZE=0x20000
option XIP_ROM_SIZE=0x40000 option XIP_ROM_SIZE=0x40000
option COREBOOT_EXTRA_VERSION=".0-Fallback" option COREBOOT_EXTRA_VERSION=".0-Fallback"
payload __PAYLOAD__ payload __PAYLOAD__
end end
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" 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=".0-Failover"
end
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"

View File

@ -24,80 +24,27 @@
target s2912_fam10 target s2912_fam10
mainboard tyan/s2912_fam10 mainboard tyan/s2912_fam10
# This builds a fallback-only BIOS that fits in a 512K ROM. The S2912 onboard # Make room for ATI ES1000 VGA ROM
# flash is 1024K, so for use with that pad resulting ROM with 512KB lead-in. option ROM_SIZE=ROM_SIZE-44*1024
# Make room for ES1000 VGA ROM
option ROM_SIZE=(512-44)*1024
# serengeti_leopard
romimage "normal" romimage "normal"
# 48K for SCSI FW option USE_FAILOVER_IMAGE=0
# 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 USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x13800
# option ROM_IMAGE_SIZE=0x18800
option ROM_IMAGE_SIZE=0x20000 option ROM_IMAGE_SIZE=0x20000
# option ROM_IMAGE_SIZE=0x15800
option XIP_ROM_SIZE=0x40000 option XIP_ROM_SIZE=0x40000
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
# payload ../../../payloads/tg3--ide_disk.zelf # payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
# payload ../../../payloads/filo.elf payload ../payload.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 end
romimage "fallback" romimage "fallback"
option USE_FAILOVER_IMAGE=0 option USE_FAILOVER_IMAGE=0
option USE_FALLBACK_IMAGE=1 option USE_FALLBACK_IMAGE=1
# option ROM_IMAGE_SIZE=0x13800
# option ROM_IMAGE_SIZE=0x19800
option ROM_IMAGE_SIZE=0x20000 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" option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
# payload ../../../payloads/tg3--ide_disk.zelf # payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
# payload ../../../payloads/filo.elf payload ../payload.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
end end
romimage "failover" romimage "failover"
@ -108,5 +55,4 @@ romimage "failover"
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover" option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
end end
#buildrom ./coreboot.rom ROM_SIZE "normal" "failover" buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"