Author: uwe Date: 2009-08-27 16:22:56 +0200 (Thu, 27 Aug 2009) New Revision: 4600
Modified: trunk/coreboot-v2/targets/bcom/winnetp680/Config.lb trunk/coreboot-v2/targets/embeddedplanet/ep405pc/Config.lb trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb trunk/coreboot-v2/targets/emulation/qemu-x86/Config.OLPC.lb trunk/coreboot-v2/targets/emulation/qemu-x86/Config.lb trunk/coreboot-v2/targets/iei/juki-511p/Config.lb trunk/coreboot-v2/targets/intel/xe7501devkit/Config.lb trunk/coreboot-v2/targets/jetway/j7f24/Config.lb trunk/coreboot-v2/targets/lippert/roadrunner-lx/Config.lb trunk/coreboot-v2/targets/lippert/spacerunner-lx/Config.lb trunk/coreboot-v2/targets/momentum/apache/Config.lb trunk/coreboot-v2/targets/motorola/sandpoint/Config.lb trunk/coreboot-v2/targets/motorola/sandpoint/Config.lb.ide_stream trunk/coreboot-v2/targets/totalimpact/briq/Config.lb trunk/coreboot-v2/targets/via/epia-cn/Config.lb trunk/coreboot-v2/targets/via/epia-m700/Config.lb trunk/coreboot-v2/targets/via/epia-n/Config.lb trunk/coreboot-v2/targets/via/pc2500e/Config.lb Log: 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 <[email protected]> Acked-by: Carl-Daniel Hailfinger <[email protected]> Modified: trunk/coreboot-v2/targets/bcom/winnetp680/Config.lb =================================================================== --- trunk/coreboot-v2/targets/bcom/winnetp680/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/bcom/winnetp680/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/embeddedplanet/ep405pc/Config.lb =================================================================== --- trunk/coreboot-v2/targets/embeddedplanet/ep405pc/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/embeddedplanet/ep405pc/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb =================================================================== --- trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config.OLPC.lb =================================================================== --- trunk/coreboot-v2/targets/emulation/qemu-x86/Config.OLPC.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config.OLPC.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config.lb =================================================================== --- trunk/coreboot-v2/targets/emulation/qemu-x86/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/iei/juki-511p/Config.lb =================================================================== --- trunk/coreboot-v2/targets/iei/juki-511p/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/iei/juki-511p/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/intel/xe7501devkit/Config.lb =================================================================== --- trunk/coreboot-v2/targets/intel/xe7501devkit/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/intel/xe7501devkit/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/jetway/j7f24/Config.lb =================================================================== --- trunk/coreboot-v2/targets/jetway/j7f24/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/jetway/j7f24/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/lippert/roadrunner-lx/Config.lb =================================================================== --- trunk/coreboot-v2/targets/lippert/roadrunner-lx/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/lippert/roadrunner-lx/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/lippert/spacerunner-lx/Config.lb =================================================================== --- trunk/coreboot-v2/targets/lippert/spacerunner-lx/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/lippert/spacerunner-lx/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/momentum/apache/Config.lb =================================================================== --- trunk/coreboot-v2/targets/momentum/apache/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/momentum/apache/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/motorola/sandpoint/Config.lb =================================================================== --- trunk/coreboot-v2/targets/motorola/sandpoint/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/motorola/sandpoint/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/motorola/sandpoint/Config.lb.ide_stream =================================================================== --- trunk/coreboot-v2/targets/motorola/sandpoint/Config.lb.ide_stream 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/motorola/sandpoint/Config.lb.ide_stream 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/totalimpact/briq/Config.lb =================================================================== --- trunk/coreboot-v2/targets/totalimpact/briq/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/totalimpact/briq/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/via/epia-cn/Config.lb =================================================================== --- trunk/coreboot-v2/targets/via/epia-cn/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/via/epia-cn/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/via/epia-m700/Config.lb =================================================================== --- trunk/coreboot-v2/targets/via/epia-m700/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/via/epia-m700/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/via/epia-n/Config.lb =================================================================== --- trunk/coreboot-v2/targets/via/epia-n/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/via/epia-n/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" Modified: trunk/coreboot-v2/targets/via/pc2500e/Config.lb =================================================================== --- trunk/coreboot-v2/targets/via/pc2500e/Config.lb 2009-08-27 13:14:09 UTC (rev 4599) +++ trunk/coreboot-v2/targets/via/pc2500e/Config.lb 2009-08-27 14:22:56 UTC (rev 4600) @@ -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" -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
