From patchwork Sun Jul 21 02:51:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1134503 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="jFnK7uSA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45rrbk1vyCz9sBF for ; Sun, 21 Jul 2019 13:59:46 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B88E1C21F4A; Sun, 21 Jul 2019 03:59:44 +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=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 AE910C21E62; Sun, 21 Jul 2019 02:55:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B1A4FC21C38; Sun, 21 Jul 2019 02:55:13 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id 80702C21C38 for ; Sun, 21 Jul 2019 02:52:32 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id q22so66535426iog.4 for ; Sat, 20 Jul 2019 19:52:32 -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=hf+JI1amriAccM0PB7NjNKxgUnN5st9LoWu/oUtEc18=; b=jFnK7uSASU0Kajop8xsq1cRY8ajLQxji9Y9tILezyp5P6L5YvEq89o3D0aTGaZyi+N u/6U3y0PRjfI3bgCsqbmwHI/gY6AiieJO878mLolWaKsFjPHgQOXKz6ocyXq1P67bzON ToiE48zpz1L8VkndZsXEnE12+7Uf8zGYh1HQE= 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=hf+JI1amriAccM0PB7NjNKxgUnN5st9LoWu/oUtEc18=; b=mF51AN/SkN4Wvz8P6DdrGOBTGyzJb/i8YYRUj5+CA8Zfu8FrWMpyooojmi4Ev81CsJ z8djcl7zJOGWP8OgunQAYT5j1yYIIc6UkH/tE9krElMoXZuJkBzn/dq8qvkLtVI3C6Pv QA77BS5VxYQ+aVLDFy7wsBlR7DHD6jcXAA7Wqeo/ZigYYwCDmf47fm0uD1cdlnUCRI2Y TToRsXcKkC1YRpsMV2cwy8u1seLWeE3fgUeTGjJEV9oQlJUKjXOtEkNjrpNNFlszoi24 MBCGxYUX6zPV7w3Xse0MpYo9SGtbNPjq0uImhH2Fv49VKks/2F+Z7shHuW2SzM2qW7I3 a1kg== X-Gm-Message-State: APjAAAXchFWdCBMAy+2tQYhhc31XsvhL8IMcNZfZC/bAqf+UoAi17AWC 9IbMEUSZpWliVOBko8RMdv72cML1llI= X-Google-Smtp-Source: APXvYqwRX03A0M9neOlIOPqilNisLEydmXQBlDZIx0jLUdx7mT7KcfH8g7vbdLXTLKFcayrlsBbrxg== X-Received: by 2002:a02:c9d8:: with SMTP id c24mr10668443jap.38.1563677551365; Sat, 20 Jul 2019 19:52:31 -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.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 20 Jul 2019 19:52:31 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 20 Jul 2019 20:51:24 -0600 Message-Id: <20190721025128.30351-15-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 14/18] autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT 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" Rename this option to CONFIG_AUTOBOOT_MENU_SHOW this it relates to the autoboot functionality. Signed-off-by: Simon Glass --- Changes in v2: None cmd/bootmenu.c | 2 +- common/autoboot.c | 2 +- doc/README.bootmenu | 2 +- doc/README.menu | 2 +- include/configs/nokia_rx51.h | 2 +- include/configs/vexpress_aemv8a.h | 2 +- include/menu.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index 7f88c1ed63..0ae9d5a681 100644 --- a/cmd/bootmenu.c +++ b/cmd/bootmenu.c @@ -472,7 +472,7 @@ void menu_display_statusline(struct menu *m) puts(ANSI_CLEAR_LINE); } -#ifdef CONFIG_MENU_SHOW +#ifdef CONFIG_AUTOBOOT_MENU_SHOW int menu_show(int bootdelay) { bootmenu_show(bootdelay); diff --git a/common/autoboot.c b/common/autoboot.c index 9752470873..a38527ff96 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -324,7 +324,7 @@ const char *bootdelay_process(void) debug("### main_loop entered: bootdelay=%d\n\n", bootdelay); -#if defined(CONFIG_MENU_SHOW) +#if defined(CONFIG_AUTOBOOT_MENU_SHOW) bootdelay = menu_show(bootdelay); #endif bootretry_init_cmd_timeout(); diff --git a/doc/README.bootmenu b/doc/README.bootmenu index 34ff8d5ecc..ca5099089e 100644 --- a/doc/README.bootmenu +++ b/doc/README.bootmenu @@ -91,7 +91,7 @@ To run the bootmenu at startup add these additional definitions: #define CONFIG_AUTOBOOT_KEYED #define CONFIG_BOOTDELAY 30 - #define CONFIG_MENU_SHOW + #define CONFIG_AUTOBOOT_MENU_SHOW When you intend to use the bootmenu on color frame buffer console, make sure to additionally define CONFIG_CFB_CONSOLE_ANSI in the diff --git a/doc/README.menu b/doc/README.menu index 450c6a83a7..0f3d741605 100644 --- a/doc/README.menu +++ b/doc/README.menu @@ -14,7 +14,7 @@ Menus are composed of items. Each item has a key used to identify it in the menu, and an opaque pointer to data controlled by the consumer. If you want to show a menu, instead starting the shell, define -CONFIG_MENU_SHOW. You have to code the int menu_show(int bootdelay) +CONFIG_AUTOBOOT_MENU_SHOW. You have to code the int menu_show(int bootdelay) function, which handle your menu. This function returns the remaining bootdelay. diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index f47d088303..b251061e30 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -270,7 +270,7 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo" -#define CONFIG_MENU_SHOW +#define CONFIG_AUTOBOOT_MENU_SHOW /* * Miscellaneous configurable options diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 2354f4e958..2b1269de83 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -110,7 +110,7 @@ #define CONFIG_PL011_CLOCK 24000000 #endif -/*#define CONFIG_MENU_SHOW*/ +/*#define CONFIG_AUTOBOOT_MENU_SHOW*/ /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/menu.h b/include/menu.h index fbff429c89..8fd7b0a1f0 100644 --- a/include/menu.h +++ b/include/menu.h @@ -19,7 +19,7 @@ int menu_destroy(struct menu *m); void menu_display_statusline(struct menu *m); int menu_default_choice(struct menu *m, void **choice); -#if defined(CONFIG_MENU_SHOW) +#if defined(CONFIG_AUTOBOOT_MENU_SHOW) int menu_show(int bootdelay); #endif #endif /* __MENU_H__ */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8773169c8b..780520d584 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -96,6 +96,7 @@ CONFIG_ATMEL_LEGACY CONFIG_ATMEL_MCI_8BIT CONFIG_ATMEL_SPI0 CONFIG_AT_TRANS +CONFIG_AUTOBOOT_MENU_SHOW CONFIG_AUTO_ZRELADDR CONFIG_BACKSIDE_L2_CACHE CONFIG_BAT_PAIR @@ -1141,7 +1142,6 @@ CONFIG_MEMSIZE_MASK CONFIG_MEM_HOLE_16M CONFIG_MEM_INIT_VALUE CONFIG_MEM_REMAP -CONFIG_MENU_SHOW CONFIG_MFG_ENV_SETTINGS CONFIG_MIIM_ADDRESS CONFIG_MII_DEFAULT_TSEC