[L] Change in coreboot[master]: payloads/external/LinuxBoot: Clean up - coreboot-gerrit

27 Jun 2023

Maximilian Brune has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/76150?usp=email )
Change subject: payloads/external/LinuxBoot: Clean up
......................................................................
payloads/external/LinuxBoot: Clean up
There were some issues with the current Linuxboot Makefiles.
- multithreaded compilation didn't work, because some prerequisites
  were missing
- initramfs wasn't added for x86 qemu boot.
- riscv support was incomplete
It began with seperate patches, but resulted in a clean up patch, that
is hard to seperate. The most important changes are the following:
- Instead of phony targets, actual files are now used
- riscv can now be used as target
- initramfs works now also for x86
- instead of querying the most recent version from the internet, I set a
  known working version (because I tested it) that can be customized
  and/or upgraded in the future.
- I removed as much ifeq statements as possible and moved that
  responsibility to Kconfig, because they tend to make the
  Makefile less readable.
Signed-off-by: Maximilian Brune maximilian.brune@9elements.com
Change-Id: I25e757108e0dd473969fe5a192ad0733f1fe6286
---
M payloads/external/LinuxBoot/Kconfig
M payloads/external/LinuxBoot/Makefile
M payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its
M payloads/external/LinuxBoot/targets/linux.mk
M payloads/external/LinuxBoot/targets/u-root.mk
M payloads/external/Makefile.inc
6 files changed, 104 insertions(+), 215 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/76150/1

diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig
index 4feb98b9..caebf27 100644
--- a/payloads/external/LinuxBoot/Kconfig
+++ b/payloads/external/LinuxBoot/Kconfig
@@ -84,33 +84,20 @@
endchoice
-config LINUXBOOT_KERNEL_CUSTOM_VERSION
+config LINUXBOOT_KERNEL_VERSION
    string "kernel version"
-	default ""
-	depends on LINUXBOOT_KERNEL_CUSTOM
+	default "6.3.9"
    help
      Choose the Linux kernel version number. (x.x.x)
      Release candidate kernels (rc) are currently are not supported.
-choice
-	prompt "Kernel configuration"
-	default LINUXBOOT_KERNEL_ARCH_DEFAULT_CONFIG
-
-config LINUXBOOT_KERNEL_ARCH_DEFAULT_CONFIG
-	bool "Default architecture configuration"
-	help
-	  This option will use the default configuration for the
-	  selected architecture.
-
-config LINUXBOOT_KERNEL_CUSTOM_CONFIG
-	bool "Custom (def)config file"
-
-endchoice
-
 config LINUXBOOT_KERNEL_CONFIGFILE
    string "Config file path"
-	default "defconfig"
-	depends on LINUXBOOT_KERNEL_CUSTOM_CONFIG
+	default "arm64/defconfig"  if LINUXBOOT_ARM64
+	default "x86_64/defconfig" if LINUXBOOT_X86_64
+	default "x86/defconfig"    if LINUXBOOT_X86
+	default "arm64/defconfig"  if LINUXBOOT_ARM64
+	default "riscv/defconfig"  if LINUXBOOT_RISCV
    help
      Path to the kernel configuration file.
@@ -131,10 +118,10 @@
endchoice
-config LINUXBOOT_DTB_FILE
+config LINUXBOOT_DTS_FILE
    string "Compiled devicetree file"
    depends on LINUXBOOT_ARM64 || LINUXBOOT_RISCV
-	default ""
+	default "empty.dts"
endif #LINUXBOOT_COMPILE_KERNEL
@@ -145,8 +132,8 @@
      Add your own kernel command-line arguments.
