payloads/LinuxBoot: Fix remaining issues
* Update kernel versions * Fix initrd path handling Change-Id: Ia0641fd0c0db1e47ee4829b73871af662d4a6370 Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org> Reviewed-on: https://review.coreboot.org/28401 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: David Hendricks <david.hendricks@gmail.com>
This commit is contained in:
committed by
Patrick Georgi
parent
3b5351d044
commit
9569ebeab8
10
payloads/external/LinuxBoot/Makefile
vendored
10
payloads/external/LinuxBoot/Makefile
vendored
@@ -77,26 +77,26 @@ else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64)
|
||||
$(project_dir)/vmlinux.bin: $(kernel_dir)/vmlinux
|
||||
$(OBJCOPY) -O binary $< $@
|
||||
|
||||
$(project_dir)/target.dtb: $(CONFIG_LINUXBOOT_DTB_FILE)
|
||||
$(project_dir)/target.dtb: $(PWD)/$(CONFIG_LINUXBOOT_DTB_FILE)
|
||||
cp $< $@
|
||||
|
||||
$(project_dir)/vmlinux.bin.lzma: $(project_dir)/vmlinux.bin
|
||||
xz -c -k -f --format=lzma --lzma1=dict=1MiB,lc=3,lp=0,pb=3 $< > $@
|
||||
|
||||
$(project_dir)/kernel-image: $(project_dir)/vmlinux.bin.lzma $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir)/target.dtb $(project_dir)/initramfs.cpio.xz
|
||||
$(project_dir)/kernel-image: $(project_dir)/vmlinux.bin.lzma $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir)/target.dtb $(PWD)/$(CONFIG_PAYLOAD_USERSPACE)
|
||||
cp $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir)
|
||||
mkimage -f $(project_dir)/kernel_fdt_lzma.its $@
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_LINUXBOOT_UROOT),y)
|
||||
$(project_dir)/initramfs.cpio.xz:
|
||||
$(PWD)/$(CONFIG_PAYLOAD_USERSPACE):
|
||||
$(MAKE) -f targets/u-root.mk
|
||||
else
|
||||
$(project_dir)/initramfs.cpio.xz:
|
||||
$(PWD)/$(CONFIG_PAYLOAD_USERSPACE):
|
||||
echo "Building without u-root support"
|
||||
endif
|
||||
|
||||
payload: $(project_dir)/kernel-image $(project_dir)/initramfs.cpio.xz
|
||||
payload: $(project_dir)/kernel-image $(PWD)/$(CONFIG_PAYLOAD_USERSPACE)
|
||||
|
||||
clean:
|
||||
if [ -d "$(kernel_dir)" ]; then rm -rf $(kernel_dir); fi
|
||||
|
Reference in New Issue
Block a user