From patchwork Fri Sep 11 02:21:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1362192 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=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=Y+dwrOi3; 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 4Bnfh22PQ8z9sTS for ; Fri, 11 Sep 2020 12:23:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B2328822FB; Fri, 11 Sep 2020 04:21:55 +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="Y+dwrOi3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0C15782314; Fri, 11 Sep 2020 04:21:49 +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-il1-x143.google.com (mail-il1-x143.google.com [IPv6:2607:f8b0:4864:20::143]) (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 E1D8F822F8 for ; Fri, 11 Sep 2020 04:21:42 +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-il1-x143.google.com with SMTP id a8so7711649ilk.1 for ; Thu, 10 Sep 2020 19:21:42 -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=EDP/CnNROB76eWhkvt4r96oIZ3yE5XXXYRdM2+8+pJU=; b=Y+dwrOi37ceRvNinEmXtekZ0ykOcMizOTaeFHPyN/w8z853WT2hAo6rMGXZIdPbRfY l4dXpEmvOYZTPYIE6/k9UOQrdkgaDBGbvS/AWfuQi7tlhxX3SdI477niMe0RG+d4ag4C GvbJpj2T8JXWO2FA4xUObhsoK/4hcHlvAsGjw= 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=EDP/CnNROB76eWhkvt4r96oIZ3yE5XXXYRdM2+8+pJU=; b=PbscxAVF9HSm4Xu7I5bSuQ29KUxJbSvmzzzi8G4nhxNavmoaDrQCjC5g3xrE9Ek1BI vXUIFs2VRBKHYMxQY1C6vzVIOKNjOiDY16pUu8KlVFlUIn1CIcLgN9p7TqV+g4slShSS Jlefqm+oB9jInDXO3GDYLGPB4SRjZoYHGAohjk0GEf4/SozLqlCmV7ogW6iWM0pJHI0A oRzJ06A6Vl8jBNnpkoHkKToBjr3jnT5Kw3+SDEvI1HWl9o5RE+LO64f6uyie5lFuTor0 2s7z+sNJCz6Bf2oA0hCp41aJIZrfZMAB0nsrYzp2bjdlECUdcv26NGOUdZhgDrfCQUqe x3jA== X-Gm-Message-State: AOAM533uCdlYlKwJCEl3bqQS8eFB03HitCxr67abPuR/cWtnLuVblWQT LDWbRX5OvK0H2ZAvaeHeO01wkvxgIxUaBXZR X-Google-Smtp-Source: ABdhPJwheCmlstoMQGWsYPq5uIlo4CNgkLZhoyb/cAvae31PPiGbtao98vqM41JpEDEaHtDE4owmOw== X-Received: by 2002:a92:7307:: with SMTP id o7mr10826476ilc.226.1599790901565; Thu, 10 Sep 2020 19:21:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 19:21:41 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Masahiro Yamada , Marek Vasut , Tom Rini , Simon Glass , Heinrich Schuchardt , Jagan Teki , Kever Yang , Usama Arif Subject: [PATCH 07/16] Kconfig: Move misc boot options under 'boot options' Date: Thu, 10 Sep 2020 20:21:18 -0600 Message-Id: <20200910202100.7.I66182b70b400456b76d1f7a5db84f1947e4a265e@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 There are a number of miscellaneous boot images at the top level of the kconfig menu. Move these into the 'boot options' menu. Signed-off-by: Simon Glass --- common/Kconfig | 53 --------------------------------------------- common/Kconfig.boot | 53 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index cf492af3ff5..703505b0818 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1,58 +1,5 @@ source "common/Kconfig.boot" -config USE_BOOTARGS - bool "Enable boot arguments" - help - Provide boot arguments to bootm command. Boot arguments are specified - in CONFIG_BOOTARGS option. Enable this option to be able to specify - CONFIG_BOOTARGS string. If this option is disabled, CONFIG_BOOTARGS - will be undefined and won't take any space in U-Boot image. - -config BOOTARGS - string "Boot arguments" - depends on USE_BOOTARGS - help - This can be used to pass arguments to the bootm command. The value of - CONFIG_BOOTARGS goes into the environment value "bootargs". Note that - this value will also override the "chosen" node in FDT blob. - -config USE_BOOTCOMMAND - bool "Enable a default value for bootcmd" - help - Provide a default value for the bootcmd entry in the environment. If - autoboot is enabled this is what will be run automatically. Enable - this option to be able to specify CONFIG_BOOTCOMMAND as a string. If - this option is disabled, CONFIG_BOOTCOMMAND will be undefined and - won't take any space in U-Boot image. - -config BOOTCOMMAND - string "bootcmd value" - depends on USE_BOOTCOMMAND - default "run distro_bootcmd" if DISTRO_DEFAULTS - help - This is the string of commands that will be used as bootcmd and if - AUTOBOOT is set, automatically run. - -config USE_PREBOOT - bool "Enable preboot" - default "usb start" if USB_KEYBOARD - help - When this option is enabled, the existence of the environment - variable "preboot" will be checked immediately before starting the - CONFIG_BOOTDELAY countdown and/or running the auto-boot command resp. - entering interactive mode. - - This feature is especially useful when "preboot" is automatically - generated or modified. For example, the boot code can modify the - "preboot" when a user holds down a certain combination of keys. - -config PREBOOT - string "preboot default value" - depends on USE_PREBOOT - default "" - help - This is the default of "preboot" environment variable. - menu "Console" config MENU diff --git a/common/Kconfig.boot b/common/Kconfig.boot index e93475f1e42..297595bf8f4 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -825,4 +825,57 @@ config AUTOBOOT_MENU_SHOW endmenu +config USE_BOOTARGS + bool "Enable boot arguments" + help + Provide boot arguments to bootm command. Boot arguments are specified + in CONFIG_BOOTARGS option. Enable this option to be able to specify + CONFIG_BOOTARGS string. If this option is disabled, CONFIG_BOOTARGS + will be undefined and won't take any space in U-Boot image. + +config BOOTARGS + string "Boot arguments" + depends on USE_BOOTARGS + help + This can be used to pass arguments to the bootm command. The value of + CONFIG_BOOTARGS goes into the environment value "bootargs". Note that + this value will also override the "chosen" node in FDT blob. + +config USE_BOOTCOMMAND + bool "Enable a default value for bootcmd" + help + Provide a default value for the bootcmd entry in the environment. If + autoboot is enabled this is what will be run automatically. Enable + this option to be able to specify CONFIG_BOOTCOMMAND as a string. If + this option is disabled, CONFIG_BOOTCOMMAND will be undefined and + won't take any space in U-Boot image. + +config BOOTCOMMAND + string "bootcmd value" + depends on USE_BOOTCOMMAND + default "run distro_bootcmd" if DISTRO_DEFAULTS + help + This is the string of commands that will be used as bootcmd and if + AUTOBOOT is set, automatically run. + +config USE_PREBOOT + bool "Enable preboot" + default "usb start" if USB_KEYBOARD + help + When this option is enabled, the existence of the environment + variable "preboot" will be checked immediately before starting the + CONFIG_BOOTDELAY countdown and/or running the auto-boot command resp. + entering interactive mode. + + This feature is especially useful when "preboot" is automatically + generated or modified. For example, the boot code can modify the + "preboot" when a user holds down a certain combination of keys. + +config PREBOOT + string "preboot default value" + depends on USE_PREBOOT + default "" + help + This is the default of "preboot" environment variable. + endmenu # Booting