From mboxrd@z Thu Jan 1 00:00:00 1970 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 8C606C4332F for ; Wed, 1 Nov 2023 20:35:57 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3A7E587B73; Wed, 1 Nov 2023 21:35:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com 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=ti.com header.i=@ti.com header.b="OGjSbrgK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7F1FD87724; Wed, 1 Nov 2023 21:35:42 +0100 (CET) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3FE27876FB for ; Wed, 1 Nov 2023 21:35:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=afd@ti.com Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3A1KZZII049802; Wed, 1 Nov 2023 15:35:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1698870935; bh=+cMc9ulCuNzN108TGfMSjKrMviNNT+AAvQActU7Pj4M=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=OGjSbrgKODsjsrJxGwTlyOlXqUfjlkxmFMLItcL0Cs4F5pfMklCe88UcGCxCjT4fA Z/9bcEarBApSgNKDA0r4S6fncjYkfVMKYPk2cs1+RoxO8RDNLlUIyu5aNe8+zV6CvB nuXZMQHEp1/2rX9A66c6AWFpj+ennqHkJgo/IZ+4= Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3A1KZZ5K046317 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 1 Nov 2023 15:35:35 -0500 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 1 Nov 2023 15:35:35 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 1 Nov 2023 15:35:35 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 3A1KZWFX089745; Wed, 1 Nov 2023 15:35:34 -0500 From: Andrew Davis To: Manorit Chawdhry , Neha Malcom Francis , Vignesh Raghavendra , Nishanth Menon , Simon Glass , Tom Rini , Bryan Brattlof , Jan Kiszka , Le Jin , Marcel Ziswiler CC: , Andrew Davis Subject: [PATCH 4/7] arm: mach-k3: am64x: Move board selection to mach-k3 Date: Wed, 1 Nov 2023 15:35:27 -0500 Message-ID: <20231101203530.80359-4-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231101203530.80359-1-afd@ti.com> References: <20231101203530.80359-1-afd@ti.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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.8 at phobos.denx.de X-Virus-Status: Clean Currently each set of board targets from a vendor is selected inside the board directory for that vendor. This has the problem of multiple targets, one from each vendor, being selectable at the same time. For instance you can select both TARGET_AM654_A53_EVM and TARGET_IOT2050_A53 in the same build. To fix this we need to move the target board choice to a common location for each parent SoC selection. Do this in arch/arm/mach-k3. Signed-off-by: Andrew Davis --- arch/arm/mach-k3/Kconfig | 2 +- {board/ti => arch/arm/mach-k3}/am64x/Kconfig | 34 +++----------------- board/ti/am64x/Kconfig | 27 ---------------- 3 files changed, 6 insertions(+), 57 deletions(-) copy {board/ti => arch/arm/mach-k3}/am64x/Kconfig (51%) diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index 01889e9d7cf..7293e3cb4fd 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -188,7 +188,7 @@ config K3_X509_SWRV SWRV for X509 certificate used for boot images source "arch/arm/mach-k3/am65x/Kconfig" -source "board/ti/am64x/Kconfig" +source "arch/arm/mach-k3/am64x/Kconfig" source "board/ti/am62x/Kconfig" source "board/ti/am62ax/Kconfig" source "arch/arm/mach-k3/j721e/Kconfig" diff --git a/board/ti/am64x/Kconfig b/arch/arm/mach-k3/am64x/Kconfig similarity index 51% copy from board/ti/am64x/Kconfig copy to arch/arm/mach-k3/am64x/Kconfig index 2dbc6197b75..6f7b0039615 100644 --- a/board/ti/am64x/Kconfig +++ b/arch/arm/mach-k3/am64x/Kconfig @@ -1,10 +1,12 @@ # SPDX-License-Identifier: GPL-2.0+ # -# Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/ +# Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/ +# Andrew Davis + +if SOC_K3_AM642 choice prompt "K3 AM64 based boards" - depends on SOC_K3_AM642 optional config TARGET_AM642_A53_EVM @@ -29,32 +31,6 @@ config TARGET_AM642_R5_EVM endchoice -if TARGET_AM642_A53_EVM - -config SYS_BOARD - default "am64x" - -config SYS_VENDOR - default "ti" - -config SYS_CONFIG_NAME - default "am64x_evm" - -source "board/ti/common/Kconfig" - -endif - -if TARGET_AM642_R5_EVM - -config SYS_BOARD - default "am64x" - -config SYS_VENDOR - default "ti" - -config SYS_CONFIG_NAME - default "am64x_evm" - -source "board/ti/common/Kconfig" +source "board/ti/am64x/Kconfig" endif diff --git a/board/ti/am64x/Kconfig b/board/ti/am64x/Kconfig index 2dbc6197b75..b873476a9d5 100644 --- a/board/ti/am64x/Kconfig +++ b/board/ti/am64x/Kconfig @@ -2,33 +2,6 @@ # # Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/ -choice - prompt "K3 AM64 based boards" - depends on SOC_K3_AM642 - optional - -config TARGET_AM642_A53_EVM - bool "TI K3 based AM642 EVM running on A53" - select ARM64 - select BINMAN - imply BOARD - imply SPL_BOARD - imply TI_I2C_BOARD_DETECT - -config TARGET_AM642_R5_EVM - bool "TI K3 based AM642 EVM running on R5" - select CPU_V7R - select SYS_THUMB_BUILD - select K3_LOAD_SYSFW - select RAM - select SPL_RAM - select K3_DDRSS - select BINMAN - imply SYS_K3_SPL_ATF - imply TI_I2C_BOARD_DETECT - -endchoice - if TARGET_AM642_A53_EVM config SYS_BOARD -- 2.39.2