diff options
| author | Marcello Sylvester Bauer <info@marcellobauer.com> | 2018-11-11 18:03:26 +0100 |
|---|---|---|
| committer | Philipp Deppenwiese <zaolin.daisuki@gmail.com> | 2018-11-28 18:28:45 +0000 |
| commit | 78d0256f1d2bb09e4430f2bd56b58df78d54311b (patch) | |
| tree | 193c5725f2d51a6dba1454ccf7861566bffce6a3 /payloads/external/Makefile.inc | |
| parent | 5d8f02f3ef624e9055cc48cd354497a583133b1d (diff) | |
LinuxBoot: refactor payload
Clean and refactor the structure of the LinuxBoot payload integration,
to make it more modular and readable. The kernel and initramfs should
handled in separated makefiles.
tested with:
- qemu-i440fx (x86, x86_64)
- cavium CN8100 (arm64)
Change-Id: I41d0275a5f7efb920e881f43b0acda29f41ee221
Signed-off-by: Marcello Sylvester Bauer <info@marcellobauer.com>
Reviewed-on: https://review.coreboot.org/c/29581
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.inc | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 74bec476e0..54ff9eab59 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -37,7 +37,10 @@ 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))),) +ifneq ($(CONFIG_LINUXBOOT_ARM64),y) ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD) + prebuilt-files += $(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))) +endif endif endif ifneq ($(strip $(call strip_quotes,$(CONFIG_PAYLOAD_OPTIONS))),) @@ -256,21 +259,24 @@ payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG) linuxboot: $(MAKE) -C payloads/external/LinuxBoot \ CPUS=$(CPUS) \ + CONFIG_LINUXBOOT_ARCH=$(CONFIG_LINUXBOOT_ARCH) \ + CONFIG_LINUXBOOT_KERNEL=$(CONFIG_PAYLOAD_FILE) \ + CONFIG_LINUXBOOT_INITRAMFS=$(CONFIG_LINUX_INITRD) \ + CONFIG_LINUXBOOT_COMPILE_KERNEL=$(CONFIG_LINUXBOOT_COMPILE_KERNEL) \ + CONFIG_LINUXBOOT_BUILD_INITRAMFS=$(CONFIG_LINUXBOOT_BUILD_INITRAMFS) \ CONFIG_LINUXBOOT_KERNEL_VERSION=$(CONFIG_LINUXBOOT_KERNEL_VERSION) \ CONFIG_LINUXBOOT_KERNEL_CONFIGFILE=$(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) \ + CONFIG_LINUXBOOT_UROOT=$(CONFIG_LINUXBOOT_UROOT) \ 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_LINUX_INITRD=$(CONFIG_LINUX_INITRD) + CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) +payloads/external/LinuxBoot/linuxboot/bzImage: linuxboot +payloads/external/LinuxBoot/linuxboot/uImage: linuxboot +payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio.xz: linuxboot -payloads/external/LinuxBoot/linuxboot/kernel-image: linuxboot -payloads/external/LinuxBoot/linuxboot/initramfs.cpio.xz: linuxboot -payloads/external/LinuxBoot/linuxboot/kernel/.config: linuxboot -payloads/external/LinuxBoot/linuxboot/go/src/github.com/u-root/u-root/.git: linuxboot +# Yabits payloads/external/Yabits/uefi/build/uefi.elf yabits: $(MAKE) -C payloads/external/Yabits all \ |