summaryrefslogtreecommitdiff
path: root/util/abuild
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2018-05-07 21:44:37 -0500
committerPatrick Georgi <pgeorgi@google.com>2018-05-17 12:06:33 +0000
commit735b9a0d1cc4b27647971cff96ad1270200e3cde (patch)
tree0b864e3f1598c1fa73480790e3b4e3bbcd19a24d /util/abuild
parentb77cbbe1b0b4448ca9d493cd71b8eeffcd5be499 (diff)
util/abuild: Disable unspecified payload options
We have two payload options in abuild: "None" or a pointer to an elf file. This disables all other options in abuild, and makes disabling the other options common to both valid options. Change-Id: Icbd6fde4343ac1cff05778131f9e54370baf4224 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/26162 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Diffstat (limited to 'util/abuild')
-rwxr-xr-xutil/abuild/abuild26
1 files changed, 17 insertions, 9 deletions
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 91c5bf9f1e..d8f4882bbc 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -250,24 +250,32 @@ function update_config
if [ "$PAYLOAD" = "none" ]; then
{
echo "CONFIG_PAYLOAD_NONE=y"
- echo "# CONFIG_PAYLOAD_SEABIOS is not set"
echo "# CONFIG_PAYLOAD_ELF is not set"
- echo "# CONFIG_PAYLOAD_BAYOU is not set"
- echo "# CONFIG_PAYLOAD_FILO is not set"
- echo "# CONFIG_PAYLOAD_GRUB2 is not set"
- echo "# CONFIG_PAYLOAD_OPENBIOS is not set"
- echo "# CONFIG_PAYLOAD_DEPTHCHARGE is not set"
- echo "# CONFIG_PAYLOAD_UBOOT is not set"
- echo "# CONFIG_PAYLOAD_TIANOCORE is not set"
} >> "${config_file}"
elif [ "$PAYLOAD" != "/dev/null" ]; then
{
echo "# CONFIG_PAYLOAD_NONE is not set"
- echo "# CONFIG_PAYLOAD_SEABIOS is not set"
echo "CONFIG_PAYLOAD_ELF=y"
echo "CONFIG_PAYLOAD_FILE=\"$PAYLOAD\""
} >> "${config_file}"
fi
+ # Disable all other payload config options
+ {
+ echo "# CONFIG_PAYLOAD_SEABIOS is not set"
+ echo "# CONFIG_PAYLOAD_BAYOU is not set"
+ echo "# CONFIG_PAYLOAD_FILO is not set"
+ echo "# CONFIG_PAYLOAD_GRUB2 is not set"
+ echo "# CONFIG_PAYLOAD_OPENBIOS is not set"
+ echo "# CONFIG_PAYLOAD_DEPTHCHARGE is not set"
+ echo "# CONFIG_PAYLOAD_UBOOT is not set"
+ echo "# CONFIG_PAYLOAD_TIANOCORE is not set"
+ echo "# CONFIG_PXE is not set"
+ echo "# CONFIG_BUILD_IPXE is not set"
+ echo "# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set"
+ echo "# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set"
+ echo "# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set"
+ echo "# CONFIG_TINT_SECONDARY_PAYLOAD is not set"
+ } >> "${config_file}"
if [ "$quiet" == "false" ]; then echo " $MAINBOARD ($customizing)"; fi
# shellcheck disable=SC2059