Patchwork Change some more image names to "fallback" (not "image").

login
register
about
Submitter Uwe Hermann
Date 2009-08-27 13:36:44
Message ID <20090827133644.GG7448@greenwood>
Download mbox | patch
Permalink /patch/209/
State Accepted
Headers show

Comments

Uwe Hermann - 2009-08-27 13:36:44
On Thu, Aug 27, 2009 at 11:36:45AM +0200, Carl-Daniel Hailfinger wrote:
> On 27.08.2009 09:43, Patrick Georgi wrote:
> > Am Donnerstag, den 27.08.2009, 05:32 +0200 schrieb Carl-Daniel
> > Hailfinger:
> >   
> >> via/epia-m700 and via/pc2500e do not have fallback/coreboot_ram in the
> >> abuild images. Instead they have image/coreboot_ram which will probably
> >> cause cbfs code to die.
> >> If my suspicion is correct, those targets need fixups similar to r4589.
> >>     
> > You're right, I fixed them.
> >   
> 
> Thanks!
> 
> AFAICS the whole tree now has fallback/coreboot_ram in the abuild images.

Here's a bunch of additional fixes for manually builds.


Uwe.
Carl-Daniel Hailfinger - 2009-08-27 13:41:08
On 27.08.2009 15:36, Uwe Hermann wrote:
> Here's a bunch of additional fixes for manually builds.
>
> Change some more image names to "fallback" (not "image").
>
> Also, if there's only one image, it should be named "fallback", not "normal".
>
> Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
>   

Good find!
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>

Regards,
Carl-Daniel
Uwe Hermann - 2009-08-27 14:24:13
On Thu, Aug 27, 2009 at 03:41:08PM +0200, Carl-Daniel Hailfinger wrote:
> On 27.08.2009 15:36, Uwe Hermann wrote:
> > Here's a bunch of additional fixes for manually builds.
> >
> > Change some more image names to "fallback" (not "image").
> >
> > Also, if there's only one image, it should be named "fallback", not "normal".
> >
> > Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
> >   
> 
> Good find!
> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>

Thanks, r4600.


Uwe.

Patch

Change some more image names to "fallback" (not "image").

Also, if there's only one image, it should be named "fallback", not "normal".

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>

Index: targets/bcom/winnetp680/Config.lb
===================================================================
--- targets/bcom/winnetp680/Config.lb	(Revision 4599)
+++ targets/bcom/winnetp680/Config.lb	(Arbeitskopie)
@@ -37,9 +37,9 @@ 
 #option CONFIG_ROM_SIZE = (512 * 1024) - (63 * 1024) - (64 * 1024)
 option CONFIG_ROM_SIZE = (512 * 1024)
 
-romimage "image"
+romimage "fallback"
 	option COREBOOT_EXTRA_VERSION = "-winnetp680"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/motorola/sandpoint/Config.lb
===================================================================
--- targets/motorola/sandpoint/Config.lb	(Revision 4599)
+++ targets/motorola/sandpoint/Config.lb	(Arbeitskopie)
@@ -7,7 +7,7 @@ 
 mainboard motorola/sandpointx3_altimus_mpc7410
 
 # Sandpoint Demo Board
-romimage "normal"
+romimage "fallback"
 	## Base of ROM
 	option CONFIG_ROMBASE=0xfff00000
 
@@ -28,4 +28,4 @@ 
 	option CONFIG_SANDPOINT_ALTIMUS=1
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/motorola/sandpoint/Config.lb.ide_stream
===================================================================
--- targets/motorola/sandpoint/Config.lb.ide_stream	(Revision 4599)
+++ targets/motorola/sandpoint/Config.lb.ide_stream	(Arbeitskopie)
@@ -64,7 +64,7 @@ 
 option CONFIG_HEAP_SIZE=0x10000
 
 # Sandpoint Demo Board
-romimage "normal"
+romimage "fallback"
 	## Base of ROM
 	option CONFIG_ROMBASE=0xfff00000
 
@@ -87,4 +87,4 @@ 
 	mainboard motorola/sandpoint
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/emulation/qemu-x86/Config.lb
===================================================================
--- targets/emulation/qemu-x86/Config.lb	(Revision 4599)
+++ targets/emulation/qemu-x86/Config.lb	(Arbeitskopie)
@@ -12,11 +12,11 @@ 
 option CONFIG_DEFAULT_CONSOLE_LOGLEVEL=9
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=9
 
