From 95f6022cb1e77f7e643bd72cb06c05dc00df5587 Mon Sep 17 00:00:00 2001 From: Werner Zeh Date: Fri, 17 Jun 2016 01:48:44 +0200 Subject: [PATCH] flashmap: Use CONFIG_ROM_SIZE as flash size in flashmap Currently there are two sources for the final size of the flash image. One is defined as a Kconfig variable (ROM_SIZE) and the other can be provided in a user defined flashmap.fmd. This patch will enable the usage of CONFIG_ROM_SIZE in flashmap.fmd to define the flash size. In this way, the Kconfig variable is the only source of information for the flash image size. This way is optional. Change-Id: Id5298e06d360aaa6d94f2b5a2ffa65e45919853e Signed-off-by: Werner Zeh Reviewed-on: https://review.coreboot.org/15219 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- Makefile.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc b/Makefile.inc index d1d09ab271..69c88432c1 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -700,7 +700,8 @@ $(obj)/fmap.fmd: $(top)/Makefile.inc $(DEFAULT_FLASHMAP) $(obj)/config.h mv $@.tmp $@ else # ifeq ($(CONFIG_FMDFILE),) $(obj)/fmap.fmd: $(CONFIG_FMDFILE) $(obj)/config.h - cp $< $@ + $(HOSTCC) $(PREPROCESS_ONLY) -include $(obj)/config.h $< -o $@.pre + mv $@.pre $@ endif # ifeq ($(CONFIG_FMDFILE),) # generated at the same time as fmap.fmap