diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2016-04-13 13:13:02 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-04-15 16:25:28 +0200 |
| commit | 785a31d67e8f34065a2483080e4fd7032c3a8aad (patch) | |
| tree | 3d6b8c8b25261776f9e7984df147daa33b5675b9 | |
| parent | 01bc897dfa4abd0f6fe3ca1896ade1f06e412979 (diff) | |
Makefile.inc: Move payload code to payloads/
Change-Id: I91d9537e8c78560c944c552255e703fc0e6f1f78
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: https://review.coreboot.org/14349
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
| -rw-r--r-- | Makefile.inc | 12 | ||||
| -rw-r--r-- | payloads/external/Makefile.inc | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.inc b/Makefile.inc index 38b07f4acd..0a3b92c06b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -742,18 +742,6 @@ $(obj)/coreboot.pre: $$(prebuilt-files) $(CBFSTOOL) mv $@.tmp $@ endif # ifneq ($(CONFIG_UPDATE_IMAGE),y) -ifeq ($(CONFIG_PAYLOAD_LINUX),y) -ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_COMMAND_LINE))),) - ADDITIONAL_PAYLOAD_CONFIG+=-C $(CONFIG_LINUX_COMMAND_LINE) -endif -ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))),) - ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD) -endif -endif -ifneq ($(strip $(call strip_quotes,$(CONFIG_PAYLOAD_OPTIONS))),) - ADDITIONAL_PAYLOAD_CONFIG+=$(strip $(call strip_quotes,$(CONFIG_PAYLOAD_OPTIONS))) -endif - ifeq ($(CONFIG_HAVE_REFCODE_BLOB),y) REFCODE_BLOB=$(obj)/refcode.rmod $(REFCODE_BLOB): $(RMODTOOL) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 8825129b55..26a561365a 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -30,6 +30,18 @@ PAYLOAD_CONFIG=payloads/external/depthcharge/depthcharge/.config #TODO: Figure out version endif +ifeq ($(CONFIG_PAYLOAD_LINUX),y) +ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_COMMAND_LINE))),) + ADDITIONAL_PAYLOAD_CONFIG+=-C $(CONFIG_LINUX_COMMAND_LINE) +endif +ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))),) + ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD) +endif +endif +ifneq ($(strip $(call strip_quotes,$(CONFIG_PAYLOAD_OPTIONS))),) + ADDITIONAL_PAYLOAD_CONFIG+=$(strip $(call strip_quotes,$(CONFIG_PAYLOAD_OPTIONS))) +endif + cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_config payload_config-file := $(PAYLOAD_CONFIG) payload_config-type := raw |