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 3813BC10F1A for ; Thu, 9 May 2024 10:23:54 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6A7BB8826C; Thu, 9 May 2024 12:23:52 +0200 (CEST) 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="V6I81FxI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B706E8848C; Thu, 9 May 2024 12:23:50 +0200 (CEST) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) (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 7E52E87CF2 for ; Thu, 9 May 2024 12:23:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=n-francis@ti.com Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 449ANjrX059435; Thu, 9 May 2024 05:23:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1715250225; bh=vxJxZ1/F1mZ+3fe1HR5fHLGFE8ucXLqBvGj82PX4HhQ=; h=Date:Subject:To:CC:References:From:In-Reply-To; b=V6I81FxI6Vi8d1Aspx4gotW56AVLURA4vR46QRJC4OQZGMamkLNfg3xdKjIdtwKjH roVxjfPDOy0aYVePb9LCZHGGr2OMA+sdvN46w8yIK6VHUTD8diiEdy/rZkRG9TIufC 8IiNvvobpEDe5wZ7zBcFBmiZo1qY7GxsVQ5qeT8w= Received: from DLEE105.ent.ti.com (dlee105.ent.ti.com [157.170.170.35]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 449ANjJs077724 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 9 May 2024 05:23:45 -0500 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 9 May 2024 05:23:44 -0500 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE107.ent.ti.com (157.170.170.37) 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; Thu, 9 May 2024 05:23:44 -0500 Received: from [172.24.227.36] (a0497641-hp-z2-tower-g9-workstation-desktop-pc.dhcp.ti.com [172.24.227.36]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 449ANfl5070294; Thu, 9 May 2024 05:23:42 -0500 Message-ID: Date: Thu, 9 May 2024 15:53:41 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 5/6] configs: am68_sk: Move to separate defconfig for AM68 SK board To: Manorit Chawdhry , Tom Rini , Simon Glass , Alper Nebi Yasak CC: , Nishanth Menon , Andrew Davis , Udit Kumar , Aniket Limaye , Sumit Garg References: <20240509-b4-upstream-j721s2-of-upstream-v2-0-149563cd4901@ti.com> <20240509-b4-upstream-j721s2-of-upstream-v2-5-149563cd4901@ti.com> Content-Language: en-US From: Neha Malcom Francis In-Reply-To: <20240509-b4-upstream-j721s2-of-upstream-v2-5-149563cd4901@ti.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit 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 On 09/05/24 15:23, Manorit Chawdhry wrote: > Add defconfig for AM68 SK R5 and A72 configuration. > > This includes and modifies the AM68 EVM defconfigs: > j721s2_evm_r5_defconfig -> am68_sk_r5_defconfig > j721s2_evm_a72_defconfig -> am68_sk_a72_defconfig > > Signed-off-by: Manorit Chawdhry > --- > arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi | 23 +++++++ > arch/arm/dts/k3-j721s2-binman.dtsi | 89 +------------------------- > board/ti/j721s2/MAINTAINERS | 2 + > configs/am68_sk_a72_defconfig | 10 +++ > configs/am68_sk_r5_defconfig | 10 +++ > configs/j721s2_evm_a72_defconfig | 2 +- > configs/j721s2_evm_r5_defconfig | 2 +- > 7 files changed, 49 insertions(+), 89 deletions(-) > > diff --git a/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi b/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi > index b8fc62f0dd1c..dca588485d41 100644 > --- a/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi > +++ b/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi > @@ -129,3 +129,26 @@ > dr_mode = "peripheral"; > bootph-all; > }; > + > +#ifdef CONFIG_TARGET_J721S2_A72_EVM > + > +#define SPL_AM68_SK_DTB "spl/dts/k3-am68-sk-base-board.dtb" > +#define AM68_SK_DTB "u-boot.dtb" > + > +&spl_j721s2_evm_dtb { > + filename = SPL_AM68_SK_DTB; > +}; > + > +&j721s2_evm_dtb { > + filename = AM68_SK_DTB; > +}; > + > +&spl_j721s2_evm_dtb_unsigned { > + filename = SPL_AM68_SK_DTB; > +}; > + > +&j721s2_evm_dtb_unsigned { > + filename = AM68_SK_DTB; > +}; > + > +#endif > diff --git a/arch/arm/dts/k3-j721s2-binman.dtsi b/arch/arm/dts/k3-j721s2-binman.dtsi > index 7efb135bdff9..c46fda66b0b2 100644 > --- a/arch/arm/dts/k3-j721s2-binman.dtsi > +++ b/arch/arm/dts/k3-j721s2-binman.dtsi > @@ -142,10 +142,7 @@ > #ifdef CONFIG_TARGET_J721S2_A72_EVM > > #define SPL_J721S2_EVM_DTB "spl/dts/k3-j721s2-common-proc-board.dtb" > -#define SPL_AM68_SK_DTB "spl/dts/k3-am68-sk-base-board.dtb" > - > #define J721S2_EVM_DTB "u-boot.dtb" > -#define AM68_SK_DTB "arch/arm/dts/k3-am68-sk-base-board.dtb" > > &binman { > ti-dm { > @@ -306,20 +303,6 @@ > }; > > }; > - > - fdt-1 { > - description = "k3-am68-sk-base-board"; > - type = "flat_dt"; > - arch = "arm"; > - compression = "none"; > - ti-secure { > - content = <&spl_am68_sk_dtb>; > - keyfile = "custMpk.pem"; > - }; > - spl_am68_sk_dtb: blob-ext { > - filename = SPL_AM68_SK_DTB; > - }; > - }; > }; > > configurations { > @@ -331,13 +314,6 @@ > loadables = "tee", "dm", "spl"; > fdt = "fdt-0"; > }; > - > - conf-1 { > - description = "k3-am68-sk-base-board"; > - firmware = "atf"; > - loadables = "tee", "dm", "spl"; > - fdt = "fdt-1"; > - }; > }; > }; > }; > @@ -370,25 +346,6 @@ > algo = "crc32"; > }; > }; > - > - fdt-1 { > - description = "k3-am68-sk-base-board"; > - type = "flat_dt"; > - arch = "arm"; > - compression = "none"; > - ti-secure { > - content = <&am68_sk_dtb>; > - keyfile = "custMpk.pem"; > - }; > - am68_sk_dtb: blob-ext { > - filename = AM68_SK_DTB; > - }; > - > - hash { > - algo = "crc32"; > - }; > - }; > - > }; > > configurations { > @@ -400,13 +357,6 @@ > loadables = "uboot"; > fdt = "fdt-0"; > }; > - conf-1 { > - description = "k3-am68-sk-base-board"; > - firmware = "uboot"; > - loadables = "uboot"; > - fdt = "fdt-1"; > - }; > - > }; > }; > }; > @@ -429,20 +379,10 @@ > type = "flat_dt"; > arch = "arm"; > compression = "none"; > - blob { > + spl_j721s2_evm_dtb_unsigned: blob { > filename = SPL_J721S2_EVM_DTB; > }; > }; > - fdt-1 { > - description = "k3-am68-sk-base-board"; > - type = "flat_dt"; > - arch = "arm"; > - compression = "none"; > - blob { > - filename = SPL_AM68_SK_DTB; > - }; > - }; > - > }; > > configurations { > @@ -454,12 +394,6 @@ > loadables = "tee", "dm", "spl"; > fdt = "fdt-0"; > }; > - conf-1 { > - description = "k3-am68-sk-base-board"; > - firmware = "atf"; > - loadables = "tee", "dm", "spl"; > - fdt = "fdt-1"; > - }; > }; > }; > }; > @@ -480,26 +414,13 @@ > type = "flat_dt"; > arch = "arm"; > compression = "none"; > - blob { > + j721s2_evm_dtb_unsigned: blob { > filename = J721S2_EVM_DTB; > }; > hash { > algo = "crc32"; > }; > }; > - fdt-1 { > - description = "k3-am68-sk-base-board"; > - type = "flat_dt"; > - arch = "arm"; > - compression = "none"; > - blob { > - filename = AM68_SK_DTB; > - }; > - hash { > - algo = "crc32"; > - }; > - }; > - > }; > > configurations { > @@ -511,12 +432,6 @@ > loadables = "uboot"; > fdt = "fdt-0"; > }; > - conf-1 { > - description = "k3-am68-sk-base-board"; > - firmware = "uboot"; > - loadables = "uboot"; > - fdt = "fdt-1"; > - }; > }; > }; > }; > diff --git a/board/ti/j721s2/MAINTAINERS b/board/ti/j721s2/MAINTAINERS > index 561c3dfff9bd..6cf90014a090 100644 > --- a/board/ti/j721s2/MAINTAINERS > +++ b/board/ti/j721s2/MAINTAINERS > @@ -7,6 +7,8 @@ F: doc/board/ti/j721s2_evm.rst > F: include/configs/j721s2_evm.h > F: configs/j721s2_evm_r5_defconfig > F: configs/j721s2_evm_a72_defconfig > +F: configs/am68_sk_r5_defconfig > +F: configs/am68_sk_a72_defconfig > F: arch/arm/dts/k3-j721s2.dtsi > F: arch/arm/dts/k3-j721s2-main.dtsi > F: arch/arm/dts/k3-j721s2-mcu-wakeup.dtsi > diff --git a/configs/am68_sk_a72_defconfig b/configs/am68_sk_a72_defconfig > new file mode 100644 > index 000000000000..d477f9e4e988 > --- /dev/null > +++ b/configs/am68_sk_a72_defconfig > @@ -0,0 +1,10 @@ > +#include > + > +CONFIG_ARM=y > +CONFIG_ARCH_K3=y > +CONFIG_SOC_K3_J721S2=y > +CONFIG_TARGET_J721S2_A72_EVM=y > + > +CONFIG_DEFAULT_DEVICE_TREE="k3-am68-sk-base-board" > +CONFIG_SPL_OF_LIST="k3-am68-sk-base-board" > +CONFIG_OF_LIST="k3-am68-sk-base-board" > diff --git a/configs/am68_sk_r5_defconfig b/configs/am68_sk_r5_defconfig > new file mode 100644 > index 000000000000..e9b6882c1f68 > --- /dev/null > +++ b/configs/am68_sk_r5_defconfig > @@ -0,0 +1,10 @@ > +#include > + > +CONFIG_ARM=y > +CONFIG_ARCH_K3=y > +CONFIG_SOC_K3_J721S2=y > +CONFIG_TARGET_J721S2_R5_EVM=y > + > +CONFIG_DEFAULT_DEVICE_TREE="k3-am68-sk-r5-base-board" > +CONFIG_SPL_OF_LIST="k3-am68-sk-r5-base-board" > +CONFIG_OF_LIST="k3-am68-sk-r5-base-board" > diff --git a/configs/j721s2_evm_a72_defconfig b/configs/j721s2_evm_a72_defconfig > index 8b02d07a9f09..dd86b5c05092 100644 > --- a/configs/j721s2_evm_a72_defconfig > +++ b/configs/j721s2_evm_a72_defconfig > @@ -84,7 +84,7 @@ CONFIG_CMD_UBI=y > # CONFIG_SPL_EFI_PARTITION is not set > CONFIG_OF_CONTROL=y > CONFIG_SPL_OF_CONTROL=y > -CONFIG_OF_LIST="k3-j721s2-common-proc-board k3-am68-sk-base-board" > +CONFIG_OF_LIST="k3-j721s2-common-proc-board" > CONFIG_SPL_MULTI_DTB_FIT=y > CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y > CONFIG_SYS_REDUNDAND_ENVIRONMENT=y > diff --git a/configs/j721s2_evm_r5_defconfig b/configs/j721s2_evm_r5_defconfig > index 5ef5247a3e00..3c958cafbe8f 100644 > --- a/configs/j721s2_evm_r5_defconfig > +++ b/configs/j721s2_evm_r5_defconfig > @@ -82,7 +82,7 @@ CONFIG_CMD_FAT=y > CONFIG_OF_CONTROL=y > CONFIG_SPL_OF_CONTROL=y > CONFIG_SPL_MULTI_DTB_FIT=y > -CONFIG_SPL_OF_LIST="k3-j721s2-r5-common-proc-board k3-am68-sk-r5-base-board" > +CONFIG_SPL_OF_LIST="k3-j721s2-r5-common-proc-board" > CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y > CONFIG_ENV_OVERWRITE=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > Reviewed-by: Neha Malcom Francis -- Thanking You Neha Malcom Francis