config PAYLOAD_FILE
-	default "payloads/external/LinuxBoot/linuxboot/bzImage" if LINUXBOOT_COMPILE_KERNEL && ( LINUXBOOT_X86 || LINUXBOOT_X86_64 )
-	default "payloads/external/LinuxBoot/linuxboot/uImage" if LINUXBOOT_COMPILE_KERNEL && (LINUXBOOT_ARM64 || LINUXBOOT_RISCV)
+	default "payloads/external/LinuxBoot/build/bzImage" if LINUXBOOT_COMPILE_KERNEL && ( LINUXBOOT_X86 || LINUXBOOT_X86_64 )
+	default "payloads/external/LinuxBoot/build/uImage" if LINUXBOOT_COMPILE_KERNEL && (LINUXBOOT_ARM64 || LINUXBOOT_RISCV)
    default LINUXBOOT_KERNEL_PATH if !LINUXBOOT_COMPILE_KERNEL
comment "Linux initramfs"
@@ -157,7 +144,7 @@
config LINUXBOOT_INITRAMFS_PATH
    string "Path to initramfs"
-	depends on !LINUXBOOT_BUILD_INITRAMFS
+	default "build/initramfs_u-root.cpio" if LINUXBOOT_UROOT
if LINUXBOOT_BUILD_INITRAMFS
@@ -345,11 +332,6 @@
endchoice
-config LINUX_INITRD
-	string
-	default "payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio" if LINUXBOOT_UROOT
-	default LINUXBOOT_INITRAMFS_PATH if !LINUXBOOT_BUILD_INITRAMFS
-
 config LINUXBOOT_INITRAMFS_SUFFIX
    string
    default "" if LINUXBOOT_INITRAMFS_COMPRESSION_NONE
diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile
index cd9f7ea..c4cd87f 100644
--- a/payloads/external/LinuxBoot/Makefile
+++ b/payloads/external/LinuxBoot/Makefile
@@ -1,62 +1,51 @@
 ## SPDX-License-Identifier: GPL-2.0-only
-project_dir=linuxboot
-
 unexport $(COREBOOT_EXPORTS)
-all: linuxboot
+ARCH-$(CONFIG_LINUXBOOT_X86_64)=x86_64
+ARCH-$(CONFIG_LINUXBOOT_X86)=x86
+ARCH-$(CONFIG_LINUXBOOT_ARM64)=arm64
+ARCH-$(CONFIG_LINUXBOOT_RISCV)=riscv
+top:=../../..
-u-root:
-	$(MAKE) -f targets/u-root.mk
+linuxboot: $(top)/$(CONFIG_PAYLOAD_FILE)
-ifeq ($(CONFIG_LINUXBOOT_BUILD_INITRAMFS),y)
-ifeq ($(CONFIG_LINUXBOOT_UROOT),y)
-initramfs: u-root
-endif
-else
-ifneq ($(CONFIG_LINUXBOOT_INITRAMFS),)
-initramfs:
-	if [[ ! -f "$(top)/$(CONFIG_LINUXBOOT_INITRAMFS)" ]]; then \
-	echo "<< Linux initramfs '$(CONFIG_LINUXBOOT_INITRAMFS)' is missing. >>"; \
-	exit 1; \
-	fi
-endif
-endif
+include targets/linux.mk targets/u-root.mk
-initramfs_compressed: initramfs
+build/initramfs: $(CONFIG_LINUXBOOT_INITRAMFS_PATH)
 ifeq ($(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ),y)
-	xz --keep --force --check=crc32 --lzma2=dict=1MiB $(top)/$(CONFIG_LINUXBOOT_INITRAMFS)
+	xz --keep --force --check=crc32 --lzma2=dict=1MiB $(CONFIG_LINUXBOOT_INITRAMFS_PATH)
+endif
+	cp $(CONFIG_LINUXBOOT_INITRAMFS_PATH)$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) $@
+
+#ifeq ($(CONFIG_LINUXBOOT_COMPILE_KERNEL),y)
+
+ifeq ($(CONFIG_LINUXBOOT_KERNEL_BZIMAGE),y)
+
+$(top)/$(CONFIG_PAYLOAD_FILE): $(kernel_dir)/arch/x86/boot/bzImage | build
+	cp $< $@
+
+else ifeq ($(CONFIG_LINUXBOOT_KERNEL_UIMAGE),y)
+
+build/target.dtb: $(CONFIG_LINUXBOOT_DTS_FILE)
+	dtc -o $@ $<
+
+$(top)/$(CONFIG_PAYLOAD_FILE): build/vmlinux.bin.lzma build/initramfs build/target.dtb $(ARCH-y)/kernel_fdt_lzma.its
+	mkimage -f $(ARCH-y)/kernel_fdt_lzma.its $@
+
 endif
