summaryrefslogtreecommitdiff
path: root/payloads/external/Makefile.inc
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2018-03-13 11:22:26 +0100
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2018-07-19 13:54:24 +0000
commit02c08147645d37e8d21f89b62cb7029be7543bd6 (patch)
tree98dc70e780a4a1a01145d58c254ce16d7471e276 /payloads/external/Makefile.inc
parent4e2f95b789d8f3b505f52c42b634401dd5f718a2 (diff)
payloads/LinuxBoot: Add ARM64 support
Add support for ARCH=ARM64 and introduce CROSS_COMPILE for all architectures. * Always compress kernel Image using xz * Create FIT uImage containing the kernel, initramfs and DTB * Add ARM64 defconfig for all SoCs Change-Id: I9a0cc248283432fb2384956ca55e687d4127398c Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/25152 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Diffstat (limited to 'payloads/external/Makefile.inc')
-rw-r--r--payloads/external/Makefile.inc24
1 files changed, 10 insertions, 14 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 1d3e7a17d9..973bdfb10d 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -33,10 +33,14 @@ $(PAYLOAD_CONFIG): payloads/external/depthcharge/depthcharge/build/depthcharge.e
endif
ifeq ($(CONFIG_PAYLOAD_LINUXBOOT),y)
-ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUXBOOT_KERNEL_COMMANDLINE))),)
+ ifeq ($(CONFIG_ARCH_X86),y)
+ ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUXBOOT_KERNEL_COMMANDLINE))),)
ADDITIONAL_PAYLOAD_CONFIG+=-C $(CONFIG_LINUXBOOT_KERNEL_COMMANDLINE)
-endif
-ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_PAYLOAD_USERSPACE)
+ 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)
@@ -259,16 +263,6 @@ payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG)
linuxboot:
$(MAKE) -C payloads/external/LinuxBoot \
- HOSTCC="$(HOSTCC)" \
- CC="$(HOSTCC)" \
- GCC_CC_x86_32=$(GCC_CC_x86_32) \
- GCC_CC_x86_64=$(GCC_CC_x86_64) \
- GCC_CC_arm=$(GCC_CC_arm) \
- GCC_CC_arm64=$(GCC_CC_arm64) \
- OBJCOPY_x86_32=$(OBJCOPY_x86_32) \
- OBJCOPY_x86_64=$(OBJCOPY_x86_64) \
- OBJCOPY_arm=$(OBJCOPY_arm) \
- OBJCOPY_arm64=$(OBJCOPY_arm64) \
CPUS=$(CPUS) \
CONFIG_LINUXBOOT_KERNEL_VERSION=$(CONFIG_LINUXBOOT_KERNEL_VERSION) \
CONFIG_LINUXBOOT_KERNEL_CONFIGFILE=$(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) \
@@ -277,7 +271,9 @@ linuxboot:
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_UROOT_FILES=$(CONFIG_LINUXBOOT_UROOT_FILES) \
+ CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE)
+
payloads/external/LinuxBoot/linuxboot/kernel-image: linuxboot
payloads/external/LinuxBoot/linuxboot/initramfs.cpio.xz: linuxboot