Changeset 5102

Timestamp:

Feb 9, 2010 8:35:16 PM (3 years ago)

Author:

oxygene

Message:

Allow building images with different prefixes (ie. normal/romstage,
helloWorld/romstage, ...).
It defaults to fallback/, so there's no user visible change now.

Signed-off-by: Patrick Georgi <patrick.georgi@…>
Acked-by: Peter Stuge <peter@…>

Location:

trunk/src

Files:

• Kconfig (modified) (1 diff)
• arch/i386/Makefile.inc (modified) (1 diff)
• arch/i386/Makefile.tinybootblock.inc (modified) (3 diffs)
• arch/i386/init/crt0.S.lb (modified) (1 diff)
• boot/hardwaremain.c (modified) (1 diff)
• cpu/amd/car/copy_and_run.c (modified) (2 diffs)
• cpu/amd/model_lx/cache_as_ram.inc (modified) (1 diff)

trunk/src/Kconfig

@@ -39 +39 @@
           the coreboot version number, so that you can easily distinguish
           boot logs of different boards from each other.
+
+config CBFS_PREFIX
+        string "CBFS prefix to use"
+        default "fallback"
+        help
+          Select the prefix to all files put into the image. It's "fallback"
+          by default, "normal" is a common alternative.
 
 endmenu

trunk/src/arch/i386/Makefile.inc

@@ -16 +16 @@
         if [ -f fallback/coreboot_apc ]; \
         then \
-                $(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \
+                $(CBFSTOOL) $@ add-stage fallback/coreboot_apc $(CONFIG_CBFS_PREFIX)/coreboot_apc $(CBFS_COMPRESS_FLAG); \
         fi
-        $(CBFSTOOL) $@ add-stage $(obj)/coreboot_ram fallback/coreboot_ram $(CBFS_COMPRESS_FLAG)
+        $(CBFSTOOL) $@ add-stage $(obj)/coreboot_ram $(CONFIG_CBFS_PREFIX)/coreboot_ram $(CBFS_COMPRESS_FLAG)
 ifeq ($(CONFIG_PAYLOAD_NONE),y)
         @printf "    PAYLOAD    none (as specified by user)\n"
 else
         @printf "    PAYLOAD    $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CBFS_PAYLOAD_COMPRESS_FLAG)\n"
-        $(CBFSTOOL) $(obj)/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG)
+        $(CBFSTOOL) $(obj)/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CONFIG_CBFS_PREFIX)/payload $(CBFS_PAYLOAD_COMPRESS_FLAG)
 endif
 ifeq ($(CONFIG_VGA_BIOS),y)

trunk/src/arch/i386/Makefile.tinybootblock.inc

@@ -11 +11 @@
         rm -f $@
         cp $(obj)/coreboot.pre1 $@
-        $(CBFSTOOL) $@ add-stage $(obj)/romstage.elf fallback/romstage x 0x$(shell cat $(obj)/location.txt)
+        $(CBFSTOOL) $@ add-stage $(obj)/romstage.elf $(CONFIG_CBFS_PREFIX)/romstage x 0x$(shell cat $(obj)/location.txt)
 #FIXME: location.txt might require an offset of header size
 
@@ -59 +59 @@
         $(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/bootblock -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@
 
-$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(obj)/romcc $(src)/arch/i386/init/bootblock.c
-        $(obj)/romcc $(bootblock_romccflags) -O2 $(ROMCCFLAGS) $(INCLUDES) $(src)/arch/i386/init/bootblock.c -o $@
+$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(src)/arch/i386/init/$(subst ",,$(CONFIG_TINY_BOOTBLOCK_SOURCE)) $(obj)/romcc
+        $(obj)/romcc $(bootblock_romccflags) -O2 $(ROMCCFLAGS) $(INCLUDES) $< -o $@
 
 $(obj)/bootblock.elf: $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.o $(obj)/bootblock/ldscript.ld
@@ -75 +75 @@
         $(OBJCOPY) -O binary $(obj)/romstage.elf $(obj)/romstage.bin
         printf "CONFIG_ROMBASE = 0x" > $(obj)/location.ld
-        $(CBFSTOOL) $(obj)/coreboot.pre1 locate $(obj)/romstage.bin fallback/romstage $(CONFIG_XIP_ROM_SIZE) > $(obj)/location.txt
+        $(CBFSTOOL) $(obj)/coreboot.pre1 locate $(obj)/romstage.bin $(CONFIG_CBFS_PREFIX)/romstage $(CONFIG_XIP_ROM_SIZE) > $(obj)/location.txt
         cat $(obj)/location.txt >> $(obj)/location.ld
         printf ';\nAUTO_XIP_ROM_BASE = CONFIG_ROMBASE & ~(CONFIG_XIP_ROM_SIZE - 1);\n' >> $(obj)/location.ld

trunk/src/arch/i386/init/crt0.S.lb

@@ -138 +138 @@
 #endif /* ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG */
 
-#if CONFIG_USE_FALLBACK_IMAGE == 1
-str_coreboot_ram_name:  .string "fallback/coreboot_ram"
-#else
-str_coreboot_ram_name:  .string "normal/coreboot_ram"
-#endif
+str_coreboot_ram_name:  .ascii CONFIG_CBFS_PREFIX
+                        .string "/coreboot_ram"
 
 #endif /* CONFIG_USE_DCACHE_RAM */

trunk/src/boot/hardwaremain.c

@@ -104 +104 @@
          */
         lb_mem = write_tables();
-#if CONFIG_USE_FALLBACK_IMAGE == 1
-        cbfs_load_payload(lb_mem, "fallback/payload");
-#else
-        cbfs_load_payload(lb_mem, "normal/payload");
-#endif
+        cbfs_load_payload(lb_mem, CONFIG_CBFS_PREFIX "/payload");
         printk(BIOS_ERR, "Boot failed.\n");
 }

trunk/src/cpu/amd/car/copy_and_run.c

@@ -8 +8 @@
 static void copy_and_run(void)
 {
-#if CONFIG_USE_FALLBACK_IMAGE == 1
-        cbfs_and_run_core("fallback/coreboot_ram", 0);
-#else
-        cbfs_and_run_core("normal/coreboot_ram", 0);
-#endif
+        cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", 0);
 }
 
@@ -19 +15 @@
 static void copy_and_run_ap_code_in_car(unsigned ret_addr)
 {
-# if CONFIG_USE_FALLBACK_IMAGE == 1
-        cbfs_and_run_core("fallback/coreboot_apc", ret_addr);
-# else
-        cbfs_and_run_core("normal/coreboot_apc", ret_addr);
-# endif
+        cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_apc", ret_addr);
 }
 #endif

trunk/src/cpu/amd/model_lx/cache_as_ram.inc

@@ -279 +279 @@
 
 #endif /* ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG */
-#if CONFIG_USE_FALLBACK_IMAGE == 1
-str_coreboot_ram_name:  .string "fallback/coreboot_ram"
-#else
-str_coreboot_ram_name:  .string "normal/coreboot_ram"
-#endif
+str_coreboot_ram_name:  .ascii CONFIG_CBFS_PREFIX
+                        .string "/coreboot_ram"