-ifeq ($(CONFIG_LINUXBOOT_COMPILE_KERNEL),y)
-ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64)
-kernel: initramfs
-	if [[ ! -f "$(top)/$(CONFIG_LINUXBOOT_DTB_FILE)" ]]; then \
-	echo "<< Linux kernel devicetree is missing. >>"; \
-	exit 1; \
-	fi
-	$(MAKE) -f targets/linux.mk
-else
-kernel:
-	$(MAKE) -f targets/linux.mk
-endif
-else
-kernel:
-	if [[ ! -f "$(top)/$(CONFIG_LINUXBOOT_KERNEL)" ]]; then \
-	echo "<< Linux kernel '$(CONFIG_LINUXBOOT_KERNEL)' is missing. >>"; \
-	exit 1; \
-	fi
-endif
-
-linuxboot: kernel initramfs_compressed
+#TODO this is a bit confusing
+build:
+	mkdir build
clean:
-	rm -rf $(project_dir)/kernel*
-	rm -f $(project_dir)/u-root
-	rm -f $(project_dir)/initramfs*
-	rm -f $(project_dir)/bzImage
+	rm -rf build/kernel*
+	rm -f  build/u-root
+	rm -f  build/initramfs*
+	rm -f  build/bzImage
distclean:
-	rm -rf $(project_dir)
+	rm -rf build
-.PHONY: linuxboot kernel initramfs_compressed initramfs u-root clean distclean
+.PHONY: linuxboot clean distclean
diff --git a/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its b/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its
index 3087e69..46c43ac 100644
--- a/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its
+++ b/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its
@@ -11,7 +11,7 @@
    images {
    	kernel {
    		description = "Vanilla Linux kernel";
-			data = /incbin/("vmlinux.bin.lzma");
+			data = /incbin/("../build/vmlinux.bin.lzma");
    		type = "kernel";
    		arch = "arm64";
    		os = "linux";
@@ -30,7 +30,7 @@
    	};
    	fdt-1 {
    		description = "Flattened Device Tree blob";
-			data = /incbin/("target.dtb");
+			data = /incbin/("../build/target.dtb");
    		type = "flat_dt";
    		arch = "arm64";
    		compression = "none";
@@ -46,7 +46,7 @@
    	};
    	ramdisk-1 {
    		description = "Compressed Initramfs";
-			data = /incbin/("initramfs");
+			data = /incbin/("../build/initramfs");
    		type = "ramdisk";
    		arch = "arm64";
    		os = "linux";
@@ -65,6 +65,7 @@
    configurations {
    	default = "conf-1";
    	conf-1 {
+			compatible = "linuxboot";
    		description = "Boot Linux kernel with FDT blob";
    		kernel = "kernel";
    		fdt = "fdt-1";
diff --git a/payloads/external/LinuxBoot/targets/linux.mk b/payloads/external/LinuxBoot/targets/linux.mk
index 12f66f7..a28a5f3 100644
--- a/payloads/external/LinuxBoot/targets/linux.mk
+++ b/payloads/external/LinuxBoot/targets/linux.mk
@@ -1,39 +1,21 @@
 ## SPDX-License-Identifier: GPL-2.0-only
-SHELL := /bin/bash
-
-ARCH-$(CONFIG_LINUXBOOT_X86_64)=x86_64
-ARCH-$(CONFIG_LINUXBOOT_X86)=x86
-ARCH-$(CONFIG_LINUXBOOT_ARM64)=arm64
-
-TAG-$(CONFIG_LINUXBOOT_KERNEL_MAINLINE)=mainline
-TAG-$(CONFIG_LINUXBOOT_KERNEL_STABLE)=stable
-TAG-$(CONFIG_LINUXBOOT_KERNEL_LONGTERM)=longterm
+SHELL := /bin/sh
pwd:=$(shell pwd)
 top:=../../..
-project_dir=linuxboot
-tarball_dir:=$(project_dir)/tarball
-decompress_flag=.done
OBJCOPY:=$(LINUXBOOT_CROSS_COMPILE)objcopy
 KERNEL_MAKE_FLAGS = \
+	CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) \
    ARCH=$(ARCH-y) \
    KBUILD_BUILD_USER="coreboot" \
    KBUILD_BUILD_HOST="reproducible" \
    KBUILD_BUILD_TIMESTAMP="$(shell perl -e 'print scalar gmtime($(SOURCE_DATE_EPOCH))')" \
    KBUILD_BUILD_VERSION="0"
-ifeq ($(CONFIG_LINUXBOOT_KERNEL_CUSTOM),y)
-	kernel_version:=$(CONFIG_LINUXBOOT_KERNEL_CUSTOM_VERSION)
-else
-	kernel_version:=$(shell curl -sS -k https://www.kernel.org/feeds/kdist.xml | \
-		sed -n -e 's@.*<guid isPermaLink="false">(.*)</guid>.*@\1@p' | \
-		awk -F ',' '/$(TAG-y)/{ print $$3 }' | \
-		head -n 1)
-endif
-
-kernel_dir=$(project_dir)/kernel-$(subst .,_,$(kernel_version))
+kernel_version=$(CONFIG_LINUXBOOT_KERNEL_VERSION)
+kernel_dir=kernel-$(subst .,_,$(kernel_version))
 kernel_tarball=linux-$(kernel_version).tar
 kernel_mirror=https://mirrors.edge.kernel.org/pub/linux/kernel
@@ -49,81 +31,33 @@
 kernel_mirror_path := $(kernel_mirror)/v6.x
 endif
-all: kernel
+$(kernel_tarball).xz:
+	echo "    Test $(kernel_version)"
+	echo "    WWW        $(kernel_mirror_path)/$(kernel_tarball).xz";
+	curl -OLSs "$(kernel_mirror_path)/$(kernel_tarball).xz";
-lookup:
-ifeq ($(kernel_version),)
-	$(error kernel version lookup failed for $(TAG-y) release)
-endif
-	@echo "    WWW        Kernel [$(TAG-y)] $(kernel_version)"
+$(kernel_dir): $(kernel_tarball).xz
+	echo "    XZ         $(kernel_tarball).xz";
+	mkdir $(kernel_dir);
+	tar xJf $(kernel_tarball).xz --strip 1 -C $(kernel_dir);
-fetch:
-ifneq ($(shell [[ -d "$(kernel_dir)" && -f "$(kernel_dir)/$(decompress_flag)" ]];echo $$?),0)
-	mkdir -p $(tarball_dir)
-	if [[ ! -f $(tarball_dir)/$(kernel_tarball).xz && ! -f $(tarball_dir)/$(kernel_tarball).xz ]]; then \
-	echo "    WWW        $(kernel_tarball).xz"; \
-	cd $(tarball_dir); \
-	curl -OLSs "$(kernel_mirror_path)/$(kernel_tarball).xz"; \
-	cd $(pwd); \
-	fi
-endif
-
-unpack: fetch
-	if [[ -d "$(kernel_dir)" && ! -f "$(kernel_dir)/$(decompress_flag)" ]]; then \
-	rm -rf $(kernel_dir); \
-	fi
-	if [[ ! -d "$(kernel_dir)" ]]; then \
-	mkdir $(kernel_dir); \
-	echo "    XZ         $(kernel_tarball).xz"; \
-	tar xJf $(tarball_dir)/$(kernel_tarball).xz --strip 1 -C $(kernel_dir); \
-	fi
-	touch $(kernel_dir)/$(decompress_flag)
-
-$(kernel_dir)/.config: unpack
+$(kernel_dir)/.config: $(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) | $(kernel_dir)
    @echo "    CONFIG     Linux $(kernel_version)"
-ifeq ($(CONFIG_LINUXBOOT_KERNEL_CUSTOM_CONFIG),y)
    cp $(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) $(kernel_dir)/.config
-else
-	cp $(ARCH-y)/defconfig $(kernel_dir)/.config
-endif
    $(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) olddefconfig
-build: $(kernel_dir)/.config
+$(kernel_dir)/vmlinux : $(kernel_dir)/.config | $(kernel_dir)
    @echo "    MAKE       Linux $(kernel_version)"
-ifeq ($(CONFIG_LINUXBOOT_KERNEL_BZIMAGE),y)
-	$(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) bzImage
-else
-ifeq ($(CONFIG_LINUXBOOT_KERNEL_UIMAGE),y)
-	$(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) vmlinux
-endif
-endif
+	$(MAKE) -j 4 -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) vmlinux
-ifeq ($(CONFIG_LINUXBOOT_KERNEL_BZIMAGE),y)
-$(top)/$(CONFIG_LINUXBOOT_KERNEL): build
-	@echo "    CP         bzImage"
-	cp $(kernel_dir)/arch/x86/boot/bzImage $@
-else
-ifeq ($(CONFIG_LINUXBOOT_KERNEL_UIMAGE),y)
-$(project_dir)/target.dtb: $(top)/$(CONFIG_LINUXBOOT_DTB_FILE)
-	cp $< $@
-$(project_dir)/vmlinux.bin: $(kernel_dir)/vmlinux
+build/vmlinux.bin: $(kernel_dir)/vmlinux | build
    $(OBJCOPY) -O binary $< $@
-$(project_dir)/vmlinux.bin.lzma: $(project_dir)/vmlinux.bin
+
+build/vmlinux.bin.lzma: build/vmlinux.bin
    xz -c -k -f --format=lzma --lzma1=dict=1MiB,lc=3,lp=0,pb=3 $< > $@
-$(top)/$(CONFIG_LINUXBOOT_KERNEL): build $(project_dir)/vmlinux.bin.lzma $(project_dir)/target.dtb
-	cp $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir)
-	cp $(top)/$(CONFIG_LINUXBOOT_INITRAMFS)$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) $(project_dir)/initramfs
-	mkimage -f $(project_dir)/kernel_fdt_lzma.its $@
-else
-	$(error Kernel image format not found)
-	exit 1
-endif
-endif
-ifneq ($(TAG-y),)
-kernel: lookup $(top)/$(CONFIG_LINUXBOOT_KERNEL)
-else
-kernel: $(top)/$(CONFIG_LINUXBOOT_KERNEL)
-endif
+$(kernel_dir)/arch/x86/boot/bzImage: $(kernel_dir)/.config
+	@echo "    MAKE       Linux $(kernel_version)"
+	$(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) bzImage
-.PHONY: all kernel build unpack fetch check
+.PHONY: kernel
diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk
index e673aab..52c8956 100644
--- a/payloads/external/LinuxBoot/targets/u-root.mk
+++ b/payloads/external/LinuxBoot/targets/u-root.mk
@@ -1,13 +1,12 @@
 ## SPDX-License-Identifier: GPL-2.0-only
-project_dir=$(shell pwd)/linuxboot
-go_path_dir=$(project_dir)/go
-uroot_bin=$(project_dir)/u-root
 uroot_package=github.com/u-root/u-root
+uroot_build=build/go/src/$(uroot_package)
-ARCH-$(CONFIG_LIBUXBOOT_X86_64)=amd64
-ARCH-$(CONFIG_LINUXBOOT_X86)=i386
-ARCH-$(CONFIG_LINUXBOOT_ARM64)=arm64
+UROOT_ARCH-$(CONFIG_LIBUXBOOT_X86_64)=amd64
+UROOT_ARCH-$(CONFIG_LINUXBOOT_X86)=i386
+UROOT_ARCH-$(CONFIG_LINUXBOOT_ARM64)=arm64
+UROOT_ARCH-$(CONFIG_LINUXBOOT_RISCV)=riscv64
go_version=$(shell go version | sed -nr 's/.*go([0-9]+.[0-9]+.?[0-9]?).*/\1/p' )
 go_version_major=$(shell echo $(go_version) |  sed -nr 's/^([0-9]+).([0-9]+).?([0-9]*)$$/\1/p')
@@ -23,8 +22,6 @@
uroot_cmds=$(CONFIG_LINUXBOOT_UROOT_COMMANDS)
-all: u-root
-
 version:
 ifeq ("$(go_version)","")
    printf "\n<<Please install Golang >= 1.9 for u-root mode>>\n\n"
