Changeset 5103

Timestamp:

Feb 9, 2010 8:41:11 PM (3 years ago)

Author:

oxygene

Message:

Add image updating support. When selecting it, it
expects a coreboot.rom to be available, and adds the files to it.

It has no idea how to replace files, it merely adds them. It only works
with Tinybootblock and the bootblock is immutable.

The "clean" rules allow "make clean-for-update", which
removes everything but coreboot.rom

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

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• src/arch/i386/Kconfig (modified) (1 diff)
• src/arch/i386/Makefile.tinybootblock.inc (modified) (1 diff)

trunk/Makefile

@@ -285 +285 @@
         rm -rf $(DOXYGEN_OUTPUT_DIR)
 
-clean: doxygen-clean
-        rm -f $(allobjs) $(obj)/coreboot* .xcompile
+clean-for-update: doxygen-clean
+        rm -f $(objs) $(initobjs) $(drivers) $(smmobjs) .xcompile
+        rm -f $(obj)/coreboot_ram* $(obj)/coreboot.romstage $(obj)/coreboot.pre* $(obj)/coreboot.bootblock $(obj)/coreboot.a
         rm -rf $(obj)/bootblock* $(obj)/romstage* $(obj)/location.*
-        rm -f $(obj)/option_table.* $(obj)/crt0_includes.h $(obj)/ldscript
+        rm -f $(obj)/option_table.* $(obj)/crt0_includes.h $(obj)/ldscript $(obj)/config.h
         rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot
         rm -f $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm
@@ -294 +295 @@
         $(MAKE) -C util/sconfig clean
 
+clean: clean-for-update
+        rm -f $(obj)/coreboot*
+
 distclean: clean
         rm -rf $(obj)

trunk/src/arch/i386/Kconfig

@@ -50 +50 @@
         default y
 
+config UPDATE_IMAGE
+        bool "Update existing coreboot.rom image"
+        default n
+        depends on TINY_BOOTBLOCK
+        help
+                If this option is activate, no new coreboot.rom file
+                is created. Instead it is expected that there already
+                is a suitable file for further processing.
+                The bootblock will not be modified.
+
 config ROMCC
         bool

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

@@ -4 +4 @@
 # Build the final rom image
 
+ifneq ($(CONFIG_UPDATE_IMAGE),y)
 $(obj)/coreboot.pre1: $(obj)/coreboot.bootblock $(CBFSTOOL)
         rm -f $@
         $(CBFSTOOL) $@ create $(CONFIG_COREBOOT_ROMSIZE_KB)K $(obj)/coreboot.bootblock
+else
+$(obj)/coreboot.pre1: $(CBFSTOOL)
+        mv $(obj)/coreboot.rom $@
+endif
 
 $(obj)/coreboot.pre: $(obj)/coreboot.romstage $(obj)/coreboot.pre1 $(CBFSTOOL)