From patchwork Tue Nov 29 14:14:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 700545 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3tSltv4sX8z9t26 for ; Wed, 30 Nov 2016 01:15:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ED8C5A7593; Tue, 29 Nov 2016 15:15:12 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zH_8UvY_JmXR; Tue, 29 Nov 2016 15:15:12 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 69A8FB383E; Tue, 29 Nov 2016 15:15:12 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D2E4AB383E for ; Tue, 29 Nov 2016 15:15:08 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s2Yg3k3dyryT for ; Tue, 29 Nov 2016 15:15:08 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-yb0-f194.google.com (mail-yb0-f194.google.com [209.85.213.194]) by theia.denx.de (Postfix) with ESMTPS id 6D48CA7550 for ; Tue, 29 Nov 2016 15:15:04 +0100 (CET) Received: by mail-yb0-f194.google.com with SMTP id d59so1091070ybi.2 for ; Tue, 29 Nov 2016 06:15:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=fdvDhKHkIf2/VuX8QrCkHwk0p2Wb8drWZC2XNuXU7AE=; b=db73qFT3utqf4HyPhJ8wrcBYEc8IX9d/YP7xqg9r51iXTBw/mrkVYeKjOHge8ILejz mWexM2T6cvj7tcLCrEv/QrAwg1MeGX9gM7k+UidA8m+F/e4XOMrnpmuwn39lBL2Xc6YZ mwhXoDyiGXPwUYQtNWMoiC5MVoop/CjbHWn8F/1duVP8wCuRsVxXtHx0RiBpQ8SPEAj9 pn1pvn9qW/kXJYPHzyXuQpp+ySAxh8XZlySeCvyZ6+CDpVzsA0p88ljdRSTI/oe36G29 ofLuaAMNxpBVopOZzQuWbMy+uX7fJwHEcAqbLMmjyVq3GHzMtH/fDE2YVj18XbOqkZIX W9bA== X-Gm-Message-State: AKaTC02Zv6b4xiyL9eXmm/+tNodstwhu8z1yXtRSfHFA2z5sBkSPLvPYEnvj4zOHpiyozw== X-Received: by 10.37.75.5 with SMTP id y5mr583678yba.59.1480428903115; Tue, 29 Nov 2016 06:15:03 -0800 (PST) Received: from localhost.localdomain (cpe-75-180-228-133.ec.res.rr.com. [75.180.228.133]) by smtp.gmail.com with ESMTPSA id x132sm21652301ywc.56.2016.11.29.06.15.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Nov 2016 06:15:02 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Date: Tue, 29 Nov 2016 09:14:56 -0500 Message-Id: <1480428897-18846-1-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH 1/2] cmd: Convert CMD_BOOTMENU X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Also convert MENU while we're in here. Signed-off-by: Tom Rini --- cmd/Kconfig | 6 ++++++ common/Kconfig | 6 ++++++ configs/nokia_rx51_defconfig | 1 + include/config_distro_defaults.h | 1 - include/config_fallbacks.h | 1 - include/configs/hikey.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/thunderx_88xx.h | 3 --- include/configs/vexpress_aemv8a.h | 2 -- include/configs/xilinx_zynqmp.h | 1 - scripts/config_whitelist.txt | 1 - 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index b16c6032aa2d..3e69f9cd5a11 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -203,6 +203,12 @@ config CMD_BOOTEFI_HELLO for testing that EFI is working at a basic level, and for bringing up EFI support on a new architecture. +config CMD_BOOTMENU + bool "bootmenu" + select MENU + help + Add an ANSI terminal boot menu command. + config CMD_ELF bool "bootelf, bootvx" default y diff --git a/common/Kconfig b/common/Kconfig index 913d21a9ec58..a04ee1084fed 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -172,6 +172,12 @@ config BOOTDELAY menu "Console" +config MENU + bool + help + This is the library functionality to provide a text-based menu of + choices for the user to make choices with. + config CONSOLE_RECORD bool "Console recording" help diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index ef60fab6e794..210a9b18f475 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Nokia RX-51 # " CONFIG_AUTOBOOT_KEYED=y +CONFIG_CMD_BOOTMENU=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SAVEENV is not set diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index b5efab5c3f9c..2e24b17b84f2 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -25,7 +25,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP -#define CONFIG_MENU #define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION #define CONFIG_ISO_PARTITION diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index 2ad54b7bf661..380093218b09 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -96,7 +96,6 @@ #ifndef CONFIG_CMDLINE #undef CONFIG_CMDLINE_EDITING #undef CONFIG_SYS_LONGHELP -#undef CONFIG_MENU #endif #endif /* __CONFIG_FALLBACKS_H */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 39faf805806e..7a03d0f30a32 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -80,7 +80,6 @@ #define CONFIG_FS_EXT4 /* Command line configuration */ -#define CONFIG_MENU #define CONFIG_CMD_UNZIP #define CONFIG_CMD_ENV diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 7a407aa70a24..9b20c56d7b37 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -145,7 +145,6 @@ /* Command line configuration */ #define CONFIG_CMD_ENV -#define CONFIG_MENU #define CONFIG_CMD_PXE /* MMC */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 4d5265f5409a..5187d9367f86 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -364,7 +364,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo" -#define CONFIG_MENU #define CONFIG_MENU_SHOW /* diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 4387082b263e..a546db2eb486 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -49,9 +49,6 @@ #define CONFIG_BAUDRATE 115200 -/* Command line configuration */ -#define CONFIG_MENU - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTPATH diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 48834c2faeb2..733f01170e72 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -125,8 +125,6 @@ #define CONFIG_PL011_CLOCK 24000000 #endif -/* Command line configuration */ -#define CONFIG_MENU /*#define CONFIG_MENU_SHOW*/ #define CONFIG_CMD_UNZIP #define CONFIG_CMD_PXE diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index cbdef6eafd0c..80ab4e3cc1f6 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -82,7 +82,6 @@ /* PXE */ #define CONFIG_CMD_PXE -#define CONFIG_MENU #if defined(CONFIG_ZYNQ_SDHCI) # define CONFIG_MMC diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d0b5e7f3e4ae..2691bd6f7314 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3052,7 +3052,6 @@ CONFIG_MEM_HOLE_16M CONFIG_MEM_INIT_VALUE CONFIG_MEM_REMAP CONFIG_MEM_SIZE -CONFIG_MENU CONFIG_MENUKEY CONFIG_MENUPROMPT CONFIG_MENU_SHOW