Patchwork Serengeti failover fix

login
register
about
Submitter Myles Watson
Date 2009-10-08 14:12:52
Message ID <2831fecf0910080712u71e647daof00136ff7aa21f9a@mail.gmail.com>
Download mbox | patch
Permalink /patch/368/
State Accepted
Commit r4747
Headers show

Comments

Myles Watson - 2009-10-08 14:12:52
Simplify targets/amd/serengeti_cheetah/Config.lb.  There were too many
variables being set incorrectly.

Boot tested on SimNOW.

Signed-off-by: Myles Watson <mylesgw@gmail.com>

It is also abuild-tested, but abuild doesn't use this Config file.
That's why the broken build wasn't caught before this.

Thanks,
Myles
Peter Stuge - 2009-10-08 17:21:25
Myles Watson wrote:
> Simplify targets/amd/serengeti_cheetah/Config.lb.  There were too many
> variables being set incorrectly.
> 
> Boot tested on SimNOW.
> 
> Signed-off-by: Myles Watson <mylesgw@gmail.com>

Acked-by: Peter Stuge <peter@stuge.se>


> It is also abuild-tested, but abuild doesn't use this Config file.
> That's why the broken build wasn't caught before this.

I think it would be nice to not have a special config for build
testing with Kconfig, to try to avoid that. If something is broken we
should try to fix it.


//Peter
Patrick Georgi - 2009-10-08 17:44:00
Am Donnerstag, den 08.10.2009, 19:21 +0200 schrieb Peter Stuge:
> I think it would be nice to not have a special config for build
> testing with Kconfig, to try to avoid that. If something is broken we
> should try to fix it.
kbuildall should be the same as selecting the vendor+board and leaving
everything else to defaults.


Patrick
Myles Watson - 2009-10-08 18:51:22
On Thu, Oct 8, 2009 at 11:21 AM, Peter Stuge <peter@stuge.se> wrote:
> Myles Watson wrote:
>> Simplify targets/amd/serengeti_cheetah/Config.lb.  There were too many
>> variables being set incorrectly.
>>
>> Boot tested on SimNOW.
>>
>> Signed-off-by: Myles Watson <mylesgw@gmail.com>
>
> Acked-by: Peter Stuge <peter@stuge.se>
Rev 4747.

Thanks,
Myles
Myles Watson - 2009-10-08 18:52:48
On Thu, Oct 8, 2009 at 11:44 AM, Patrick Georgi <patrick@georgi-clan.de> wrote:
> Am Donnerstag, den 08.10.2009, 19:21 +0200 schrieb Peter Stuge:
>> I think it would be nice to not have a special config for build
>> testing with Kconfig, to try to avoid that. If something is broken we
>> should try to fix it.
> kbuildall should be the same as selecting the vendor+board and leaving
> everything else to defaults.
Yes.  It's very nice.  The only thing that's missing is mailing list
integration.

Thanks,
Myles
Peter Stuge - 2009-10-08 19:27:19
Patrick Georgi wrote:
> > I think it would be nice to not have a special config for build
> > testing with Kconfig,
> 
> kbuildall should be the same as selecting the vendor+board and
> leaving everything else to defaults.

Fantastic!

I am really excited about these improvements to coreboot thanks to
Kconfig and cbfs! It may seem trivial when familiar with the code
already but it is a HUGE improvement in usability for aspiring
coreboot developers! :)


//Peter

Patch

Index: svn/src/config/failovercalculation.lb
===================================================================
--- svn.orig/src/config/failovercalculation.lb
+++ svn/src/config/failovercalculation.lb
@@ -5,6 +5,7 @@ 
 if CONFIG_USE_FAILOVER_IMAGE
 	default CONFIG_ROM_SECTION_SIZE   = CONFIG_FAILOVER_SIZE
 	default CONFIG_ROM_SECTION_OFFSET = ( CONFIG_ROM_SIZE - CONFIG_FAILOVER_SIZE )
+	default CONFIG_ROM_IMAGE_SIZE = CONFIG_FAILOVER_SIZE
 else
     if CONFIG_USE_FALLBACK_IMAGE
 	default CONFIG_ROM_SECTION_SIZE   = CONFIG_FALLBACK_SIZE
Index: svn/targets/amd/serengeti_cheetah/Config.lb
===================================================================
--- svn.orig/targets/amd/serengeti_cheetah/Config.lb
+++ svn/targets/amd/serengeti_cheetah/Config.lb
@@ -5,83 +5,24 @@ 
 target serengeti_cheetah
 mainboard amd/serengeti_cheetah
 
-# serengeti_leopard
 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 
 	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 ../../../payloads/tg3--ide_disk.zelf
-#        payload ../../../payloads/filo.elf
-#        payload ../../../payloads/filo_mem.elf
-#        payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo_hda2.zelf
-#	payload ../../../payloads/tg3.zelf
-#	payload ../../../../payloads/tg3_vga.zelf
-#	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
-#	payload ../../../../payloads/tg3--filo_hda2_vga_5.4.1.zelf
-#	payload ../../../../payloads/e1000_vga.zelf
-#	payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
-#	payload ../../../payloads/tg3_com2.zelf
-#       payload ../../../payloads/e1000--filo.zelf
-#        payload ../../../payloads/tg3--e1000--filo.zelf
-#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
-#	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
-#	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
 	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 ../../../payloads/tg3--ide_disk.zelf
-#        payload ../../../payloads/filo.elf
-#        payload ../../../payloads/filo_mem.elf
-#        payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo_hda2.zelf
-#	payload ../../../payloads/tg3.zelf
-#	payload ../../../../payloads/tg3_vga.zelf
-#	payload ../../../../payloads/memtest
-#	payload ../../../../payloads/adlo.elf
-#	payload ../../../../payloads/e1000_vga.zelf
-#	payload ../../../../payloads/filo_hda.zelf
-#	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
-#	payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
-#	payload ../../../../payloads/tg3--filo_hda2_vga_5.4.1.zelf
-#	payload ../../../../payloads/filo_hda2_novga.zelf
-#	payload ../../../payloads/tg3_com2.zelf
-#       payload ../../../payloads/e1000--filo.zelf
-#        payload ../../../payloads/tg3--e1000--filo.zelf
-#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
-#	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
-#	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
 	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"
 end
 
-
 buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
-#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"