[coreboot-gerrit] Change in coreboot[master]: util/abuild: Disable unspecified payload options

[Martin Roth (Code Review)]

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/26162


Change subject: util/abuild: Disable unspecified payload options
......................................................................

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 at google.com>
---
M util/abuild/abuild
1 file changed, 17 insertions(+), 9 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/26162/1

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 91c5bf9..d8f4882 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -250,24 +250,32 @@
 	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

-- 
To view, visit https://review.coreboot.org/26162
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbd6fde4343ac1cff05778131f9e54370baf4224
Gerrit-Change-Number: 26162
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180508/399a7a32/attachment.html>