Patchwork Fix newconfigs build for M57SLI

login
register
about
Submitter Harald Gutmann
Date 2010-02-04 10:26:17
Message ID <201002041126.17686.harald.gutmann@gmx.net>
Download mbox | patch
Permalink /patch/878/
State Accepted
Commit r5084
Headers show

Comments

Harald Gutmann - 2010-02-04 10:26:17
Patch once more with diff from the cb toplevel.




On Thursday 04 February 2010 11:16:23 Harald Gutmann wrote:
> Hello,
> 
> as I want to get the Kconfig part of m57sli running, I needed to build once
> again a newconfig image for m57sli. The last few times I built a newconfig
>  image I had some troubles to get a fine build.
> 
> Here is a patch which fixes the build issues on m57sli with a chip size of
>  1mb. If someone needs a 512kb sized image, just change the CONFIG_ROM_SIZE
>  to 0x80000.
> 
> I'd like to see that commited, so that I don't need to struggle with build
> errors on newconfig once more. ;)
> 
> 
> Signed-off-by: Harald Gutmann <harald.gutmann@gmx.net>
> 
> 
> Regards,
> Harald
>
Patrick Georgi - 2010-02-04 10:29:13
Am 04.02.2010 11:26, schrieb Harald Gutmann:
> Patch once more with diff from the cb toplevel.
Thank you!

> On Thursday 04 February 2010 11:16:23 Harald Gutmann wrote:
>> Hello,
>>
>> as I want to get the Kconfig part of m57sli running, I needed to build once
>> again a newconfig image for m57sli. The last few times I built a newconfig
>>  image I had some troubles to get a fine build.
>>
>> Here is a patch which fixes the build issues on m57sli with a chip size of
>>  1mb. If someone needs a 512kb sized image, just change the CONFIG_ROM_SIZE
>>  to 0x80000.
>>
>> I'd like to see that commited, so that I don't need to struggle with build
>> errors on newconfig once more. ;)
>>
>>
>> Signed-off-by: Harald Gutmann <harald.gutmann@gmx.net>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
and committed as r5084


Thanks,
Patrick

Patch

Index: targets/gigabyte/m57sli/Config.lb
===================================================================
--- targets/gigabyte/m57sli/Config.lb	(revision 5083)
+++ targets/gigabyte/m57sli/Config.lb	(working copy)
@@ -22,75 +22,25 @@ 
 target m57sli
 mainboard gigabyte/m57sli
 
-# serengeti_leopard
+option CONFIG_ROM_SIZE = 0x100000
+
 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_BASE=0xFFF80000
 	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.zelf
-#	payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf
-#	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.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_BASE=0xFFF80000
 	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/e1000_vga.zelf
-#	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
-#	payload ../../../../payloads/filo_hda.zelf
-#	payload ../../../../payloads/adlo.elf
-#	payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
-#	payload ../../../../payloads/forcedeth_mcp55_filo_hda2.zelf
-#	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
-#	payload ../../../../payloads/forcedeth--filo_hda2_vga.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