<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28401">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">payloads/LinuxBoot: Fix remaining issues<br><br>* Update kernel versions<br>* Fix initrd path handling<br>* Use build/fit.dtb as default<br><br>Change-Id: Ia0641fd0c0db1e47ee4829b73871af662d4a6370<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>---<br>M payloads/external/LinuxBoot/Kconfig<br>M payloads/external/LinuxBoot/Makefile<br>M payloads/external/LinuxBoot/targets/u-root.mk<br>M payloads/external/Makefile.inc<br>4 files changed, 14 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/28401/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig</span><br><span>index 7a40645..2193ec7 100644</span><br><span>--- a/payloads/external/LinuxBoot/Kconfig</span><br><span>+++ b/payloads/external/LinuxBoot/Kconfig</span><br><span>@@ -50,12 +50,12 @@</span><br><span>      default LINUXBOOT_KERNEL_STABLE</span><br><span> </span><br><span> config LINUXBOOT_KERNEL_STABLE</span><br><span style="color: hsl(0, 100%, 40%);">-   bool "4.15.3"</span><br><span style="color: hsl(120, 100%, 40%);">+       bool "4.14.67"</span><br><span>     help</span><br><span>           Stable kernel version</span><br><span> </span><br><span> config LINUXBOOT_KERNEL_LATEST</span><br><span style="color: hsl(0, 100%, 40%);">-   bool "4.17.11"</span><br><span style="color: hsl(120, 100%, 40%);">+      bool "4.18.5"</span><br><span>      help</span><br><span>           Latest kernel version</span><br><span> </span><br><span>@@ -63,8 +63,8 @@</span><br><span> </span><br><span> config LINUXBOOT_KERNEL_VERSION</span><br><span>       string</span><br><span style="color: hsl(0, 100%, 40%);">-  default "4.17.11" if LINUXBOOT_KERNEL_LATEST</span><br><span style="color: hsl(0, 100%, 40%);">-  default "4.15.3" if LINUXBOOT_KERNEL_STABLE</span><br><span style="color: hsl(120, 100%, 40%);">+ default "4.18.5" if LINUXBOOT_KERNEL_LATEST</span><br><span style="color: hsl(120, 100%, 40%);">+ default "4.14.67" if LINUXBOOT_KERNEL_STABLE</span><br><span> </span><br><span> config LINUXBOOT_KERNEL_CONFIGFILE</span><br><span>     string "Kernel config file"</span><br><span>@@ -82,7 +82,7 @@</span><br><span> config LINUXBOOT_DTB_FILE</span><br><span>       string "Compiled devicetree file"</span><br><span>  depends on LINUXBOOT_ARM64</span><br><span style="color: hsl(0, 100%, 40%);">-      default ""</span><br><span style="color: hsl(120, 100%, 40%);">+  default "build/fit.dtb"</span><br><span> </span><br><span> config PAYLOAD_FILE</span><br><span>         default "payloads/external/LinuxBoot/linuxboot/kernel-image"</span><br><span>diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile</span><br><span>index f259373..c051389 100644</span><br><span>--- a/payloads/external/LinuxBoot/Makefile</span><br><span>+++ b/payloads/external/LinuxBoot/Makefile</span><br><span>@@ -77,26 +77,26 @@</span><br><span> $(project_dir)/vmlinux.bin: $(kernel_dir)/vmlinux</span><br><span>       $(OBJCOPY) -O binary $< $@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-$(project_dir)/target.dtb: $(CONFIG_LINUXBOOT_DTB_FILE)</span><br><span style="color: hsl(120, 100%, 40%);">+$(project_dir)/target.dtb: $(PWD)/$(CONFIG_LINUXBOOT_DTB_FILE)</span><br><span>     cp $< $@</span><br><span> </span><br><span> $(project_dir)/vmlinux.bin.lzma: $(project_dir)/vmlinux.bin</span><br><span>       xz -c -k -f --format=lzma --lzma1=dict=1MiB,lc=3,lp=0,pb=3 $< > $@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-$(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</span><br><span style="color: hsl(120, 100%, 40%);">+$(project_dir)/kernel-image: $(project_dir)/vmlinux.bin.lzma $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir)/target.dtb $(PWD)/$(CONFIG_PAYLOAD_USERSPACE)</span><br><span>       cp $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir)</span><br><span>        mkimage -f $(project_dir)/kernel_fdt_lzma.its $@</span><br><span> endif</span><br><span> </span><br><span> ifeq ($(CONFIG_LINUXBOOT_UROOT),y)</span><br><span style="color: hsl(0, 100%, 40%);">-$(project_dir)/initramfs.cpio.xz:</span><br><span style="color: hsl(120, 100%, 40%);">+$(PWD)/$(CONFIG_PAYLOAD_USERSPACE):</span><br><span>    $(MAKE) -f targets/u-root.mk</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">-$(project_dir)/initramfs.cpio.xz:</span><br><span style="color: hsl(120, 100%, 40%);">+$(PWD)/$(CONFIG_PAYLOAD_USERSPACE):</span><br><span>   echo "Building without u-root support"</span><br><span> endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-payload: $(project_dir)/kernel-image $(project_dir)/initramfs.cpio.xz</span><br><span style="color: hsl(120, 100%, 40%);">+payload: $(project_dir)/kernel-image $(PWD)/$(CONFIG_PAYLOAD_USERSPACE)</span><br><span> </span><br><span> clean:</span><br><span>    if [ -d "$(kernel_dir)" ]; then rm -rf $(kernel_dir); fi</span><br><span>diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk</span><br><span>index f3c70a6..001f7c4 100644</span><br><span>--- a/payloads/external/LinuxBoot/targets/u-root.mk</span><br><span>+++ b/payloads/external/LinuxBoot/targets/u-root.mk</span><br><span>@@ -71,10 +71,10 @@</span><br><span> else</span><br><span> ifneq ($(CONFIG_LINUXBOOT_UROOT_FILES),)</span><br><span>        cd $(uroot_dir); GOARCH=$(CONFIG_LINUXBOOT_ARCH) GOPATH=$(go_path_dir) ./u-root \</span><br><span style="color: hsl(0, 100%, 40%);">-       -build=bb -files $(CONFIG_LINUXBOOT_UROOT_FILES) -o $(project_dir)/initramfs.cpio</span><br><span style="color: hsl(120, 100%, 40%);">+     -build=bb -files $(CONFIG_LINUXBOOT_UROOT_FILES) -o $(project_dir)/initramfs.cpio coreboot-app</span><br><span> else</span><br><span>       cd $(uroot_dir); GOARCH=$(CONFIG_LINUXBOOT_ARCH) GOPATH=$(go_path_dir) ./u-root \</span><br><span style="color: hsl(0, 100%, 40%);">-       -build=bb -o $(project_dir)/initramfs.cpio</span><br><span style="color: hsl(120, 100%, 40%);">+    -build=bb -o $(project_dir)/initramfs.cpio coreboot-app</span><br><span> endif</span><br><span> endif</span><br><span>    xz -f --check=crc32 -9 --lzma2=dict=1MiB --threads=$(CPUS) $(project_dir)/initramfs.cpio</span><br><span>diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc</span><br><span>index f350622..8bd0dc3 100644</span><br><span>--- a/payloads/external/Makefile.inc</span><br><span>+++ b/payloads/external/Makefile.inc</span><br><span>@@ -274,7 +274,8 @@</span><br><span>          CONFIG_LINUXBOOT_ARCH=$(CONFIG_LINUXBOOT_ARCH) \</span><br><span>             CONFIG_LINUXBOOT_UROOT=$(CONFIG_LINUXBOOT_UROOT) \</span><br><span>           CONFIG_LINUXBOOT_UROOT_FILES=$(CONFIG_LINUXBOOT_UROOT_FILES) \</span><br><span style="color: hsl(0, 100%, 40%);">-          CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE)</span><br><span style="color: hsl(120, 100%, 40%);">+                CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) \</span><br><span style="color: hsl(120, 100%, 40%);">+              CONFIG_PAYLOAD_USERSPACE=$(CONFIG_PAYLOAD_USERSPACE)</span><br><span> </span><br><span> </span><br><span> payloads/external/LinuxBoot/linuxboot/kernel-image: linuxboot</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28401">change 28401</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/28401"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia0641fd0c0db1e47ee4829b73871af662d4a6370 </div>
<div style="display:none"> Gerrit-Change-Number: 28401 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>