[coreboot] [v2] r4393 - in trunk/coreboot-v2: src/mainboard/supermicro/h8dmr targets/supermicro/h8dmr
svn at coreboot.org
svn at coreboot.org
Thu Jul 2 20:27:02 CEST 2009
Author: ward
Date: 2009-07-02 20:27:02 +0200 (Thu, 02 Jul 2009)
New Revision: 4393
Modified:
trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb
trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Options.lb
trunk/coreboot-v2/targets/supermicro/h8dmr/Config-abuild.lb
trunk/coreboot-v2/targets/supermicro/h8dmr/Config.lb
Log:
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 at gnu.org>
Acked-by: Myles Watson <mylesgw at gmail.com>
Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb 2009-07-01 17:01:17 UTC (rev 4392)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb 2009-07-02 18:27:02 UTC (rev 4393)
@@ -58,7 +58,6 @@
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 $@"
end
- ldscript /arch/i386/init/ldscript_apc.lb
end
end
Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Options.lb 2009-07-01 17:01:17 UTC (rev 4392)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Options.lb 2009-07-02 18:27:02 UTC (rev 4393)
@@ -126,13 +126,9 @@
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=0x40000
-
-#FALLBACK: 256K-4K
-default CONFIG_FALLBACK_SIZE=0x3f000
+default CONFIG_FALLBACK_SIZE=CONFIG_ROM_IMAGE_SIZE
#FAILOVER: 4K
default CONFIG_FAILOVER_SIZE=0x01000
@@ -234,7 +230,7 @@
default CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE=0x01000
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_WAIT_BEFORE_CPUS_INIT=1
@@ -256,8 +252,9 @@
###
## 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
##
@@ -347,10 +344,15 @@
## Select power on after power fail setting
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
#
#
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
+
+### End Options.lb
end
Modified: trunk/coreboot-v2/targets/supermicro/h8dmr/Config-abuild.lb
===================================================================
--- trunk/coreboot-v2/targets/supermicro/h8dmr/Config-abuild.lb 2009-07-01 17:01:17 UTC (rev 4392)
+++ trunk/coreboot-v2/targets/supermicro/h8dmr/Config-abuild.lb 2009-07-02 18:27:02 UTC (rev 4393)
@@ -11,27 +11,20 @@
__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"
Modified: trunk/coreboot-v2/targets/supermicro/h8dmr/Config.lb
===================================================================
--- trunk/coreboot-v2/targets/supermicro/h8dmr/Config.lb 2009-07-01 17:01:17 UTC (rev 4392)
+++ trunk/coreboot-v2/targets/supermicro/h8dmr/Config.lb 2009-07-02 18:27:02 UTC (rev 4393)
@@ -23,44 +23,20 @@
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"
More information about the coreboot
mailing list