diff options
| author | Ward Vandewege <ward@gnu.org> | 2009-07-02 18:27:02 +0000 |
|---|---|---|
| committer | Ward Vandewege <ward@gnu.org> | 2009-07-02 18:27:02 +0000 |
| commit | 2468331952bae0abdc4d76dbe6cf26f05b7825e5 (patch) | |
| tree | 656fe1fb80212dd1b46a0a81f3d8a6619852fe3d /targets/supermicro | |
| parent | 1a692d817650068e2125036d25bbaf2f3e9ec876 (diff) | |
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
Diffstat (limited to 'targets/supermicro')
| -rw-r--r-- | targets/supermicro/h8dmr/Config-abuild.lb | 13 | ||||
| -rw-r--r-- | targets/supermicro/h8dmr/Config.lb | 40 |
2 files changed, 11 insertions, 42 deletions
diff --git a/targets/supermicro/h8dmr/Config-abuild.lb b/targets/supermicro/h8dmr/Config-abuild.lb index 2c97443c6e..d531301cb9 100644 --- a/targets/supermicro/h8dmr/Config-abuild.lb +++ b/targets/supermicro/h8dmr/Config-abuild.lb @@ -11,27 +11,20 @@ __COMPRESSION__ __LOGLEVEL__ 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" payload __PAYLOAD__ end romimage "fallback" - option CONFIG_USE_FAILOVER_IMAGE=0 option CONFIG_USE_FALLBACK_IMAGE=1 - option CONFIG_ROM_IMAGE_SIZE=0x20000 option COREBOOT_EXTRA_VERSION=".0-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 - option COREBOOT_EXTRA_VERSION=".0-failover" + option CONFIG_USE_FAILOVER_IMAGE=1 + option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE + option COREBOOT_EXTRA_VERSION=".0-failover" end buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover" diff --git a/targets/supermicro/h8dmr/Config.lb b/targets/supermicro/h8dmr/Config.lb index 37f54c252a..ac4266d5da 100644 --- a/targets/supermicro/h8dmr/Config.lb +++ b/targets/supermicro/h8dmr/Config.lb @@ -23,44 +23,20 @@ target h8dmr mainboard supermicro/h8dmr 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 ../payload.elf + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" + 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 ../payload.elf + option CONFIG_USE_FALLBACK_IMAGE=1 + option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" + 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" + option CONFIG_USE_FAILOVER_IMAGE=1 + option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE + 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" |