diff options
| author | Martin Roth <martinroth@google.com> | 2015-12-16 16:09:11 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2015-12-20 02:42:38 +0100 |
| commit | d4c2484cc8ea1486668315d9d6c259e844ec871e (patch) | |
| tree | 430211dbfe65f09365d6b5a165b4f4e7be5a15d7 | |
| parent | 2b2ff7fa6a9af366c1a9b8e4cb6f7f566048b0d7 (diff) | |
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@google.com>
Reviewed-on: https://review.coreboot.org/12751
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | Makefile.inc | 8 | ||||
| -rw-r--r-- | payloads/external/Makefile.inc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.inc b/Makefile.inc index 35a30b2273..345a28a41a 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -845,14 +845,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 0854947637..ecb3041db4 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 \ |