From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E0B15C433F5 for ; Thu, 26 May 2022 06:24:05 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 10CC9838B9; Thu, 26 May 2022 08:24:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="N6A7saf4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B3DD083EFE; Thu, 26 May 2022 08:24:01 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20629.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::629]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 63418802F4 for ; Thu, 26 May 2022 08:23:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=michals@xilinx.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IGSBA3V78ZzqWgTOni8XIPuhK4d0z6tyXmW6taxjFznfaZ+q2jzzq36v4XSSjskd+uZrRkfSZAf5bCLxDBpAhoeUoqidzRdhDd/jNqgsgoAZkmWg3ysTLMXf2XWir/RbslxQkDp8p0s8gmAcC4FIxmilepPKzU8ZcO+mgDnxkVVUJNYskqzNJXcZZFecrHqyttnyAKRNyjDnPfZZyOkLpqYG/vMGf/TgJBOJ0+faxv/nFvUGKFjWEwcAgg4fwgBFGAYusI/raSAS8pF+QQ05AoTRsVudBFaowZTy7XgYKFZuTz9oop7meMqicRjnXq+p8m9o4OL+c0W/tgVY0HGjpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e+KsCq6WNFzXLxDDpoSYMWzlhPGYeU9UJykzlv1yh2I=; b=K5NaJauHp2TehWtCAqsA5CNanqr+8pnoIPq+Oz5qGzRYsmFPZuN5m/oqQH1aH2KVTSf2+FjS2l0LTXMzS0gMFDl3UwzqE3rj5TL7L68bLm+gN8OypLBiwB4zlr7yUk1IwQkjJeipXC5ijoq6rz9YxYRVUDWjI/1gn5zPTlTjqkomdfgpXT6GYqaVGqDbWeuuDeQHVvhf4nRPLK1RidLkQuvLv7SDDyTa5b2EAm9s65/FqFJFo0zSiuSK8LHYJ4zmkLGDfMQPBSimFfRu0OhQAYaTmCdZAP6cvoQVmyPR2ZrrU3ZjarTptYc1iAYD8QQvuqrfiqaeL1CQFH5nTJvjGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=linaro.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e+KsCq6WNFzXLxDDpoSYMWzlhPGYeU9UJykzlv1yh2I=; b=N6A7saf4gnNNPiP8lAKeKfIxSk3lepbkGW/hqoSnR3t6jjlzYq/Uj57d1b8FIdjmJfAEBiq7iV+b5wOEL3R3N640pKULzwvRpPEIQNM+o7FspyEJJxaYJ0/lkybFGVlKlapJuFjRC8A6LDd5dM+1kvwL+1leFaQFtO65hhdvWxU= Received: from DM3PR14CA0131.namprd14.prod.outlook.com (2603:10b6:0:53::15) by CH2PR02MB6523.namprd02.prod.outlook.com (2603:10b6:610:34::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Thu, 26 May 2022 06:23:54 +0000 Received: from DM3NAM02FT017.eop-nam02.prod.protection.outlook.com (2603:10b6:0:53:cafe::b9) by DM3PR14CA0131.outlook.office365.com (2603:10b6:0:53::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13 via Frontend Transport; Thu, 26 May 2022 06:23:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.62.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.62.198; helo=xsj-pvapexch02.xlnx.xilinx.com; pr=C Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by DM3NAM02FT017.mail.protection.outlook.com (10.13.5.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5293.13 via Frontend Transport; Thu, 26 May 2022 06:23:54 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Wed, 25 May 2022 23:23:54 -0700 Received: from smtp.xilinx.com (172.19.127.95) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Wed, 25 May 2022 23:23:54 -0700 Envelope-to: masahisa.kojima@linaro.org, u-boot@lists.denx.de, pali@kernel.org, xypron.glpk@gmx.de, ilias.apalodimas@linaro.org, takahiro.akashi@linaro.org, mark.kettenis@xs4all.nl, sjg@chromium.org, mr.nuke.me@gmail.com, jaeckel-floss@eyet-services.de, michal.simek@amd.com, ovidiu.panait@windriver.com Received: from [10.254.241.50] (port=60146) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1nu6uX-0000lm-FT; Wed, 25 May 2022 23:23:53 -0700 Message-ID: <16aaef8d-dedc-3545-af65-b2732b36d816@xilinx.com> Date: Thu, 26 May 2022 08:23:50 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH 2/2] bootmenu: U-Boot console is enabled as default Content-Language: en-US To: Masahisa Kojima , CC: Pali Rohar , Heinrich Schuchardt , Ilias Apalodimas , Takahiro Akashi , Mark Kettenis , Simon Glass , Alexandru Gagniuc , Steffen Jaeckel , Michal Simek , Ovidiu Panait , Ashok Reddy Soma References: <20220525081813.26214-1-masahisa.kojima@linaro.org> <20220525081813.26214-3-masahisa.kojima@linaro.org> From: Michal Simek In-Reply-To: <20220525081813.26214-3-masahisa.kojima@linaro.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f696503-684d-4b4a-b44f-08da3ee04f05 X-MS-TrafficTypeDiagnostic: CH2PR02MB6523:EE_ X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B1CuEcm3QpbGicFcFiT4sD/UjY6vOQH76TkgZCqWj8t37X9ZkjbbbT6BY6MJFjGkjldanar7ScNwieywyaj1rxGi4fwG3pXJDyeqkXKlNmzrOcYwlRLQGI0GgeKxjE72dodFGKAIDy35s1kip5uBaAl7vB9uia0KWYx8cfcbBMzXIF/gYXffcuT17TZcjcJmKzC9SuIccZXiLXEYO3GeJT/Yjwvp1TknGBmjfSJJzgdHnbWJnLP4HxpSam484f+u0DrL5Gu9zjj+BrgXU8GuBwoOOTf5rmBeGm9baXb3RKwDbyKGUDvg5kBAUp6D9mvOzbp/i/ho0BM3tnhr6xc3+9kkqrZdX9pPqLAGLVadijOoRw3GPu8VjYwoOng/yXCpD3gsqUSLWQPz6wmVwildKus4Vo3FAF9nmRPL2DbG/Pi+Yr5ceAOcJveH53RwD8ZzWeS8JndNCLOZ0iDKi6zx8Liv7NbPSNRAguT6tcCmDJS+5FGbAJUarhs8BZKZxj1q7qrGfhz5nCPU5g5Feafe5Lakq3oiFQsXNB+mv5OXng1tFLp1K14oXineI9NDqxpynel7rlo/RGIyxTNYs0onXdXYCFZsnjO2AnnAOjKif1+B9fSBw4eYTBNjyaZc7G3ou6fMcJ2R/UFOjXbZULyftgsWqNBGGYOGi+02gkNj++Fe5U/ttdma7Zig2cgK8dNNOrY4LnuCpAbt65DsopKsPCXobRxqcFWG+J8DrANDHRA= X-Forefront-Antispam-Report: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch02.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(54906003)(44832011)(2906002)(82310400005)(36756003)(53546011)(47076005)(31696002)(186003)(110136005)(107886003)(31686004)(2616005)(336012)(426003)(26005)(8936002)(83380400001)(70586007)(40460700003)(70206006)(5660300002)(4326008)(9786002)(7416002)(8676002)(316002)(36860700001)(356005)(7636003)(508600001)(50156003)(43740500002); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2022 06:23:54.4779 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f696503-684d-4b4a-b44f-08da3ee04f05 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.62.198]; Helo=[xsj-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: DM3NAM02FT017.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6523 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean On 5/25/22 10:18, Masahisa Kojima wrote: > [CAUTION: External Email] > > The commit 2158b0da220c ("bootmenu: add Kconfig option > not to enter U-Boot console") disables to enter U-Boot > console from bootmenu as default, this change affects the > existing bootmenu users. > > This commit reverts the default behavior, the bootmenu can > enter U-Boot console same as before. > CMD_BOOTMENU_ENTER_UBOOT_CONSOLE is renamed > BOOTMENU_DISABLE_UBOOT_CONSOLE and depends on > AUTOBOOT_MENU_SHOW. > > Fixes: 2158b0da220c ("bootmenu: add Kconfig option not to enter U-Boot console") > Signed-off-by: Masahisa Kojima > --- > boot/Kconfig | 9 +++++++++ > cmd/Kconfig | 10 ---------- > cmd/bootmenu.c | 4 ++-- > 3 files changed, 11 insertions(+), 12 deletions(-) > > diff --git a/boot/Kconfig b/boot/Kconfig > index dff4d23b88..2eae3d5c6b 100644 > --- a/boot/Kconfig > +++ b/boot/Kconfig > @@ -1143,6 +1143,15 @@ config AUTOBOOT_MENU_SHOW > environmnent variable (if enabled) and before handling the boot delay. > See README.bootmenu for more details. > > +config BOOTMENU_DISABLE_UBOOT_CONSOLE > + bool "Disallow bootmenu to enter the U-Boot console" > + depends on AUTOBOOT_MENU_SHOW > + default n Remove this line. It is default option anyway. > + help > + If this option is enabled, user can not enter > + the U-Boot console from bootmenu. It increases > + the system security. you have 80 chars limit that's why please use it. > + > config BOOT_RETRY > bool "Boot retry feature" > help > diff --git a/cmd/Kconfig b/cmd/Kconfig > index 69c1814d24..09193b61b9 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -357,16 +357,6 @@ config CMD_BOOTMENU > help > Add an ANSI terminal boot menu command. > > -config CMD_BOOTMENU_ENTER_UBOOT_CONSOLE > - bool "Allow Bootmenu to enter the U-Boot console" > - depends on CMD_BOOTMENU > - default n > - help > - Add an entry to enter U-Boot console in bootmenu. > - If this option is disabled, user can not enter > - the U-Boot console from bootmenu. It increases > - the system security. > - > config CMD_ADTIMG > bool "adtimg" > help > diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c > index bf88c2127b..1002c6b20a 100644 > --- a/cmd/bootmenu.c > +++ b/cmd/bootmenu.c > @@ -362,7 +362,7 @@ static struct bootmenu_data *bootmenu_create(int delay) > goto cleanup; > > /* Add Quit entry if entering U-Boot console is disabled */ > - if (IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE)) > + if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE)) > entry->title = strdup("U-Boot console"); > else > entry->title = strdup("Quit"); > @@ -595,7 +595,7 @@ int menu_show(int bootdelay) > if (ret == BOOTMENU_RET_UPDATED) > continue; > > - if (!IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE)) { > + if (IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE)) { > if (ret == BOOTMENU_RET_QUIT) { > /* default boot process */ > if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) > -- > 2.17.1 > M