-romimage "normal" 
+romimage "fallback" 
 	option COREBOOT_EXTRA_VERSION="-GRUB2"
 #	payload /home/stepan/core.img
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
 
Index: targets/emulation/qemu-x86/Config-lab.lb
===================================================================
--- targets/emulation/qemu-x86/Config-lab.lb	(Revision 4599)
+++ targets/emulation/qemu-x86/Config-lab.lb	(Arbeitskopie)
@@ -12,10 +12,10 @@ 
 option CONFIG_HAVE_PIRQ_TABLE=1
 option CONFIG_IRQ_SLOT_COUNT=6
 
-romimage "image" 
+romimage "fallback" 
 	option COREBOOT_EXTRA_VERSION="-LAB"
 	payload ../payload.elf.lzma
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
 
Index: targets/emulation/qemu-x86/Config.OLPC.lb
===================================================================
--- targets/emulation/qemu-x86/Config.OLPC.lb	(Revision 4599)
+++ targets/emulation/qemu-x86/Config.OLPC.lb	(Arbeitskopie)
@@ -12,10 +12,10 @@ 
 option CONFIG_HAVE_PIRQ_TABLE=1
 option CONFIG_IRQ_SLOT_COUNT=6
 
-romimage "image" 
+romimage "fallback" 
 	option COREBOOT_EXTRA_VERSION="-OpenBIOS"
 	payload /tmp/olpcpayload.elf
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
 
Index: targets/momentum/apache/Config.lb
===================================================================
--- targets/momentum/apache/Config.lb	(Revision 4599)
+++ targets/momentum/apache/Config.lb	(Arbeitskopie)
@@ -6,7 +6,7 @@ 
 mainboard momentum/apache
 
 # Apache Demo Board
-romimage "normal"
+romimage "fallback"
 	## Base of ROM
 	option CONFIG_ROMBASE=0xfff00000
 
@@ -25,4 +25,4 @@ 
 	option CONFIG_RAMSTART=0x00100000
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/iei/juki-511p/Config.lb
===================================================================
--- targets/iei/juki-511p/Config.lb	(Revision 4599)
+++ targets/iei/juki-511p/Config.lb	(Arbeitskopie)
@@ -28,10 +28,10 @@ 
 option CONFIG_COMPRESS=0
 option CONFIG_PRECOMPRESSED_PAYLOAD=0
 
-romimage "image"
+romimage "fallback"
 	option CONFIG_ROM_IMAGE_SIZE=64*1024
 	option COREBOOT_EXTRA_VERSION="-filo"
 	payload ../../filo.elf
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/lippert/roadrunner-lx/Config.lb
===================================================================
--- targets/lippert/roadrunner-lx/Config.lb	(Revision 4599)
+++ targets/lippert/roadrunner-lx/Config.lb	(Arbeitskopie)
@@ -50,7 +50,7 @@ 
 # Saves space on CONFIG_ROM_IMAGE_SIZE, but decompression costs a second on boot.
 option CONFIG_COMPRESS = 1
 
-romimage "image"
+romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE = 1
 	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0"
@@ -59,4 +59,4 @@ 
 	# payload /dev/null
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/lippert/spacerunner-lx/Config.lb
===================================================================
--- targets/lippert/spacerunner-lx/Config.lb	(Revision 4599)
+++ targets/lippert/spacerunner-lx/Config.lb	(Arbeitskopie)
@@ -50,7 +50,7 @@ 
 # Saves space on CONFIG_ROM_IMAGE_SIZE, but decompression costs a second on boot.
 option CONFIG_COMPRESS = 1
 
-romimage "image"
+romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE = 1
 	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0"
@@ -59,4 +59,4 @@ 
 	# payload /dev/null
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/via/epia-m700/Config.lb
===================================================================
--- targets/via/epia-m700/Config.lb	(Revision 4599)
+++ targets/via/epia-m700/Config.lb	(Arbeitskopie)
@@ -21,9 +21,9 @@ 
 target epia-m700
 mainboard via/epia-m700
 
