From patchwork Mon Oct 26 08:31:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick DELAUNAY X-Patchwork-Id: 1387522 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=st.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=st.com header.i=@st.com header.a=rsa-sha256 header.s=STMicroelectronics header.b=W4+T4bL6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CKSkM0l5Kz9sSn for ; Mon, 26 Oct 2020 19:32:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9E5C28248E; Mon, 26 Oct 2020 09:31:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=st.com header.i=@st.com header.b="W4+T4bL6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 657D082487; Mon, 26 Oct 2020 09:31:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) (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 D8DD08247D for ; Mon, 26 Oct 2020 09:31:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=patrick.delaunay@st.com Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09Q8Qg0b032173; Mon, 26 Oct 2020 09:31:48 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=STMicroelectronics; bh=K5IHezR7jJOXoWqMbv4EqSkPe5Fmo2YjEDUCkaglXtQ=; b=W4+T4bL6wFEEfjmLNsUhm/0TV0S2b9oBU0zNSGJJi2QSdPpBRlKjDG5ltGc51RvBjl09 etKccYHGWv5lczEbX/TQurTfWhQD7iV67XOugvaXTMyclPBHeLtRRn20qe5bShxNiAws 9m+WuinbcIeGi5V9KPxBTYkSH7p51B4cx033s2ITH/jikH5ERlAYfj4JHnwx0yriRvSg S3/AQppz9ONZ7Gr9VJZSBYbL4+C4FyRg7uP2GlOUk8Ep39f8o4tZHjRuzcWdK9Nt/KpH qtqMYXwNnfSqIHtTawJXAkm2QSMTEbt7pQ8w6xKVuBomOOIf6mYQUaDMALVAJ26t2Qo2 yg== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 34ccf3ah6c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Oct 2020 09:31:48 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 515D6100034; Mon, 26 Oct 2020 09:31:47 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node3.st.com [10.75.127.6]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 2B0002B0B99; Mon, 26 Oct 2020 09:31:47 +0100 (CET) Received: from localhost (10.75.127.50) by SFHDAG2NODE3.st.com (10.75.127.6) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 26 Oct 2020 09:31:46 +0100 From: Patrick Delaunay To: CC: Patrick Delaunay , Adam Ford , =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= , Heinrich Schuchardt , Holger Brunck , Marek Vasut , Masahiro Yamada , Miquel Raynal , Philippe Reynes , Ramon Fried , Sam Protsenko , Simon Glass , Thomas Hebb , U-Boot STM32 Subject: [PATCH 2/2] cmd: Kconfig: migrate CONFIG_SYS_PROMPT_HUSH_PS2 Date: Mon, 26 Oct 2020 09:31:42 +0100 Message-ID: <20201026083142.6395-2-patrick.delaunay@st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201026083142.6395-1-patrick.delaunay@st.com> References: <20201026083142.6395-1-patrick.delaunay@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.50] X-ClientProxiedBy: SFHDAG7NODE2.st.com (10.75.127.20) To SFHDAG2NODE3.st.com (10.75.127.6) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.737 definitions=2020-10-26_04:2020-10-26, 2020-10-26 signatures=0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Move CONFIG_SYS_PROMPT_HUSH_PS2 in Kconfig, depending on CONFIG_HUSH_PARSER, and remove the default value defined in cli_hush.c under __U_BOOT__. Signed-off-by: Patrick Delaunay Reviewed-by: Simon Glass --- README | 7 ------- cmd/Kconfig | 9 +++++++++ common/cli_hush.c | 3 --- scripts/config_whitelist.txt | 1 - 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/README b/README index df824b67e7..8338e5ec21 100644 --- a/README +++ b/README @@ -1927,13 +1927,6 @@ The following options need to be configured: try longer timeout such as #define CONFIG_NFS_TIMEOUT 10000UL -- Command Interpreter: - CONFIG_SYS_PROMPT_HUSH_PS2 - - This defines the secondary prompt string, which is - printed when the command interpreter needs more input - to complete a command. Usually "> ". - Note: In the current implementation, the local variables diff --git a/cmd/Kconfig b/cmd/Kconfig index a3166e4f31..2c427d77b8 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -55,6 +55,15 @@ config SYS_PROMPT This string is displayed in the command line to the left of the cursor. +config SYS_PROMPT_HUSH_PS2 + string "Hush shell secondary prompt" + depends on HUSH_PARSER + default "> " + help + This defines the secondary prompt string, which is + printed when the command interpreter needs more input + to complete a command. Usually "> ". + config SYS_XTRACE string "Command execution tracer" depends on CMDLINE diff --git a/common/cli_hush.c b/common/cli_hush.c index 5b1f119074..79664aad58 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -84,9 +84,6 @@ #include #include #include /* find_cmd */ -#ifndef CONFIG_SYS_PROMPT_HUSH_PS2 -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#endif #endif #ifndef __U_BOOT__ #include /* isalpha, isdigit */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index dc4f0b050c..7b5093fbfd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3512,7 +3512,6 @@ CONFIG_SYS_POST_WATCHDOG CONFIG_SYS_POST_WORD_ADDR CONFIG_SYS_PPC_DDR_WIMGE CONFIG_SYS_PQSPAR -CONFIG_SYS_PROMPT_HUSH_PS2 CONFIG_SYS_PSDPAR CONFIG_SYS_PSSR_VAL CONFIG_SYS_PTCPAR