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 6817FC433EF for ; Wed, 23 Mar 2022 21:22:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EBB6183FF4; Wed, 23 Mar 2022 22:21:14 +0100 (CET) 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 8EFF383FCD; Wed, 23 Mar 2022 22:20:28 +0100 (CET) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (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 1A8AD83FCA for ; Wed, 23 Mar 2022 22:20:22 +0100 (CET) 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-qt1-f173.google.com with SMTP id 10so2331964qtz.11 for ; Wed, 23 Mar 2022 14:20:22 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vf4+rPA5slUjiR+Hv8Re9Fx+X9eMEMUwJF4r2ArM0i0=; b=Jjh15JEJ14WEz7wA8eMU5MFotoqfMZzkkIkcjFaTi7ZlsyKvBaVZGVWZ+7QpkgFmmo TbK1rAC2VtH+Qqd+zCEscZsRc+5biCBIZje7l5m/3WEpEvOUM/XQ+aCo3EUFXSyr30fy UHFahSjyJofkQvtwkYJ72eGqtVbJb/xBvrA/3ph+oNLhj0LNHwrGXifnqtK3KIgvVZnn r1LUqzznp4uWyy7wTVcezRUnu/tiIJtGtjkPgapniBA5MAMlIv1ZTtjXvz4tJSNADnVk r5hV7Yz+Ok2b63GvgtjXAFa3qQJPHQCce5dzXGygrSpfWmz3xTAKU21ofPjEcpu32Zb8 NXLQ== X-Gm-Message-State: AOAM5313x35uSQNIztIDyPB7TvGruXezCVviMoJ7p2dHNE6e3BhL9wN+ FR93c5Op2pgv6eY8YAXVJ9tb3XY9IQ== X-Google-Smtp-Source: ABdhPJxJgKuvbKlJsQma0CMDffQviwFd7FuOezdO+fzUO9eAx9WaDBBfgfXA6IPM+qZ3zR10rL71cQ== X-Received: by 2002:a05:622a:13d2:b0:2e1:eedb:c81a with SMTP id p18-20020a05622a13d200b002e1eedbc81amr1628881qtk.437.1648070420753; Wed, 23 Mar 2022 14:20:20 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id w8-20020ac87e88000000b002e1cdc11203sm868269qtj.18.2022.03.23.14.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 14:20:20 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Holger Brunck Subject: [PATCH 08/22] keymile: Move sourcing of common Kconfig Date: Wed, 23 Mar 2022 17:19:55 -0400 Message-Id: <20220323212009.1066483-8-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220323212009.1066483-1-trini@konsulko.com> References: <20220323212009.1066483-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 The way board/keymile/Kconfig is written protects the options there from being parsed on non-keymile platforms. We cannot however safely source this file from multiple locations. This does not manifest as a problem currently as there are no choice statements inside of this file (nor the sub-Kconfig files it sources). However, moving some target selection to one of these files exposes the underlying problem. Rework things so that we have this file sourced in arch/Kconfig. Cc: Holger Brunck Signed-off-by: Tom Rini --- arch/Kconfig | 2 ++ arch/arm/Kconfig | 1 - arch/arm/mach-kirkwood/Kconfig | 1 - arch/arm/mach-socfpga/Kconfig | 2 -- arch/powerpc/cpu/mpc83xx/Kconfig | 1 - arch/powerpc/cpu/mpc85xx/Kconfig | 1 - 6 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 1b35fda64cc8..1d829ddf9945 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -447,3 +447,5 @@ source "arch/sh/Kconfig" source "arch/x86/Kconfig" source "arch/xtensa/Kconfig" source "arch/riscv/Kconfig" + +source "board/keymile/Kconfig" diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 474ce4a555e4..b5ca14f041ad 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2280,7 +2280,6 @@ source "board/vscom/baltos/Kconfig" source "board/phytium/durian/Kconfig" source "board/phytium/pomelo/Kconfig" source "board/xen/xenguest_arm64/Kconfig" -source "board/keymile/Kconfig" source "arch/arm/Kconfig.debug" diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 382b8362674c..ca2da003b65b 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -131,7 +131,6 @@ source "board/cloudengines/pogo_e02/Kconfig" source "board/cloudengines/pogo_v4/Kconfig" source "board/d-link/dns325/Kconfig" source "board/iomega/iconnect/Kconfig" -source "board/keymile/Kconfig" source "board/LaCie/net2big_v2/Kconfig" source "board/LaCie/netspace_v2/Kconfig" source "board/raidsonic/ib62x0/Kconfig" diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index bddfd44427ae..78a7549a4106 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -248,6 +248,4 @@ config SYS_CONFIG_NAME default "socfpga_stratix10_socdk" if TARGET_SOCFPGA_STRATIX10_SOCDK default "socfpga_vining_fpga" if TARGET_SOCFPGA_SOFTING_VINING_FPGA -source "board/keymile/Kconfig" - endif diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index bcd837508789..52bc8cf750f8 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -200,7 +200,6 @@ config FSL_ELBC source "board/freescale/mpc837xerdb/Kconfig" source "board/ids/ids8313/Kconfig" -source "board/keymile/Kconfig" source "board/gdsys/mpc8308/Kconfig" endmenu diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 509f356e4961..6c536b3c6b2d 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -1193,7 +1193,6 @@ source "board/freescale/t104xrdb/Kconfig" source "board/freescale/t208xqds/Kconfig" source "board/freescale/t208xrdb/Kconfig" source "board/freescale/t4rdb/Kconfig" -source "board/keymile/Kconfig" source "board/socrates/Kconfig" endmenu -- 2.25.1