From patchwork Fri Sep 11 02:21:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1362197 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=DMeGSOyl; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Bnfj35Mxsz9sR4 for ; Fri, 11 Sep 2020 12:24:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 05AA682363; Fri, 11 Sep 2020 04:22:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="DMeGSOyl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE51782336; Fri, 11 Sep 2020 04:21:51 +0200 (CEST) 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) (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 5853082315 for ; Fri, 11 Sep 2020 04:21:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd42.google.com with SMTP id z25so9412457iol.10 for ; Thu, 10 Sep 2020 19:21:49 -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=lGfFHTdU490DyZJvncGNfokkpeHs+b95jn+yAC6sovk=; b=DMeGSOylat8Zk5VLYo8JCTJBDkhumBNjZBc9Lja3B34DSGwn+UCIHVlW5rxm+pT/iA 6GBDl8U9STqNLguO/5HblgAl5XQl0AD0vz/4eOSk5HrSiQRR1lQEH4ltktgRTrTH11UY ZywhSO35y41r5Y1/+sARbu+luQNSbTgmNzaNM= 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=lGfFHTdU490DyZJvncGNfokkpeHs+b95jn+yAC6sovk=; b=GqJ7g9Qv55qKnHuB+78QpsGFXE/tdlmTT8B2KMbwa5+o61FwGP75GOzfkDbqM7iZQi kiGznq1cyCv2LboKiwTnyQIeTnNRrXy7RR6yuUjFNucARXiVnWS/wsu4e+s7lbrOGU7y 8OcHcB7MwEnY3CCzUFD8Zp4TISnt3WUj2f/Eqewh7K+JzakhRUdzOpogDpPB9LM40odR iKX9UyLwjl+2VPNN7ISGlWNwOLK7tDeEEYt3EkceQwYE1E9ogfndLqYlkARWy9gaRHXP iIN1dcCt/CT+4dODvZbAC7hAO4qnVOVQyRi4rnAFmSej1pVcSipkYg03qABwTq7Sg1o0 gJ2g== X-Gm-Message-State: AOAM530jYCK0IRQzGS9W40qMAowG2QcJmqqMzYTk4n3YYJt0FUiNGLq7 ZrNJqh9n4m6WWvzf5GQ6GgPfaPu8UwMN5rlO X-Google-Smtp-Source: ABdhPJw0GxFpOoB0ZVFhY0sfs0rCv3ApOMloX7NN8PdAwswHm9wtZBSkgDctQKXDEwn2xmxljg6D/g== X-Received: by 2002:a05:6602:2a4b:: with SMTP id k11mr28916iov.85.1599790908098; Thu, 10 Sep 2020 19:21:48 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id m7sm440078ili.26.2020.09.10.19.21.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 19:21:47 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Masahiro Yamada , Marek Vasut , Tom Rini , Simon Glass , Heinrich Schuchardt , Jagan Teki , Joe Hershberger , Kever Yang , Usama Arif , Wolfgang Denk Subject: [PATCH 13/16] Kconfig: Move VERSION_VARIABLE under environment Date: Thu, 10 Sep 2020 20:21:24 -0600 Message-Id: <20200910202100.13.I296ca15131beef4b1667922bfec0425407ded721@changeid> X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog In-Reply-To: <20200911022127.3451713-1-sjg@chromium.org> References: <20200911022127.3451713-1-sjg@chromium.org> MIME-Version: 1.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 This relates to the environment so should not be at the top level. Move it. Signed-off-by: Simon Glass --- common/Kconfig | 10 ---------- env/Kconfig | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index bcb3519c775..132d1051607 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -532,16 +532,6 @@ endmenu endmenu # Init options -config VERSION_VARIABLE - bool "add U-Boot environment variable vers" - default n - help - If this variable is defined, an environment variable - named "ver" is created by U-Boot showing the U-Boot - version as printed by the "version" command. - Any change to this variable will be reverted at the - next reset. - config BOUNCE_BUFFER bool "Include bounce buffer API" help diff --git a/env/Kconfig b/env/Kconfig index b59ba310ec3..02dcd98e111 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -773,4 +773,13 @@ config TPL_ENV_IS_IN_FLASH endif +config VERSION_VARIABLE + bool "Add a 'ver' environment variable with the U-Boot version" + help + If this variable is defined, an environment variable + named "ver" is created by U-Boot showing the U-Boot + version as printed by the "version" command. + Any change to this variable will be reverted at the + next reset. + endmenu