[coreboot-gerrit] New patch to review for coreboot: Makefile.inc: Move addition of payload rev & config to payload makefile

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12751

-gerrit

commit 4828b2bdd32e9c77616ab13fb1fbf5eea56bea2f
Author: Martin Roth <martinroth at google.com>
Date:   Wed Dec 16 16:09:11 2015 -0700

    Makefile.inc: Move addition of payload rev & config to payload makefile
    
    These files need to be added to cbfs-files after PAYLOAD_CONFIG
    and PAYLOAD_VERSION have been defined.  Where they were before,
    they didn't get added to the final build.
    
    Change-Id: Ib1b230f9eb72a8c1710ef473a9f24c0fb7ec6e17
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 Makefile.inc                   | 8 --------
 payloads/external/Makefile.inc | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 603be00..7231df1 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -817,14 +817,6 @@ cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += revision
 revision-file := $(obj)/build.h
 revision-type := raw
 
-cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_config
-payload_config-file := $(PAYLOAD_CONFIG)
-payload_config-type := raw
-
-cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_revision
-payload_revision-file := $(PAYLOAD_VERSION)
-payload_revision-type := raw
-
 cbfs-files-$(CONFIG_BOOTSPLASH_IMAGE) += bootsplash.jpg
 bootsplash.jpg-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE))
 bootsplash.jpg-type := bootsplash
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 0854947..ecb3041 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -26,6 +26,14 @@ PAYLOAD_CONFIG=payloads/external/FILO/filo/.config
 PAYLOAD_VERSION=payloads/external/FILO/filo/build/version.h
 endif
 
+cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_config
+payload_config-file := $(PAYLOAD_CONFIG)
+payload_config-type := raw
+
+cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_revision
+payload_revision-file := $(PAYLOAD_VERSION)
+payload_revision-type := raw
+
 SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1)
 seabios:
 	$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \