[coreboot-gerrit] New patch to review for coreboot: Makefile.inc: Move payload code to payloads/

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14349

-gerrit

commit 63dca3320dd53e66405f6fc7d525e857fb8029eb
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Wed Apr 13 13:13:02 2016 -0700

    Makefile.inc: Move payload code to payloads/
    
    Change-Id: I91d9537e8c78560c944c552255e703fc0e6f1f78
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 Makefile.inc                   | 12 ------------
 payloads/external/Makefile.inc | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index d2e627f..bbaa6a8 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -741,18 +741,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 8825129..26a5613 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