New patch to review for coreboot: build system: rename fmap.h to fmap_config.h

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14570

-gerrit

commit d5f1b21b1090682d74b7036f6aa3b6b0152a5ac7
Author: Patrick Georgi 
Date:   Mon May 2 16:50:31 2016 +0800

build system: rename fmap.h to fmap_config.h

There's an in-tree fmap.h, and the file generated by fmaptool is likely
    used in tandem with it. To avoid problems, rename the generated file
    (which so far isn't used).

Change-Id: I95dfde513a7f78677cf18ecd7ce8745e40af316b
    Signed-off-by: Patrick Georgi 
---
 Makefile.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 0fb7a3d..812f998 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -700,12 +700,12 @@ $(obj)/fmap.fmd: $(CONFIG_FMDFILE) $(obj)/config.h
 endif # ifeq ($(CONFIG_FMDFILE),)

# generated at the same time as fmap.fmap
-$(obj)/fmap.h: $(obj)/fmap.fmap
+$(obj)/fmap_config.h: $(obj)/fmap.fmap
 $(obj)/fmap.desc: $(obj)/fmap.fmap

$(obj)/fmap.fmap: $(obj)/fmap.fmd $(FMAPTOOL)
-	echo "    FMAP       $(FMAPTOOL) -h $(obj)/fmap.h $< $@"
-	$(FMAPTOOL) -h $(obj)/fmap.h -R $(obj)/fmap.desc $< $@
+	echo "    FMAP       $(FMAPTOOL) -h $(obj)/fmap_config.h $< $@"
+	$(FMAPTOOL) -h $(obj)/fmap_config.h -R $(obj)/fmap.desc $< $@

$(obj)/coreboot.pre: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) $$(cpu_ucode_cbfs_file) $(obj)/fmap.fmap $(obj)/fmap.desc
    $(CBFSTOOL) $@.tmp create -M $(obj)/fmap.fmap -r $(shell cat $(obj)/fmap.desc)