@@ -38,27 +35,16 @@
 endif
 endif
-get: version
-	if [ -d "$(go_path_dir)/src/$(uroot_package)" ]; then \
-	git -C $(go_path_dir)/src/$(uroot_package) checkout --quiet main; \
-	git -C $(go_path_dir)/src/$(uroot_package) pull || \
-	echo -e "\n<<Pulling u-root package from GitHub failed>>\n"; \
-	else \
-	git clone https://$%7Buroot_package%7D ${go_path_dir}/src/${uroot_package} || \
-	(echo -e "\n<<Failed to clone u-root package. Please check your internet access>>\n" && \
-	exit 1); \
-	fi
+$(uroot_build):
+	git clone https://$(uroot_package) $(uroot_build)
+	git -C $(uroot_build) checkout --quiet $(CONFIG_LINUXBOOT_UROOT_VERSION)
-checkout: get
-	git -C $(go_path_dir)/src/$(uroot_package) checkout --quiet $(CONFIG_LINUXBOOT_UROOT_VERSION)
+$(uroot_build)/u-root: $(uroot_build)
+	cd $(uroot_build); \
+	go build -o u-root .
-build: checkout
-	cd ${go_path_dir}/src/${uroot_package}; \
-	go build -o ${uroot_bin} .
-
-u-root: build
-	GOARCH=$(ARCH-y) $(uroot_bin) \
-	-uroot-source ${go_path_dir}/src/${uroot_package} \
-	$(uroot_args) -o $(project_dir)/initramfs_u-root.cpio $(uroot_cmds)
-
-.PHONY: all u-root build checkout get version
+#$(CONFIG_LINUXBOOT_INITRAMFS_PATH)
+build/initramfs_u-root.cpio: $(uroot_build)/u-root
+	GOARCH=$(UROOT_ARCH-y) $(uroot_build)/u-root \
+	-uroot-source $(uroot_build) \
+	$(uroot_args) -o build/initramfs_u-root.cpio $(uroot_cmds)
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 85e01b9..92fa205 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -26,8 +26,8 @@
 endif
 ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))),)
 ifneq ($(CONFIG_LINUXBOOT_ARM64),y)
