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>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4600 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

18 files changed, 34 insertions, 41 deletions

diff --git a/targets/bcom/winnetp680/Config.lb b/targets/bcom/winnetp680/Config.lb
index ced4de9ba8..f8ced33482 100644
--- a/targets/bcom/winnetp680/Config.lb
+++ b/targets/bcom/winnetp680/Config.lb
@@ -37,9 +37,9 @@ option CONFIG_RAMBASE=0x00004000
 #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"
diff --git a/targets/embeddedplanet/ep405pc/Config.lb b/targets/embeddedplanet/ep405pc/Config.lb
index 0f7d13040f..820a38506a 100644
--- a/targets/embeddedplanet/ep405pc/Config.lb
+++ b/targets/embeddedplanet/ep405pc/Config.lb
@@ -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 @@ romimage "normal"
 
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/emulation/qemu-x86/Config-lab.lb b/targets/emulation/qemu-x86/Config-lab.lb
index 2e38aa1fd1..d68ffd9f0b 100644
--- a/targets/emulation/qemu-x86/Config-lab.lb
+++ b/targets/emulation/qemu-x86/Config-lab.lb
@@ -12,10 +12,10 @@ option CC="gcc -m32"
 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"
 
diff --git a/targets/emulation/qemu-x86/Config.OLPC.lb b/targets/emulation/qemu-x86/Config.OLPC.lb
index 6f5b2abe4c..1b240f7ed6 100644
--- a/targets/emulation/qemu-x86/Config.OLPC.lb
+++ b/targets/emulation/qemu-x86/Config.OLPC.lb
@@ -12,10 +12,10 @@ option CC="gcc -m32"
 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"
 
diff --git a/targets/emulation/qemu-x86/Config.lb b/targets/emulation/qemu-x86/Config.lb
index 659da67358..a05e815e86 100644
--- a/targets/emulation/qemu-x86/Config.lb
+++ b/targets/emulation/qemu-x86/Config.lb
@@ -12,11 +12,11 @@ option CONFIG_IRQ_SLOT_COUNT=6
 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"
 
diff --git a/targets/iei/juki-511p/Config.lb b/targets/iei/juki-511p/Config.lb
index 83fa1ffa67..6b8eddad86 100644
--- a/targets/iei/juki-511p/Config.lb
+++ b/targets/iei/juki-511p/Config.lb
@@ -28,10 +28,10 @@ option CONFIG_HAVE_PIRQ_TABLE=1
 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"
diff --git a/targets/intel/xe7501devkit/Config.lb b/targets/intel/xe7501devkit/Config.lb
index 00f9451984..8e70031198 100644
--- a/targets/intel/xe7501devkit/Config.lb
+++ b/targets/intel/xe7501devkit/Config.lb
@@ -15,7 +15,7 @@ option CONFIG_FALLBACK_SIZE = 0
 
 
 
-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 @@ end
 #       payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf
 #end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/jetway/j7f24/Config.lb b/targets/jetway/j7f24/Config.lb
index 52a1108ee3..61da2c655b 100644
--- a/targets/jetway/j7f24/Config.lb
+++ b/targets/jetway/j7f24/Config.lb
@@ -37,9 +37,9 @@ option CONFIG_RAMBASE=0x00004000
 #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"
diff --git a/targets/lippert/roadrunner-lx/Config.lb b/targets/lippert/roadrunner-lx/Config.lb
index 130849c746..92b825c407 100644
--- a/targets/lippert/roadrunner-lx/Config.lb
+++ b/targets/lippert/roadrunner-lx/Config.lb
@@ -50,7 +50,7 @@ option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 # 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 @@ romimage "image"
 	# payload /dev/null
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/lippert/spacerunner-lx/Config.lb b/targets/lippert/spacerunner-lx/Config.lb
index d7b1d7916f..6719c212f0 100644
--- a/targets/lippert/spacerunner-lx/Config.lb
+++ b/targets/lippert/spacerunner-lx/Config.lb
@@ -50,7 +50,7 @@ option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 # 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 @@ romimage "image"
 	# payload /dev/null
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/momentum/apache/Config.lb b/targets/momentum/apache/Config.lb
index 5d0fd32484..b1d74d5f9a 100644
--- a/targets/momentum/apache/Config.lb
+++ b/targets/momentum/apache/Config.lb
@@ -6,7 +6,7 @@ target apache
 mainboard momentum/apache
 
 # Apache Demo Board
