diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/armv7/Makefile.inc | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc index 2c280f47e1..104577445c 100644 --- a/src/arch/armv7/Makefile.inc +++ b/src/arch/armv7/Makefile.inc @@ -46,16 +46,20 @@ prebuild-files = \ prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) # TODO Change -b to Kconfig variable. -$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) +$(obj)/coreboot.pre: $(objcbfs)/bootblock.bin $(objcbfs)/romstage.elf $$(prebuilt-files) $(CBFSTOOL) $(CBFSTOOL) $@.tmp create -m armv7 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \ -B $(objcbfs)/bootblock.bin -a 64 -b 0x0000 \ -H $(CONFIG_CBFS_HEADER_ROM_OFFSET) \ -o $(CONFIG_CBFS_ROM_OFFSET) + @printf " CBFS $(subst $(obj)/,,$(@))\n" + $(CBFSTOOL) $@.tmp add-stage \ + -f $(objcbfs)/romstage.elf -b 0 \ + -n $(CONFIG_CBFS_PREFIX)/romstage -c none $(prebuild-files) true mv $@.tmp $@ else -.PHONY: $(obj)/coreboot.pre1 -$(obj)/coreboot.pre1: $(CBFSTOOL) +.PHONY: $(obj)/coreboot.pre +$(obj)/coreboot.pre: $(CBFSTOOL) mv $(obj)/coreboot.rom $@ endif @@ -184,17 +188,6 @@ ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c endif ################################################################################ -# Build the final rom image - -$(obj)/coreboot.pre: $(objcbfs)/romstage.elf $(obj)/coreboot.pre1 $(CBFSTOOL) - @printf " CBFS $(subst $(obj)/,,$(@))\n" - cp $(obj)/coreboot.pre1 $@.tmp - $(CBFSTOOL) $@.tmp add-stage \ - -f $(objcbfs)/romstage.elf \ - -n $(CONFIG_CBFS_PREFIX)/romstage -c none - mv $@.tmp $@ - -################################################################################ # Build the bootblock bootblock_lds = $(src)/arch/armv7/bootblock.lds |