diff options
Diffstat (limited to 'payloads/external/Makefile.inc')
| -rw-r--r-- | payloads/external/Makefile.inc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index c730bbace3..74bec476e0 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -32,18 +32,7 @@ $(PAYLOAD_CONFIG): payloads/external/depthcharge/depthcharge/build/depthcharge.e #TODO: Figure out version endif -ifeq ($(CONFIG_PAYLOAD_LINUXBOOT),y) - ifeq ($(CONFIG_ARCH_X86),y) - ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUXBOOT_KERNEL_COMMANDLINE))),) - ADDITIONAL_PAYLOAD_CONFIG+=-C $(CONFIG_LINUXBOOT_KERNEL_COMMANDLINE) - endif - ifneq ($(strip $(call strip_quotes,$(CONFIG_PAYLOAD_USERSPACE))),) - ADDITIONAL_PAYLOAD_CONFIG+=-I $(strip $(call strip_quotes,$(CONFIG_PAYLOAD_USERSPACE))) - endif - endif -endif - -ifeq ($(CONFIG_PAYLOAD_LINUX),y) +ifeq ($(CONFIG_PAYLOAD_LINUX)$(CONFIG_PAYLOAD_LINUXBOOT),y) ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_COMMAND_LINE))),) ADDITIONAL_PAYLOAD_CONFIG+=-C $(CONFIG_LINUX_COMMAND_LINE) endif @@ -269,14 +258,13 @@ linuxboot: CPUS=$(CPUS) \ CONFIG_LINUXBOOT_KERNEL_VERSION=$(CONFIG_LINUXBOOT_KERNEL_VERSION) \ CONFIG_LINUXBOOT_KERNEL_CONFIGFILE=$(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) \ - CONFIG_LINUXBOOT_KERNEL_COMMANDLINE=$(CONFIG_LINUXBOOT_KERNEL_COMMANDLINE) \ CONFIG_LINUXBOOT_UROOT_VERSION=$(CONFIG_LINUXBOOT_UROOT_VERSION) \ CONFIG_LINUXBOOT_UROOT_COMMANDS=$(CONFIG_LINUXBOOT_UROOT_COMMANDS) \ CONFIG_LINUXBOOT_ARCH=$(CONFIG_LINUXBOOT_ARCH) \ CONFIG_LINUXBOOT_UROOT=$(CONFIG_LINUXBOOT_UROOT) \ CONFIG_LINUXBOOT_UROOT_FILES=$(CONFIG_LINUXBOOT_UROOT_FILES) \ CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) \ - CONFIG_PAYLOAD_USERSPACE=$(CONFIG_PAYLOAD_USERSPACE) + CONFIG_LINUX_INITRD=$(CONFIG_LINUX_INITRD) payloads/external/LinuxBoot/linuxboot/kernel-image: linuxboot |