[coreboot] New patch to review for coreboot: 0decc56 Makefile: rename bootblock linking filenames
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Mon Apr 2 10:32:22 CEST 2012
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/838
-gerrit
commit 0decc56167e52d65a7729d6fe6b93a8ce7f34214
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Mon Apr 2 10:50:01 2012 +0300
Makefile: rename bootblock linking filenames
$(obj)/coreboot.bootblock -> $(obj)/bootblock/bootblock.bin
$(obj)/bootblock.elf -> $(obj)/bootblock/bootblock.elf
$(obj)/bootblock.map -> $(obj)/bootblock/bootblock.map
$(obj)/bootblock.debug -> $(obj)/bootblock/bootblock.debug
Change-Id: I0365304e1b0ed02a5a3ec720b0cf3e303eaefa7c
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/arch/x86/Makefile.inc | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 00e7b86..a245749 100755
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -63,8 +63,8 @@ prebuild-files = \
$(call extract_nth,4,$(file)) &&)
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
-$(obj)/coreboot.pre1: $(obj)/coreboot.bootblock $$(prebuilt-files) $(CBFSTOOL)
- $(CBFSTOOL) $@.tmp create $(CONFIG_COREBOOT_ROMSIZE_KB)K $(obj)/coreboot.bootblock
+$(obj)/coreboot.pre1: $(obj)/bootblock/bootblock.bin $$(prebuilt-files) $(CBFSTOOL)
+ $(CBFSTOOL) $@.tmp create $(CONFIG_COREBOOT_ROMSIZE_KB)K $(obj)/bootblock/bootblock.bin
$(prebuild-files) true
mv $@.tmp $@
else
@@ -280,7 +280,7 @@ $(obj)/coreboot.pre: $(obj)/coreboot.romstage $(obj)/coreboot.pre1 $(CBFSTOOL)
#######################################################################
# Build the bootblock
-$(obj)/coreboot.bootblock: $(obj)/bootblock.elf
+$(obj)/bootblock/bootblock.bin: $(obj)/bootblock/bootblock.elf
@printf " OBJCOPY $(subst $(obj)/,,$(@))\n"
$(OBJCOPY) -O binary $< $@
@@ -332,13 +332,13 @@ $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(src)/arch/x86/init/$(subst ",,
$< > $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc.d
$(ROMCC) -c -S $(bootblock_romccflags) $(ROMCCFLAGS) -I. $(INCLUDES) $< -o $@
-$(obj)/bootblock.elf: $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.o $(obj)/bootblock/ldscript.ld
+$(obj)/bootblock/bootblock.elf: $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.o $(obj)/bootblock/ldscript.ld
@printf " LINK $(subst $(obj)/,,$(@))\n"
$(CC) -nostdlib -nostartfiles -static -o $@.tmp -L$(obj) -T $(obj)/bootblock/ldscript.ld $<
- $(NM) -n $@.tmp | sort > $(obj)/bootblock.map
- $(OBJCOPY) --only-keep-debug $@.tmp $(obj)/bootblock.debug
+ $(NM) -n $@.tmp | sort > $(basename $@).map
+ $(OBJCOPY) --only-keep-debug $@.tmp $(basename $@).debug
$(OBJCOPY) --strip-debug $@.tmp
- $(OBJCOPY) --add-gnu-debuglink=$(obj)/bootblock.debug $@.tmp
+ $(OBJCOPY) --add-gnu-debuglink=$(basename $@).debug $@.tmp
mv $@.tmp $@
#######################################################################
More information about the coreboot
mailing list