-      ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD)$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX)
-      prebuilt-files += $(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD)))
+      ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD)$(CONFIG_LINUXBOOT_INITRAMFS)$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX)
+      prebuilt-files += $(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD)$(CONFIG_LINUXBOOT_INITRAMFS)))
 endif
 endif
 endif
@@ -371,24 +371,20 @@
 linuxboot:
    $(MAKE) -C payloads/external/LinuxBoot \
    	CPUS=$(CPUS) \
+		CONFIG_PAYLOAD_FILE=$(CONFIG_PAYLOAD_FILE) \
    	CONFIG_LINUXBOOT_X86_64=$(CONFIG_LINUXBOOT_X86_64) \
    	CONFIG_LINUXBOOT_X86=$(CONFIG_LINUXBOOT_X86) \
    	CONFIG_LINUXBOOT_ARM64=$(CONFIG_LINUXBOOT_ARM64) \
-		CONFIG_LINUXBOOT_KERNEL=$(CONFIG_PAYLOAD_FILE) \
-		CONFIG_LINUXBOOT_INITRAMFS=$(CONFIG_LINUX_INITRD) \
-		CONFIG_LINUXBOOT_INITRAMFS_SUFFIX=$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) \
-		CONFIG_LINUXBOOT_COMPILE_KERNEL=$(CONFIG_LINUXBOOT_COMPILE_KERNEL) \
+		CONFIG_LINUXBOOT_RISCV=$(CONFIG_LINUXBOOT_RISCV) \
    	CONFIG_LINUXBOOT_BUILD_INITRAMFS=$(CONFIG_LINUXBOOT_BUILD_INITRAMFS) \
