summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWard Vandewege <ward@gnu.org>2009-07-02 18:27:02 +0000
committerWard Vandewege <ward@gnu.org>2009-07-02 18:27:02 +0000
commit2468331952bae0abdc4d76dbe6cf26f05b7825e5 (patch)
tree656fe1fb80212dd1b46a0a81f3d8a6619852fe3d
parent1a692d817650068e2125036d25bbaf2f3e9ec876 (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
-rw-r--r--src/mainboard/supermicro/h8dmr/Config.lb1
-rw-r--r--src/mainboard/supermicro/h8dmr/Options.lb22
-rw-r--r--targets/supermicro/h8dmr/Config-abuild.lb13
-rw-r--r--targets/supermicro/h8dmr/Config.lb40
4 files changed, 23 insertions, 53 deletions
diff --git a/src/mainboard/supermicro/h8dmr/Config.lb b/src/mainboard/supermicro/h8dmr/Config.lb
index b8c78b1c9d..2aca572d6c 100644
--- a/src/mainboard/supermicro/h8dmr/Config.lb
+++ b/src/mainboard/supermicro/h8dmr/Config.lb
@@ -58,7 +58,6 @@ else
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
diff --git a/src/mainboard/supermicro/h8dmr/Options.lb b/src/mainboard/supermicro/h8dmr/Options.lb
index c7d50c55b2..1cdc3a776b 100644
--- a/src/mainboard/supermicro/h8dmr/Options.lb
+++ b/src/mainboard/supermicro/h8dmr/Options.lb
@@ -126,13 +126,9 @@ uses CONFIG_USE_PRINTK_IN_CAR
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_SIZE=0x08000
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,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.
-default CONFIG_ROM_IMAGE_SIZE = 65536
+default CONFIG_ROM_IMAGE_SIZE = 0xf000
+
##
## Use a small 8K stack
@@ -347,10 +344,15 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
## 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
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"