Patchwork convert h8dmr to CBFS

login
register
about
Submitter Ward Vandewege
Date 2009-07-01 21:25:19
Message ID <20090701212519.GA28645@countzero.vandewege.net>
Download mbox | patch
Permalink /patch/1/
State Accepted
Headers show

Comments

Ward Vandewege - 2009-07-01 21:25:19
The patch comment says it all...

Thanks,
Ward.

-- 
Ward Vandewege <ward@fsf.org>
Free Software Foundation - Senior Systems Administrator
-- 
coreboot mailing list: coreboot@coreboot.org
http://www.coreboot.org/mailman/listinfo/coreboot
Ward Vandewege - 2009-07-02 18:27:36
On Wed, Jul 01, 2009 at 03:53:27PM -0600, Myles Watson wrote:
> 
> Signed-off-by: Ward Vandewege <ward@gnu.org>
> 
> If you put
> default CONFIG_USE_FAILOVER_IMAGE=0
> default CONFIG_USE_FALLBACK_IMAGE=0
> default CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
> 
> In Options.lb it would clean up your Config.lb files a little more.
> 
> Acked-by: Myles Watson <mylesgw@gmail.com>

Excellent idea, I've made that change.

r4393

Thanks,
Ward.

Patch


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.

Build tested with abuild, boot tested on physical hardware.

Signed-off-by: Ward Vandewege <ward@gnu.org>

Index: src/mainboard/supermicro/h8dmr/Config.lb

===================================================================
--- src/mainboard/supermicro/h8dmr/Config.lb	(revision 4392)

+++ src/mainboard/supermicro/h8dmr/Config.lb	(working copy)

@@ -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
 
Index: src/mainboard/supermicro/h8dmr/Options.lb

===================================================================
--- src/mainboard/supermicro/h8dmr/Options.lb	(revision 4392)

+++ src/mainboard/supermicro/h8dmr/Options.lb	(working copy)

@@ -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
 ##
@@ -352,5 +349,5 @@ 

 # CBFS
 #
 #
-default CONFIG_CBFS=0

+default CONFIG_CBFS=1

 end
Index: targets/supermicro/h8dmr/Config-abuild.lb

===================================================================
--- targets/supermicro/h8dmr/Config-abuild.lb	(revision 4392)

+++ targets/supermicro/h8dmr/Config-abuild.lb	(working copy)

@@ -11,27 +11,25 @@ 

 __LOGLEVEL__
 
 romimage "normal"
-        option CONFIG_USE_FAILOVER_IMAGE=0

+  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_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_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"

 end
 
 buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
Index: targets/supermicro/h8dmr/Config.lb

===================================================================
--- targets/supermicro/h8dmr/Config.lb	(revision 4392)

+++ targets/supermicro/h8dmr/Config.lb	(working copy)

@@ -23,44 +23,25 @@ 

 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 CONFIG_USE_FAILOVER_IMAGE=0

+  option CONFIG_USE_FALLBACK_IMAGE=0

+  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_FAILOVER_IMAGE=0

+  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_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"

 end
 
-#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"

 buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"