| Message ID | 20240509-b4-upstream-j721s2-of-upstream-v2-5-149563cd4901@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Enable OF_UPSTREAM for J721s2 and AM68 | expand |
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 <m-chawdhry@ti.com> > --- > 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 <configs/j721s2_evm_a72_defconfig> > + > +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 <configs/j721s2_evm_r5_defconfig> > + > +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 <n-francis@ti.com>
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 <configs/j721s2_evm_a72_defconfig> + +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 <configs/j721s2_evm_r5_defconfig> + +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
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 <m-chawdhry@ti.com> --- 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(-)