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 B523BC433EF for ; Tue, 31 May 2022 16:17:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6751C842A6; Tue, 31 May 2022 18:17:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 8AEB2842A6; Tue, 31 May 2022 18:17:23 +0200 (CEST) Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) (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 F181283F40 for ; Tue, 31 May 2022 18:17:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f42.google.com with SMTP id u8so4080188qvj.2 for ; Tue, 31 May 2022 09:17:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DamXP6esprIG4c2t5Tcgb934U+G7EEs6k0Q6Ct4L/LU=; b=GdE4aXMFsGQg+m4o4JMfdHiR0NjeoVIzbjsaG6863BBdf7U+XyZ9UdaYaJ/EwX3Djx A82KaTab97etaex2OedDRrw5us0m+wPhrES2mS/5m4qa1BKiP/KA8B+g+qwPGpohLyjd 8WJMhBbI9D7PvCn03Qc5piqbsOWnfhe47oyr7JuoIkPEu6CUpsxviSudhfenEI7r0X30 n8CRuZOCGmOEU/JAi1iO2ZYurksame5mHpei7VxYrIuLUx3ogA7eeUy1lxyuAxsMudWa mY2Wxbqnp03CwkKApicZ8eGUD2Dt/WalkvDaYnkaKGmvf/moJD/8aSj9P+IVMcp6SkGM ZpwQ== X-Gm-Message-State: AOAM531aabaE+YOjNM6vCV1SRibBhJVEw7fwituSESyRCP3tZlefqu3+ A+/yQRAARHV/TaIu1O4HJ5xk+ZJ9zw== X-Google-Smtp-Source: ABdhPJw75U2T/yk0nNZcu5CJj2cA7A7ovly3lK+PJT+hlv2LwZW0UT4jjApi06X5nEzgagw5y4LZXw== X-Received: by 2002:a05:6214:2a87:b0:464:5b2f:7dd1 with SMTP id jr7-20020a0562142a8700b004645b2f7dd1mr5822853qvb.7.1654013838503; Tue, 31 May 2022 09:17:18 -0700 (PDT) Received: from localhost.localdomain (2603-6081-7b00-25fd-0000-0000-0000-1003.res6.spectrum.com. [2603:6081:7b00:25fd::1003]) by smtp.gmail.com with ESMTPSA id a85-20020ae9e858000000b0069fc13ce257sm9501847qkg.136.2022.05.31.09.17.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 09:17:18 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 2/3] spl: Rework Kconfig to be more menu driven Date: Tue, 31 May 2022 12:17:04 -0400 Message-Id: <20220531161705.717658-3-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220531161705.717658-1-trini@konsulko.com> References: <20220531161705.717658-1-trini@konsulko.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.5 at phobos.denx.de X-Virus-Status: Clean Make it so that all of SPL, TPL and VPL are proper menus hidden behind a gating question. Signed-off-by: Tom Rini --- common/spl/Kconfig | 54 +++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 25078432a7ed..9952a9b94c18 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1,5 +1,3 @@ -menu "SPL / TPL / VPL" - config SUPPORT_SPL bool @@ -13,15 +11,16 @@ config SPL_DFU_NO_RESET bool config SPL - bool + bool "Enable SPL" depends on SUPPORT_SPL - prompt "Enable SPL" help If you want to build SPL as well as the normal image, say Y. +menu "SPL configuration options" + depends on SPL + config SPL_FRAMEWORK bool "Support SPL based upon the common SPL framework" - depends on SPL default y help Enable the SPL framework under common/spl/. This framework @@ -39,7 +38,6 @@ config SPL_FRAMEWORK_BOARD_INIT_F config SPL_SIZE_LIMIT hex "Maximum size of SPL image" - depends on SPL default 0x11000 if ARCH_MX6 && !MX6_OCRAM_256KB default 0x31000 if ARCH_MX6 && MX6_OCRAM_256KB default 0x0 @@ -122,7 +120,7 @@ config SPL_BSS_START_ADDR choice prompt "Enforce SPL BSS limit" - depends on SPL && !PPC + depends on !PPC default SPL_BSS_LIMIT help In some platforms we only want to enforce a limit on the size of the @@ -203,7 +201,7 @@ source "common/spl/Kconfig.nxp" config HANDOFF bool "Pass hand-off information from SPL to U-Boot proper" - depends on SPL && BLOBLIST + depends on BLOBLIST help It is useful to be able to pass information from SPL to U-Boot proper to preserve state that is known in SPL and is needed in U-Boot. @@ -211,8 +209,6 @@ config HANDOFF in boot. It is available in gd->handoff. The state state is set up in SPL (or TPL if that is being used). -if SPL - config SPL_HANDOFF bool "Pass hand-off information from SPL to U-Boot proper" depends on HANDOFF && SPL_BLOBLIST @@ -300,8 +296,7 @@ config SPL_LEGACY_IMAGE_CRC_CHECK are correct, without further integrity checks. config SPL_SYS_MALLOC_SIMPLE - bool - prompt "Only use malloc_simple functions in the SPL" + bool "Only use malloc_simple functions in the SPL" help Say Y here to only use the *_simple malloc functions from malloc_simple.c, rather then using the versions from dlmalloc.c; @@ -1020,7 +1015,6 @@ config SPL_NOR_SUPPORT config SPL_XIP_SUPPORT bool "Support XIP" - depends on SPL help Enable support for execute in place of U-Boot or kernel image. There is no need to copy image from flash to ram if flash supports execute @@ -1131,7 +1125,6 @@ config SPL_POST_MEM_SUPPORT config SPL_DM_RESET bool "Support reset drivers" - depends on SPL help Enable support for reset control in SPL. That can be useful in SPL to handle IP reset in driver, as in U-Boot, @@ -1472,35 +1465,32 @@ config SPL_TARGET On some platforms we need to have 'make' run additional build target rules. If required on your platform, enter it here, otherwise leave blank. + +config SPL_AT91_MCK_BYPASS + bool "Use external clock signal as a source of main clock for AT91 platforms" + depends on ARCH_AT91 + help + Use external 8 to 24 Mhz clock signal as source of main clock instead + of an external crystal oscillator. + This option disables the internal driving on the XOUT pin. + The external source has to provide a stable clock on the XIN pin. + If this option is disabled, the SoC expects a crystal oscillator + that needs driving on both XIN and XOUT lines. +endmenu + config TPL - bool depends on SUPPORT_TPL - prompt "Enable TPL" + bool "Enable TPL" help If you want to build TPL as well as the normal image and SPL, say Y. source "common/spl/Kconfig.tpl" config VPL - bool depends on SUPPORT_SPL - prompt "Enable VPL" + bool "Enable VPL" help If you want to build VPL as well as the normal image, TPL and SPL, say Y. source "common/spl/Kconfig.vpl" - -config SPL_AT91_MCK_BYPASS - bool "Use external clock signal as a source of main clock for AT91 platforms" - depends on ARCH_AT91 - help - Use external 8 to 24 Mhz clock signal as source of main clock instead - of an external crystal oscillator. - This option disables the internal driving on the XOUT pin. - The external source has to provide a stable clock on the XIN pin. - If this option is disabled, the SoC expects a crystal oscillator - that needs driving on both XIN and XOUT lines. - -endif # SPL -endmenu -- 2.25.1