GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert Supermicro H8DMR to CBFS. Also clean up some whitespace in 

targets/supermicro/h8dmr/Config.lb and Config-abuild.lb.

Importantly, this also sets

  default CONFIG_AP_CODE_IN_CAR=0

in

  src/mainboard/supermicro/h8dmr/Options.lb

which is required to make this box boot since the changes that went in in
r4315.

At Myles' suggestion, this patch also sets

  default CONFIG_USE_FAILOVER_IMAGE=0
  default CONFIG_USE_FALLBACK_IMAGE=0
  default CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE

in src/mainboard/supermicro/h8dmr/Options.lb to simplify
targets/supermicro/h8dmr/Config.lb a bit further.

Build tested with abuild, boot tested on physical hardware.

Signed-off-by: Ward Vandewege <ward@gnu.org>
Acked-by: Myles Watson <mylesgw@gmail.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4393 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Ward Vandewege 2009-07-02 18:27:02 +00:00
parent 1a692d8176
commit 2468331952
4 changed files with 23 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mainboard/supermicro/h8dmr/Config.lb
View File

@ -58,7 +58,6 @@ else
depends "$(CONFIG_MAINBOARD)/apc_auto.c option_table.h" depends "$(CONFIG_MAINBOARD)/apc_auto.c option_table.h"
action "$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I$(TOP)/src -I. -c $(CONFIG_MAINBOARD)/apc_auto.c -o $@" action "$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I$(TOP)/src -I. -c $(CONFIG_MAINBOARD)/apc_auto.c -o $@"
end end
ldscript /arch/i386/init/ldscript_apc.lb
end end
end end

22
src/mainboard/supermicro/h8dmr/Options.lb
View File

@ -126,13 +126,9 @@ uses CONFIG_USE_PRINTK_IN_CAR
default CONFIG_ROM_SIZE=0x100000 default CONFIG_ROM_SIZE=0x100000
## ##
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image will use ## CONFIG_FALLBACK_SIZE is the amount of the ROM the ROM part of the fallback image will use
## ##
#default CONFIG_FALLBACK_SIZE=131072 default CONFIG_FALLBACK_SIZE=CONFIG_ROM_IMAGE_SIZE
#default CONFIG_FALLBACK_SIZE=0x40000
#FALLBACK: 256K-4K
default CONFIG_FALLBACK_SIZE=0x3f000
#FAILOVER: 4K #FAILOVER: 4K
default CONFIG_FAILOVER_SIZE=0x01000 default CONFIG_FAILOVER_SIZE=0x01000
@ -234,7 +230,7 @@ default CONFIG_DCACHE_RAM_SIZE=0x08000
default CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE=0x01000 default CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE=0x01000
default CONFIG_USE_INIT=0 default CONFIG_USE_INIT=0
default CONFIG_AP_CODE_IN_CAR=1 default CONFIG_AP_CODE_IN_CAR=0
default CONFIG_MEM_TRAIN_SEQ=1 default CONFIG_MEM_TRAIN_SEQ=1
default CONFIG_WAIT_BEFORE_CPUS_INIT=1 default CONFIG_WAIT_BEFORE_CPUS_INIT=1
@ -256,7 +252,8 @@ default CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1511
### ###
## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy. ## CONFIG_ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
default CONFIG_ROM_IMAGE_SIZE = 65536 default CONFIG_ROM_IMAGE_SIZE = 0xf000
## ##
## Use a small 8K stack ## Use a small 8K stack
@ -347,10 +344,15 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
## Select power on after power fail setting ## Select power on after power fail setting
default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON" default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb default CONFIG_USE_FAILOVER_IMAGE=0
default CONFIG_USE_FALLBACK_IMAGE=0
default CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
# #
# CBFS # CBFS
# #
# #
default CONFIG_CBFS=0 default CONFIG_CBFS=1
### End Options.lb
end end

13
targets/supermicro/h8dmr/Config-abuild.lb
View File

@ -11,27 +11,20 @@ __COMPRESSION__
__LOGLEVEL__ __LOGLEVEL__
romimage "normal" romimage "normal"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal" option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__ payload __PAYLOAD__
end end
romimage "fallback" romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1 option CONFIG_USE_FALLBACK_IMAGE=1
option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback" option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__ payload __PAYLOAD__
end end
romimage "failover" romimage "failover"
option CONFIG_USE_FAILOVER_IMAGE=1 option CONFIG_USE_FAILOVER_IMAGE=1
option CONFIG_USE_FALLBACK_IMAGE=0 option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE option COREBOOT_EXTRA_VERSION=".0-failover"
option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
option COREBOOT_EXTRA_VERSION=".0-failover"
end end
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover" buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"

40
targets/supermicro/h8dmr/Config.lb
View File

@ -23,44 +23,20 @@ target h8dmr
mainboard supermicro/h8dmr mainboard supermicro/h8dmr
romimage "normal" romimage "normal"
# 48K for SCSI FW option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
# option CONFIG_ROM_SIZE = 475136 payload ../payload.elf
# 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 ../payload.elf
end end
romimage "fallback" romimage "fallback"
option CONFIG_USE_FAILOVER_IMAGE=0 option CONFIG_USE_FALLBACK_IMAGE=1
option CONFIG_USE_FALLBACK_IMAGE=1 option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
# option CONFIG_ROM_IMAGE_SIZE=0x13800 payload ../payload.elf
# 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 ../payload.elf
end end
romimage "failover" romimage "failover"
option CONFIG_USE_FAILOVER_IMAGE=1 option CONFIG_USE_FAILOVER_IMAGE=1
option CONFIG_USE_FALLBACK_IMAGE=0 option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
end end
#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover" buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"