-romimage "image"
+romimage "fallback"
 	option COREBOOT_EXTRA_VERSION = "-epia-m700"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/via/epia-n/Config.lb
===================================================================
--- targets/via/epia-n/Config.lb	(Revision 4599)
+++ targets/via/epia-n/Config.lb	(Arbeitskopie)
@@ -35,16 +35,9 @@ 
 #
 #option CONFIG_ROM_SIZE = (512 * 1024) - (64 * 1024) - (64 * 1024)
 
-romimage "image"
-	option COREBOOT_EXTRA_VERSION = "-epia_n"
-	payload ../../../../../payloads/filo/build/filo.elf
-end
-
 romimage "fallback"
 	option COREBOOT_EXTRA_VERSION = "-epia_n-fallback"
 	payload ../../../../../payloads/filo/build/filo.elf
 end
 
-#buildrom ./coreboot.rom CONFIG_ROM_SIZE "image" "fallback"
-#buildrom ./coreboot.rom CONFIG_FALLBACK_SIZE "image" "fallback"
 buildrom ./coreboot.rom CONFIG_FALLBACK_SIZE "fallback"
Index: targets/via/epia-cn/Config.lb
===================================================================
--- targets/via/epia-cn/Config.lb	(Revision 4599)
+++ targets/via/epia-cn/Config.lb	(Arbeitskopie)
@@ -35,9 +35,9 @@ 
 #
 option CONFIG_ROM_SIZE = (512 * 1024) - (64 * 1024) - (64 * 1024)
 
-romimage "image"
+romimage "fallback"
 	option COREBOOT_EXTRA_VERSION = "-epiacn"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/via/pc2500e/Config.lb
===================================================================
--- targets/via/pc2500e/Config.lb	(Revision 4599)
+++ targets/via/pc2500e/Config.lb	(Arbeitskopie)
@@ -21,9 +21,9 @@ 
 target via_pc2500e
 mainboard via/pc2500e
 
-romimage "image"
+romimage "fallback"
 	option COREBOOT_EXTRA_VERSION = "-pc2500e"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/totalimpact/briq/Config.lb
===================================================================
--- targets/totalimpact/briq/Config.lb	(Revision 4599)
+++ targets/totalimpact/briq/Config.lb	(Arbeitskopie)
@@ -32,7 +32,7 @@ 
 option CONFIG_HEAP_SIZE=0x10000
 
 # Sandpoint Demo Board
-romimage "normal"
+romimage "fallback"
 	## Base of ROM
 	option CONFIG_ROMBASE=0xfff00000
 
@@ -55,4 +55,4 @@ 
 
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/embeddedplanet/ep405pc/Config.lb
===================================================================
--- targets/embeddedplanet/ep405pc/Config.lb	(Revision 4599)
+++ targets/embeddedplanet/ep405pc/Config.lb	(Arbeitskopie)
@@ -4,7 +4,7 @@ 
 target ep405pc
 mainboard embeddedplanet/ep405pc
 
-romimage "normal"
+romimage "fallback"
         ## Enable PPC405 instructions
         option CONFIG_CPU_OPT="-mcpu=405"
 
@@ -78,4 +78,4 @@ 
 
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/jetway/j7f24/Config.lb
===================================================================
--- targets/jetway/j7f24/Config.lb	(Revision 4599)
+++ targets/jetway/j7f24/Config.lb	(Arbeitskopie)
@@ -37,9 +37,9 @@ 
 #option CONFIG_ROM_SIZE = (512 * 1024) - (63 * 1024) - (64 * 1024)
 option CONFIG_ROM_SIZE = (512 * 1024)
 
-romimage "image"
+romimage "fallback"
 	option COREBOOT_EXTRA_VERSION = "-j7f24"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
Index: targets/intel/xe7501devkit/Config.lb
===================================================================
--- targets/intel/xe7501devkit/Config.lb	(Revision 4599)
+++ targets/intel/xe7501devkit/Config.lb	(Arbeitskopie)
@@ -15,7 +15,7 @@ 
 
 
 
-romimage "normal"
+romimage "fallback"
 	option CONFIG_USE_FALLBACK_IMAGE=0
 #	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../../../../../memtest86/memtest
@@ -34,4 +34,4 @@ 
 #       payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf
 #end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"