From 103e8207f04d35207d3dc8c2e3e1727f08225dd5 Mon Sep 17 00:00:00 2001
From: Nico Huber <nico.h@gmx.de>
Date: Sat, 20 May 2017 21:04:15 +0200
Subject: [PATCH] UPSTREAM: payloads/Kconfig: Add NO_DEFAULT_PAYLOAD

This symbol can be selected (e.g. in site-local/) to disable the user
friendly but annoying default payload choice.

BUG=none
BRANCH=none
TEST=none

Change-Id: I7b2d825a5af5b22f5c1182933ef76049344a85ce
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 9121a364a6d510eefa185df1458e7dacf24057b5
Original-Change-Id: I2f72d4efc0a428dce377c3d003b2c00a6c8d4c08
Original-Signed-off-by: Nico Huber <nico.h@gmx.de>
Original-Reviewed-on: https://review.coreboot.org/19808
Original-Reviewed-by: Philippe Mathieu-Daud <philippe.mathieu.daude@gmail.com>
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://chromium-review.googlesource.com/528260
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
---
 payloads/Kconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/payloads/Kconfig b/payloads/Kconfig
index 77006311d1..bb9348b7d7 100644
--- a/payloads/Kconfig
+++ b/payloads/Kconfig
@@ -1,8 +1,11 @@
 menu "Payload"
 
+config NO_DEFAULT_PAYLOAD
+	bool
+
 choice
 	prompt "Add a payload"
-	default PAYLOAD_NONE if !ARCH_X86
+	default PAYLOAD_NONE if NO_DEFAULT_PAYLOAD || !ARCH_X86
 	default PAYLOAD_SEABIOS if ARCH_X86
 
 config PAYLOAD_NONE