<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26162">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/abuild: Disable unspecified payload options<br><br>We have two payload options in abuild:<br>"None" or a pointer to an elf file.<br><br>This disables all other options in abuild, and makes disabling the other<br>options common to both valid options.<br><br>Change-Id: Icbd6fde4343ac1cff05778131f9e54370baf4224<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M util/abuild/abuild<br>1 file changed, 17 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/26162/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/abuild/abuild b/util/abuild/abuild</span><br><span>index 91c5bf9..d8f4882 100755</span><br><span>--- a/util/abuild/abuild</span><br><span>+++ b/util/abuild/abuild</span><br><span>@@ -250,24 +250,32 @@</span><br><span>         if [ "$PAYLOAD" = "none" ]; then</span><br><span>                 {</span><br><span>                    echo "CONFIG_PAYLOAD_NONE=y"</span><br><span style="color: hsl(0, 100%, 40%);">-                  echo "# CONFIG_PAYLOAD_SEABIOS is not set"</span><br><span>                         echo "# CONFIG_PAYLOAD_ELF is not set"</span><br><span style="color: hsl(0, 100%, 40%);">-                        echo "# CONFIG_PAYLOAD_BAYOU is not set"</span><br><span style="color: hsl(0, 100%, 40%);">-                      echo "# CONFIG_PAYLOAD_FILO is not set"</span><br><span style="color: hsl(0, 100%, 40%);">-                       echo "# CONFIG_PAYLOAD_GRUB2 is not set"</span><br><span style="color: hsl(0, 100%, 40%);">-                      echo "# CONFIG_PAYLOAD_OPENBIOS is not set"</span><br><span style="color: hsl(0, 100%, 40%);">-                   echo "# CONFIG_PAYLOAD_DEPTHCHARGE is not set"</span><br><span style="color: hsl(0, 100%, 40%);">-                        echo "# CONFIG_PAYLOAD_UBOOT is not set"</span><br><span style="color: hsl(0, 100%, 40%);">-                      echo "# CONFIG_PAYLOAD_TIANOCORE is not set"</span><br><span>               } >> "${config_file}"</span><br><span>        elif [ "$PAYLOAD" != "/dev/null" ]; then</span><br><span>                 {</span><br><span>                    echo "# CONFIG_PAYLOAD_NONE is not set"</span><br><span style="color: hsl(0, 100%, 40%);">-                       echo "# CONFIG_PAYLOAD_SEABIOS is not set"</span><br><span>                         echo "CONFIG_PAYLOAD_ELF=y"</span><br><span>                        echo "CONFIG_PAYLOAD_FILE=\"$PAYLOAD\""</span><br><span>          } >> "${config_file}"</span><br><span>        fi</span><br><span style="color: hsl(120, 100%, 40%);">+    # Disable all other payload config options</span><br><span style="color: hsl(120, 100%, 40%);">+    {</span><br><span style="color: hsl(120, 100%, 40%);">+             echo "# CONFIG_PAYLOAD_SEABIOS is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+          echo "# CONFIG_PAYLOAD_BAYOU is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+            echo "# CONFIG_PAYLOAD_FILO is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+             echo "# CONFIG_PAYLOAD_GRUB2 is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+            echo "# CONFIG_PAYLOAD_OPENBIOS is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+         echo "# CONFIG_PAYLOAD_DEPTHCHARGE is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+              echo "# CONFIG_PAYLOAD_UBOOT is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+            echo "# CONFIG_PAYLOAD_TIANOCORE is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+                echo "# CONFIG_PXE is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+              echo "# CONFIG_BUILD_IPXE is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+               echo "# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+                echo "# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+               echo "# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+               echo "# CONFIG_TINT_SECONDARY_PAYLOAD is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+   } >> "${config_file}"</span><br><span> </span><br><span>    if [ "$quiet" == "false" ]; then echo "    $MAINBOARD ($customizing)"; fi</span><br><span>      # shellcheck disable=SC2059</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26162">change 26162</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/26162"/><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: Icbd6fde4343ac1cff05778131f9e54370baf4224 </div>
<div style="display:none"> Gerrit-Change-Number: 26162 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>