[coreboot-gerrit] New patch to review for coreboot: flashmap: Use CONFIG_ROM_SIZE as flash size in flashmap

[Werner Zeh (werner.zeh@siemens.com)]

Werner Zeh (werner.zeh at siemens.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15219

-gerrit

commit 9c6134a2d47011f37996f2f6312d70ecc95f345a
Author: Werner Zeh <werner.zeh at siemens.com>
Date:   Fri Jun 17 01:48:44 2016 +0200

    flashmap: Use CONFIG_ROM_SIZE as flash size in flashmap
    
    Currently there are two sources for the final size of the
    flash image. The one is defined as a Kconfig variable
    (ROM_SIZE) and the other can be provided in a user defined
    flashmap.fmd. The size defined in flashmap.fmd will win
    and the Kconfig variable will not be used if a user
    provides a flashmap.
    
    To change it, CONFIG_ROM_SIZE will be used in user
    provided flashmap and the size specified there will be overwritten.
    In this way there is only one source for the ROM size which
    makes this parameter be consistent all the time.
    
    Change-Id: Id5298e06d360aaa6d94f2b5a2ffa65e45919853e
    Signed-off-by: Werner Zeh <werner.zeh at siemens.com>
---
 Makefile.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile.inc b/Makefile.inc
index d1d09ab..0f60383 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -701,6 +701,10 @@ $(obj)/fmap.fmd: $(top)/Makefile.inc $(DEFAULT_FLASHMAP) $(obj)/config.h
 else # ifeq ($(CONFIG_FMDFILE),)
 $(obj)/fmap.fmd: $(CONFIG_FMDFILE) $(obj)/config.h
 	cp $< $@
+	sed '/FLASH/cFLASH CONFIG_ROM_SIZE {' $@ > $@.tmp
+	$(HOSTCC) $(PREPROCESS_ONLY) -include $(obj)/config.h $@.tmp -o $@.pre
+	mv $@.pre $@
+	rm -f $@.tmp
 endif # ifeq ($(CONFIG_FMDFILE),)
 
 # generated at the same time as fmap.fmap