-romimage "normal"
+romimage "fallback"
 	## Base of ROM
 	option CONFIG_ROMBASE=0xfff00000
 
@@ -25,4 +25,4 @@ romimage "normal"
 	option CONFIG_RAMSTART=0x00100000
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/motorola/sandpoint/Config.lb b/targets/motorola/sandpoint/Config.lb
index 7ef1668969..473b27a28b 100644
--- a/targets/motorola/sandpoint/Config.lb
+++ b/targets/motorola/sandpoint/Config.lb
@@ -7,7 +7,7 @@ target sandpoint
 mainboard motorola/sandpointx3_altimus_mpc7410
 
 # Sandpoint Demo Board
-romimage "normal"
+romimage "fallback"
 	## Base of ROM
 	option CONFIG_ROMBASE=0xfff00000
 
@@ -28,4 +28,4 @@ romimage "normal"
 	option CONFIG_SANDPOINT_ALTIMUS=1
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/motorola/sandpoint/Config.lb.ide_stream b/targets/motorola/sandpoint/Config.lb.ide_stream
index 6649c092ae..79aa44c38f 100644
--- a/targets/motorola/sandpoint/Config.lb.ide_stream
+++ b/targets/motorola/sandpoint/Config.lb.ide_stream
@@ -64,7 +64,7 @@ option CONFIG_STACK_SIZE=0x10000
 option CONFIG_HEAP_SIZE=0x10000
 
 # Sandpoint Demo Board
-romimage "normal"
+romimage "fallback"
 	## Base of ROM
 	option CONFIG_ROMBASE=0xfff00000
 
@@ -87,4 +87,4 @@ romimage "normal"
 	mainboard motorola/sandpoint
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/totalimpact/briq/Config.lb b/targets/totalimpact/briq/Config.lb
index c352936ba4..f371b0f69f 100644
--- a/targets/totalimpact/briq/Config.lb
+++ b/targets/totalimpact/briq/Config.lb
@@ -32,7 +32,7 @@ option CONFIG_STACK_SIZE=0x10000
 option CONFIG_HEAP_SIZE=0x10000
 
 # Sandpoint Demo Board
-romimage "normal"
+romimage "fallback"
 	## Base of ROM
 	option CONFIG_ROMBASE=0xfff00000
 
@@ -55,4 +55,4 @@ romimage "normal"
 
 end
 
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/via/epia-cn/Config.lb b/targets/via/epia-cn/Config.lb
index 3d51302956..e7e9debbd9 100644
--- a/targets/via/epia-cn/Config.lb
+++ b/targets/via/epia-cn/Config.lb
@@ -35,9 +35,9 @@ option CONFIG_RAMBASE=0x00004000
 #
 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"
diff --git a/targets/via/epia-m700/Config.lb b/targets/via/epia-m700/Config.lb
index ecedd02070..6d012cb22b 100644
--- a/targets/via/epia-m700/Config.lb
+++ b/targets/via/epia-m700/Config.lb
@@ -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"
diff --git a/targets/via/epia-n/Config.lb b/targets/via/epia-n/Config.lb
index 178091719a..d1b3060356 100644
--- a/targets/via/epia-n/Config.lb
+++ b/targets/via/epia-n/Config.lb
@@ -35,16 +35,9 @@ option CONFIG_RAMBASE=0x00004000
 #
 #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"
diff --git a/targets/via/pc2500e/Config.lb b/targets/via/pc2500e/Config.lb
index 4d8fa8ebe6..35afeb45e9 100644
--- a/targets/via/pc2500e/Config.lb
+++ b/targets/via/pc2500e/Config.lb
@@ -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"