From patchwork Mon Dec 20 23:31:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Samuel Dionne-Riel X-Patchwork-Id: 1571318 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=dionne-riel-com.20210112.gappssmtp.com header.i=@dionne-riel-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=X8TkFSKN; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JHwpz1BFWz9sCD for ; Tue, 21 Dec 2021 10:32:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 18B1483784; Tue, 21 Dec 2021 00:32:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=dionne-riel.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=dionne-riel-com.20210112.gappssmtp.com header.i=@dionne-riel-com.20210112.gappssmtp.com header.b="X8TkFSKN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5FE1E83790; Tue, 21 Dec 2021 00:32:03 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf35.google.com (mail-qv1-xf35.google.com [IPv6:2607:f8b0:4864:20::f35]) (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 2EBFE83772 for ; Tue, 21 Dec 2021 00:32:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=dionne-riel.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@dionne-riel.com Received: by mail-qv1-xf35.google.com with SMTP id kj16so6864027qvb.2 for ; Mon, 20 Dec 2021 15:32:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dionne-riel-com.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:mime-version :content-transfer-encoding; bh=dAObn4GkGe2riyGezz5r+1rOgVSItkIJvywB3ChL47E=; b=X8TkFSKNAJSEzcizDMOTlACsXsRmk4RXg4HjOZ/2aldSlk0HfTbaNyR7fPzaTtRWwE POk+5ryyBPB2sYxbxGoDQ+EVLRbYICkgLJoJ69OkwSocIXH7F3pdgYi8OsM6N1rs1U1S yPHrx4ML5kblFNLybMZ/TCcZrMYDETfflgwSVoujYpigOP0yw2mTM4MWns1nuBqKNPGB +XD79z6xgo+TPpPJiYuF2FA1qNW3D7UjmoDR1Dyzttafu4svJJuXBVBYMtlnglF0S+6h d1Gtt95OmOde825zOJrS+sPqPhzF3TrsFn6aKPaPZ4CxQFMeKAsbjPE10jFAO9wDKAKV c7Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-transfer-encoding; bh=dAObn4GkGe2riyGezz5r+1rOgVSItkIJvywB3ChL47E=; b=vHii8b2eDo8szmJsun1w13GDCp1YsjiwX/+dvPnJIoddVrsuZNI87CtdtW4+GIOFT8 SOo4qWXr1gcFXPvTljFORjBc7SiHKV0NWWTBG6kmp+X4DzRiLlQK5gnLnqkpXzoM4ayM JDitqNLwq53TD3cEdeuqMrhCfatl9K1+zoJRwH/Z5vZ3Df3irITxTJG9+al6sWDwNxO8 qxtgc2d1j0bo0pu+NFc5pgNR2shgOPBawtuzZKboguKdIL3BnPvrshbQ86sgu8pThQKK r44x09mCDzL2pBYJ1CeQsh/hEtrDtFAzM2aO83hUG2BmsnptIT0ApVqmer9B7eZp9+I+ NGEA== X-Gm-Message-State: AOAM531+otvPmWrDLjlJ17C1lYI2uDJWqgJO2mYq57Iqh90GUr3CJ39R VmUWLTa7r7SRdmw5Yea61rB63+SEsxKB3JU8 X-Google-Smtp-Source: ABdhPJxSdUBbdOXOlSBK9nR6ke72uUkGmqw40CWutxIbFsCYiKnwUtBffiKggfBxrPKi9r9amO0+Rw== X-Received: by 2002:a05:6214:202f:: with SMTP id 15mr432310qvf.37.1640043118789; Mon, 20 Dec 2021 15:31:58 -0800 (PST) Received: from DUFFMAN (135-23-195-85.cpe.pppoe.ca. [135.23.195.85]) by smtp.gmail.com with ESMTPSA id de33sm34891qkb.5.2021.12.20.15.31.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 15:31:58 -0800 (PST) Date: Mon, 20 Dec 2021 18:31:56 -0500 From: Samuel Dionne-Riel To: Cc: "Marek =?utf-8?b?QmVow7pu?= " , Simon Glass Subject: [PATCH] cmd: env: Add `indirect` to indirectly set values Message-ID: <20211220183156.1910e71b.samuel@dionne-riel.com> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.2 at phobos.denx.de X-Virus-Status: Clean This allows an ergonomic-enough approximation of ${!variable} expansion. This could be used the following way: ``` for target in ${boot_targets}; do env indirect target_name target_name_${target} # ... done ``` Assuming `target_name_mmc0` and similar are set appropriately. A default value can be optionally provided. Note: this acts on environment variables, not hush variables. Signed-off-by: Samuel Dionne-Riel Cc: Simon Glass Cc: "Marek Behún" --- cmd/Kconfig | 4 ++++ cmd/nvedit.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index 26d5707f75..e538e69a11 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -508,6 +508,10 @@ config CMD_NVEDIT_EFI If enabled, we are allowed to set/print UEFI variables using "env" command with "-e" option without knowing details. +config CMD_NVEDIT_INDIRECT + bool "env indirect - Sets environment value from another" + default y + config CMD_NVEDIT_INFO bool "env info - print or evaluate environment information" help diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 3bb6e764c0..53e6b57b60 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -1018,6 +1018,45 @@ sep_err: } #endif +#if defined(CONFIG_CMD_NVEDIT_INDIRECT) +static int do_env_indirect(struct cmd_tbl *cmdtp, int flag, + int argc, char *const argv[]) +{ + char *to = argv[1]; + char *from = argv[2]; + char *default_value = NULL; + int ret = 0; + + if (argc < 3 || argc > 4) { + return CMD_RET_USAGE; + } + + if (argc == 4) { + default_value = argv[3]; + } + + if (env_get(from) == NULL && default_value == NULL) { + printf("## env indirect: Environment variable for (%s) does not exist.\n", from); + + return CMD_RET_FAILURE; + } + + if (env_get(from) == NULL) { + ret = env_set(to, default_value); + } + else { + ret = env_set(to, env_get(from)); + } + + if (ret == 0) { + return CMD_RET_SUCCESS; + } + else { + return CMD_RET_FAILURE; + } +} +#endif + #if defined(CONFIG_CMD_NVEDIT_INFO) /* * print_env_info - print environment information @@ -1181,6 +1220,9 @@ static struct cmd_tbl cmd_env_sub[] = { #if defined(CONFIG_CMD_IMPORTENV) U_BOOT_CMD_MKENT(import, 5, 0, do_env_import, "", ""), #endif +#if defined(CONFIG_CMD_NVEDIT_INDIRECT) + U_BOOT_CMD_MKENT(indirect, 3, 0, do_env_indirect, "", ""), +#endif #if defined(CONFIG_CMD_NVEDIT_INFO) U_BOOT_CMD_MKENT(info, 3, 0, do_env_info, "", ""), #endif @@ -1265,6 +1307,9 @@ static char env_help_text[] = #if defined(CONFIG_CMD_IMPORTENV) "env import [-d] [-t [-r] | -b | -c] addr [size] [var ...] - import environment\n" #endif +#if defined(CONFIG_CMD_NVEDIT_INDIRECT) + "env indirect [default] - sets to the value of , using [default] when unset\n" +#endif #if defined(CONFIG_CMD_NVEDIT_INFO) "env info - display environment information\n" "env info [-d] [-p] [-q] - evaluate environment information\n"