<p>Marcello Sylvester Bauer has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29448">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Linuxboot: add option to parse initramfs<br><br>Add the option to build the Linuxboot initramfs, otherwise choose the path to a<br>custom initramfs. Build a u-root initramfs remains default.<br><br>Change-Id: I648fb2e0383d20b0e4d50e416af637ea07d1efb4<br>Signed-off-by: Marcello Sylvester Bauer <info@marcellobauer.com><br>---<br>M payloads/external/LinuxBoot/Kconfig<br>M payloads/external/LinuxBoot/Makefile<br>2 files changed, 21 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/29448/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 58a67d6..30bd610 100644</span><br><span>--- a/payloads/external/LinuxBoot/Kconfig</span><br><span>+++ b/payloads/external/LinuxBoot/Kconfig</span><br><span>@@ -112,9 +112,16 @@</span><br><span> config PAYLOAD_FILE</span><br><span>      default "payloads/external/LinuxBoot/linuxboot/kernel-image"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config LINUXBOOT_BUILD_INITRAMFS</span><br><span style="color: hsl(120, 100%, 40%);">+  bool "build initramfs"</span><br><span style="color: hsl(120, 100%, 40%);">+      default y</span><br><span style="color: hsl(120, 100%, 40%);">+     help</span><br><span style="color: hsl(120, 100%, 40%);">+    build Linuxboot initramfs</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> choice</span><br><span>      prompt "Payload Mode"</span><br><span>      default LINUXBOOT_UROOT</span><br><span style="color: hsl(120, 100%, 40%);">+       depends on LINUXBOOT_BUILD_INITRAMFS</span><br><span> </span><br><span> config LINUXBOOT_UROOT</span><br><span>   bool "u-root"</span><br><span>@@ -153,12 +160,20 @@</span><br><span>        Path to directory containing root structure for embedding into the</span><br><span>           initramfs.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config PAYLOAD_USERSPACE</span><br><span style="color: hsl(0, 100%, 40%);">-        string "LinuxBoot initramfs"</span><br><span style="color: hsl(0, 100%, 40%);">-  default "payloads/external/LinuxBoot/linuxboot/initramfs.cpio.xz"</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config LINUXBOOT_CUSTOM_INITRAMFS</span><br><span style="color: hsl(120, 100%, 40%);">+       string "path to LinuxBoot initramfs"</span><br><span style="color: hsl(120, 100%, 40%);">+        default ""</span><br><span style="color: hsl(120, 100%, 40%);">+  depends on !LINUXBOOT_BUILD_INITRAMFS</span><br><span>        help</span><br><span>           The initramfs to use with the compiled kernel.</span><br><span>       Useful for debugging or custom initramfs.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(120, 100%, 40%);">+config PAYLOAD_USERSPACE</span><br><span style="color: hsl(120, 100%, 40%);">+        string</span><br><span style="color: hsl(120, 100%, 40%);">+        default "payloads/external/LinuxBoot/linuxboot/initramfs.cpio.xz" \</span><br><span style="color: hsl(120, 100%, 40%);">+         if LINUXBOOT_BUILD_INITRAMFS && LINUXBOOT_UROOT</span><br><span style="color: hsl(120, 100%, 40%);">+       default LINUXBOOT_CUSTOM_INITRAMFS if !LINUXBOOT_BUILD_INITRAMFS</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endif</span><br><span>diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile</span><br><span>index 2390ba8..352c271 100644</span><br><span>--- a/payloads/external/LinuxBoot/Makefile</span><br><span>+++ b/payloads/external/LinuxBoot/Makefile</span><br><span>@@ -42,7 +42,7 @@</span><br><span> </span><br><span> OBJCOPY:=$(LINUXBOOT_COMPILE)objcopy</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-all: payload</span><br><span style="color: hsl(120, 100%, 40%);">+all: linuxboot</span><br><span> </span><br><span> toolchain:</span><br><span>   if [[ ! -x "$(LINUXBOOT_COMPILE)gcc" ]]; then \</span><br><span>@@ -104,7 +104,7 @@</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 $(PWD)/$(CONFIG_PAYLOAD_USERSPACE)</span><br><span style="color: hsl(120, 100%, 40%);">+linuxboot: $(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></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29448">change 29448</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/29448"/><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: I648fb2e0383d20b0e4d50e416af637ea07d1efb4 </div>
<div style="display:none"> Gerrit-Change-Number: 29448 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marcello Sylvester Bauer <info@marcellobauer.com> </div>