From patchwork Sun Jul 21 02:51:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1134504 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Wjryq/vb"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45rrjV6dCQz9s3l for ; Sun, 21 Jul 2019 14:04:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CA12BC22041; Sun, 21 Jul 2019 04:04:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id EBDF9C21E6C; Sun, 21 Jul 2019 02:55:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E4255C21DA2; Sun, 21 Jul 2019 02:55:13 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id 05B14C21DA2 for ; Sun, 21 Jul 2019 02:52:35 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id s7so66445704iob.11 for ; Sat, 20 Jul 2019 19:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IzKGuoKSR8nO10TFOvnz0dtZX1EsZMzbZ4qeO3zVrbA=; b=Wjryq/vbhniWfZvJx5pUQrONHWzrkt7JZrogWCfFZDl7Tc/Fy3lSWyopTF1pymjE1b x40VIymZAbNvKVmqnlbMQa0/jPRU9pLVEuQfMWAMnJ6U8twKDOcUAZ0g4YQ9ikyYd5B2 SstjVWPqtdxwt1nKpnD6z6St/PtQ1ji0qidQk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IzKGuoKSR8nO10TFOvnz0dtZX1EsZMzbZ4qeO3zVrbA=; b=U8tmZ/TF1Q/NIHlRASgtzVbLH4WvWpsvohS32RYrhhzj4iJ/9N3fH8ewaA+xciLhIH Eri0/5cU0tCJBiel7GZryijYKS2r5PZChOn/rIdeK5Ss7cT7dHANe3MIo/8RxwmL7IhW fmbtFmYaGio/zMW6stZ6PcimVxgns8ge0yJmAOhsDjYYt40i00ZZfQaoQtWex/+4j0/O jNs1CdSgn+UA5DXOhQboGmC+CF9tbP6dLXj/iS11AcCwI1kay1GvykS5jbdDuDg3fGwd mJm529RfKPg0ka7zG1rajxGrKBPnccgZQ/4/Ii0ZW/W5RUz8Gga2X5Y+J36V1C+BpH8Y VRlA== X-Gm-Message-State: APjAAAW3sy89rrCBLwnIPR5gAG4cbIMSnDaAvSGzbiXf8mItxBLFLqmo Ipo2CDVA1ULSoQaAGsB+HIR4RrgxuHw= X-Google-Smtp-Source: APXvYqxWqpD80JVBuBLC9c97OcHfvus+vomRVG3Uwzp9oOr65UEe1SEwX05ZUtI1RYZCsNBlP57ssw== X-Received: by 2002:a5d:8890:: with SMTP id d16mr10920261ioo.274.1563677553883; Sat, 20 Jul 2019 19:52:33 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id b14sm38862696iod.33.2019.07.20.19.52.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 20 Jul 2019 19:52:33 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 20 Jul 2019 20:51:25 -0600 Message-Id: <20190721025128.30351-16-sjg@chromium.org> X-Mailer: git-send-email 2.22.0.657.g960e92d24f-goog In-Reply-To: <20190721025128.30351-1-sjg@chromium.org> References: <20190721025128.30351-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Martin Etnestad Subject: [U-Boot] [PATCH v2 15/18] Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This converts the following to Kconfig: CONFIG_AUTOBOOT_MENU_SHOW Signed-off-by: Simon Glass --- Changes in v2: None cmd/Kconfig | 8 ++++++++ configs/nokia_rx51_defconfig | 1 + include/configs/nokia_rx51.h | 2 -- include/configs/vexpress_aemv8a.h | 2 -- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index d0c43c524a..44f99817c2 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -170,6 +170,14 @@ config AUTOBOOT_MENUKEY For example, 33 means "!" in ASCII, so pressing ! at boot would take this action. +config AUTOBOOT_MENU_SHOW + bool "Show a menu on boot" + help + This enables the boot menu, controlled by environment variables + defined by the board. The menu starts after running the 'preboot' + environmnent variable (if enabled) and before handling the boot delay. + See README.bootmenu for more details. + endmenu config BUILD_BIN2C diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 5cd96017e5..ab5bb2de6f 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Nokia RX-51 # " CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_MENU_SHOW=y CONFIG_CMD_BOOTMENU=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_SAVEENV is not set diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index b251061e30..fd755bbcea 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -270,8 +270,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo" -#define CONFIG_AUTOBOOT_MENU_SHOW - /* * Miscellaneous configurable options */ diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 2b1269de83..89cd8b550a 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -110,8 +110,6 @@ #define CONFIG_PL011_CLOCK 24000000 #endif -/*#define CONFIG_AUTOBOOT_MENU_SHOW*/ - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE