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 356E2C77B7F for ; Fri, 12 May 2023 20:09:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5FC478637C; Fri, 12 May 2023 22:07:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.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=amarulasolutions.com header.i=@amarulasolutions.com header.b="HjSQzabJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8A2E486371; Fri, 12 May 2023 22:07:29 +0200 (CEST) Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 93BFE86339 for ; Fri, 12 May 2023 22:06:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=francis.laniel@amarulasolutions.com Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f450815d02so26840605e9.0 for ; Fri, 12 May 2023 13:06:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1683921995; x=1686513995; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4mMBcLI17DWdv7vW0zXmSuP3V249TZ1G7pTPuMnX3Jw=; b=HjSQzabJpddVkwpvVtZ0fUs1mcWzgKI1/9ne6VaqHQQcH1VKnsy4JLnW7kBqPv5/+7 prDPIHcat3iI2GHlccDtB2ThtsGL/TNboMaFiUOX/j3hz2AV5Y15j9OQCzhWGgFZQ9dv EEuzGAcTNEuUEEib2EtNLhHnXebT/ZxUyG06c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683921995; x=1686513995; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4mMBcLI17DWdv7vW0zXmSuP3V249TZ1G7pTPuMnX3Jw=; b=QT2/Hz5psvFk4sLReDYulD3mlbVNhtdDrDT1b88IYMTbLiej4l3S9DU1Ou/dSyPb3g ILRCW7epa7EM2k7fzjDCIo5P+EqqSxLsbed/Fa7Q49FoN2QjnlDndBOZtwXzxkktIVRI dPX5zriOcgvxBXG0aZ4rhPmYUTuK8ICgOvozlX62FXVG/D9I5gTS4QWiKAJ15V3fbBnR O0Id59QlIxOmXgTtqxXcbHujjSR0mIjoNh/f+qfrTLCkOKNuQS3l/CxZZbcT2lhSVfep 20kyqf8tLy6wYdj3Fx0oF1qiJpdiPX38C4bE0YR2fV+aQxMvV72Tn68z/u9z95s/BoeP 8VCg== X-Gm-Message-State: AC+VfDwvO35FwrXpcYRiKMXDG3kgpDW9i2fFoB/T1THP1q9L7+GdXRlC qMaGRhFlKiaMxoHb5d6RLY+p3Caj+Mb5ACGMKPo= X-Google-Smtp-Source: ACHHUZ7uhJea55R6P9H1cQpmFZ+xN1BYV3c4FvL5A+34nXLnZeGvT4eEg9ZkVTq48KO+C2tWblmdZQ== X-Received: by 2002:a05:600c:214f:b0:3f4:23b9:eed2 with SMTP id v15-20020a05600c214f00b003f423b9eed2mr13439415wml.38.1683921995110; Fri, 12 May 2023 13:06:35 -0700 (PDT) Received: from pwmachine.numericable.fr ([213.94.16.214]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003f33f8f0a05sm29565859wmi.9.2023.05.12.13.06.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 13:06:34 -0700 (PDT) From: Francis Laniel To: u-boot@lists.denx.de Cc: Michael Nazzareno Trimarchi , Tom Rini , Simon Glass , Harald Seiler , Francis Laniel , Heinrich Schuchardt , Ilias Apalodimas , Ramon Fried , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Sean Edmond , Tobias Waldekranz , Masahisa Kojima , John Keeping , Devarsh Thakkar , Nikhil M Jain , Fabrice Gasnier , Stefan Roese Subject: [RFC PATCH v8 09/23] cli: Add menu for hush parser Date: Fri, 12 May 2023 21:03:17 +0100 Message-Id: <20230512200331.51457-10-francis.laniel@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230512200331.51457-1-francis.laniel@amarulasolutions.com> References: <20230512200331.51457-1-francis.laniel@amarulasolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.8 at phobos.denx.de X-Virus-Status: Clean For the moment, the menu contains only entry: HUSH_OLD_PARSER which is the default. The goal is to prepare the field to add a new hush parser which guarantees actual behavior is still correct. Reviewed-by: Simon Glass Signed-off-by: Francis Laniel --- cmd/Kconfig | 13 +++++++++++++ common/Makefile | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 87291e2d84..2c50c9f7b5 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -23,6 +23,19 @@ config HUSH_PARSER If disabled, you get the old, much simpler behaviour with a somewhat smaller memory footprint. +menu "Hush flavor to use" + depends on HUSH_PARSER + + config HUSH_OLD_PARSER + bool "Use hush old parser" + default y + help + This option enables the old flavor of hush based on hush Busybox from + 2005. + + It is actually the default U-Boot shell when decided to use hush as shell. +endmenu + config CMDLINE_EDITING bool "Enable command line editing" depends on CMDLINE diff --git a/common/Makefile b/common/Makefile index c87bb2e78b..93d0a5a309 100644 --- a/common/Makefile +++ b/common/Makefile @@ -8,7 +8,7 @@ ifndef CONFIG_SPL_BUILD obj-y += init/ obj-y += main.o obj-y += exports.o -obj-$(CONFIG_HUSH_PARSER) += cli_hush.o +obj-$(CONFIG_HUSH_OLD_PARSER) += cli_hush.o obj-$(CONFIG_AUTOBOOT) += autoboot.o # # boards -- 2.34.1