-		CONFIG_LINUXBOOT_KERNEL_MAINLINE=$(CONFIG_LINUXBOOT_KERNEL_MAINLINE) \
-		CONFIG_LINUXBOOT_KERNEL_STABLE=$(CONFIG_LINUXBOOT_KERNEL_STABLE) \
-		CONFIG_LINUXBOOT_KERNEL_LONGTERM=$(CONFIG_LINUXBOOT_KERNEL_LONGTERM) \
-		CONFIG_LINUXBOOT_KERNEL_CUSTOM=$(CONFIG_LINUXBOOT_KERNEL_CUSTOM) \
-		CONFIG_LINUXBOOT_KERNEL_CUSTOM_VERSION=$(CONFIG_LINUXBOOT_KERNEL_CUSTOM_VERSION) \
-		CONFIG_LINUXBOOT_KERNEL_CUSTOM_CONFIG=$(CONFIG_LINUXBOOT_KERNEL_CUSTOM_CONFIG) \
+		CONFIG_LINUXBOOT_INITRAMFS_PATH=$(CONFIG_LINUXBOOT_INITRAMFS_PATH) \
+		CONFIG_LINUXBOOT_INITRAMFS_SUFFIX=$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) \
+		CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ=$(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ) \
+		CONFIG_LINUXBOOT_COMPILE_KERNEL=$(CONFIG_LINUXBOOT_COMPILE_KERNEL) \
+		CONFIG_LINUXBOOT_KERNEL_VERSION=$(CONFIG_LINUXBOOT_KERNEL_VERSION) \
    	CONFIG_LINUXBOOT_KERNEL_BZIMAGE=$(CONFIG_LINUXBOOT_KERNEL_BZIMAGE) \
    	CONFIG_LINUXBOOT_KERNEL_UIMAGE=$(CONFIG_LINUXBOOT_KERNEL_UIMAGE) \
    	CONFIG_LINUXBOOT_KERNEL_CONFIGFILE=$(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) \
-		CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ=$(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ) \
    	CONFIG_LINUXBOOT_UROOT=$(CONFIG_LINUXBOOT_UROOT) \
    	CONFIG_LINUXBOOT_UROOT_VERSION=$(CONFIG_LINUXBOOT_UROOT_VERSION) \
    	CONFIG_LINUXBOOT_UROOT_FORMAT=$(CONFIG_LINUXBOOT_UROOT_FORMAT) \
@@ -397,11 +393,12 @@
    	CONFIG_LINUXBOOT_UROOT_SHELL=$(CONFIG_LINUXBOOT_UROOT_SHELL) \
    	CONFIG_LINUXBOOT_UROOT_COMMANDS=$(CONFIG_LINUXBOOT_UROOT_COMMANDS) \
    	CONFIG_LINUXBOOT_UROOT_FILES=$(CONFIG_LINUXBOOT_UROOT_FILES) \
-		CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE)
+		CONFIG_LINUXBOOT_DTS_FILE=$(CONFIG_LINUXBOOT_DTS_FILE) \
+		LINUXBOOT_CROSS_COMPILE="$(CROSS_COMPILE_$(ARCH-bootblock-y))" \
-payloads/external/LinuxBoot/linuxboot/bzImage: linuxboot
-payloads/external/LinuxBoot/linuxboot/uImage: linuxboot
-payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio: linuxboot
+payloads/external/LinuxBoot/build/bzImage: linuxboot
+payloads/external/LinuxBoot/build/uImage: linuxboot
+payloads/external/LinuxBoot/build/initramfs_u-root.cpio: linuxboot
# BOOTBOOT
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/76150?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I25e757108e0dd473969fe5a192ad0733f1fe6286
Gerrit-Change-Number: 76150
Gerrit-PatchSet: 1
Gerrit-Owner: Maximilian Brune maximilian.brune@9elements.com
Gerrit-MessageType: newchange



    