diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2016-05-02 16:50:31 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-05-03 11:42:20 +0200 |
| commit | 849635d4ef835862b2fc4ecc4c4c1ee28186ad15 (patch) | |
| tree | 4277c640329e54a0f4368bfd50cd1380bd9538e6 | |
| parent | fa5aba0484836cd19143b6567d8cee77ba072971 (diff) | |
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 <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/14570
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | Makefile.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc b/Makefile.inc index 0fb7a3d02c..812f998ce7 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) |