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 49BB5C4332F for ; Wed, 1 Nov 2023 20:36:07 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C471B87700; Wed, 1 Nov 2023 21:35:48 +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="VTIN9f4L"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FAA6876E7; Wed, 1 Nov 2023 21:35:47 +0100 (CET) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) (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 0029F87704 for ; Wed, 1 Nov 2023 21:35:39 +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 lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3A1KZbfc103075; Wed, 1 Nov 2023 15:35:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1698870937; bh=SkOM9iW6NJloLkEpuAKQ4ACXzHgIjjPi0c4vxMgk2n0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=VTIN9f4L+MZ0fII00Ap1sHRG2rrP+M/2mH/FKgXx3U7u0zbtg49sYjU1IHAgwf3ip DkDPpJtwJCsAU58IYCfgyUaZ3gGivybE8jZlQDVcu7p526zOt3a2BlbF15tfFcdWHd Jy7G4tClKixzkq2qBdGYfhnaMZGnHFB8t8eas6+0= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3A1KZadc060170 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 1 Nov 2023 15:35:37 -0500 Received: from DFLE114.ent.ti.com (10.64.6.35) by DFLE112.ent.ti.com (10.64.6.33) 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:36 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE114.ent.ti.com (10.64.6.35) 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:36 -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 3A1KZWFZ089745; Wed, 1 Nov 2023 15:35:36 -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 6/7] arm: mach-k3: am62ax: Move board selection to mach-k3 Date: Wed, 1 Nov 2023 15:35:29 -0500 Message-ID: <20231101203530.80359-6-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}/am62ax/Kconfig | 29 ++++--------------- board/ti/am62ax/Kconfig | 27 ----------------- 3 files changed, 7 insertions(+), 51 deletions(-) copy {board/ti => arch/arm/mach-k3}/am62ax/Kconfig (52%) diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index a460952f119..cd7dc5140ac 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -190,7 +190,7 @@ config K3_X509_SWRV source "arch/arm/mach-k3/am65x/Kconfig" source "arch/arm/mach-k3/am64x/Kconfig" source "arch/arm/mach-k3/am62x/Kconfig" -source "board/ti/am62ax/Kconfig" +source "arch/arm/mach-k3/am62ax/Kconfig" source "arch/arm/mach-k3/j721e/Kconfig" source "board/ti/j721s2/Kconfig" diff --git a/board/ti/am62ax/Kconfig b/arch/arm/mach-k3/am62ax/Kconfig similarity index 52% copy from board/ti/am62ax/Kconfig copy to arch/arm/mach-k3/am62ax/Kconfig index 30e1a068660..c5f1ef87126 100644 --- a/board/ti/am62ax/Kconfig +++ b/arch/arm/mach-k3/am62ax/Kconfig @@ -1,11 +1,12 @@ # SPDX-License-Identifier: GPL-2.0+ # -# Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ -# +# Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/ +# Andrew Davis + +if SOC_K3_AM62A7 choice - prompt "TI K3 AM62Ax based boards" - depends on SOC_K3_AM62A7 + prompt "K3 AM62Ax based boards" optional config TARGET_AM62A7_A53_EVM @@ -30,24 +31,6 @@ config TARGET_AM62A7_R5_EVM endchoice -if TARGET_AM62A7_R5_EVM || TARGET_AM62A7_A53_EVM - -config SYS_BOARD - default "am62ax" - -config SYS_VENDOR - default "ti" - -config SYS_CONFIG_NAME - default "am62ax_evm" - -source "board/ti/common/Kconfig" - -endif - -if TARGET_AM62A7_R5_EVM - -config SPL_LDSCRIPT - default "arch/arm/mach-omap2/u-boot-spl.lds" +source "board/ti/am62ax/Kconfig" endif diff --git a/board/ti/am62ax/Kconfig b/board/ti/am62ax/Kconfig index 30e1a068660..51e7b3e0eab 100644 --- a/board/ti/am62ax/Kconfig +++ b/board/ti/am62ax/Kconfig @@ -3,33 +3,6 @@ # Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ # -choice - prompt "TI K3 AM62Ax based boards" - depends on SOC_K3_AM62A7 - optional - -config TARGET_AM62A7_A53_EVM - bool "TI K3 based AM62A7 EVM running on A53" - select ARM64 - select BINMAN - imply BOARD - imply SPL_BOARD - imply TI_I2C_BOARD_DETECT - -config TARGET_AM62A7_R5_EVM - bool "TI K3 based AM62A7 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_AM62A7_R5_EVM || TARGET_AM62A7_A53_EVM config SYS_BOARD -- 2.39.2