configs: j721e_sk: Move to separate defconfig for J721E SK board

Add defconfig for J721E SK R5 and A72 configuration.

This includes and modifies the J721E EVM defconfigs:
j721e_evm_r5_defconfig -> j721e_sk_r5_defconfig
j721e_evm_a72_defconfig -> j721e_sk_a72_defconfig

Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
This commit is contained in:
Neha Malcom Francis 2024-05-20 15:29:15 +05:30 committed by Tom Rini
parent 69060c71dd
commit c9507f07a1
7 changed files with 52 additions and 95 deletions

View file

@ -212,10 +212,7 @@
#ifdef CONFIG_TARGET_J721E_A72_EVM
#define SPL_J721E_EVM_DTB "spl/dts/k3-j721e-common-proc-board.dtb"
#define SPL_J721E_SK_DTB "spl/dts/k3-j721e-sk.dtb"
#define J721E_EVM_DTB "u-boot.dtb"
#define J721E_SK_DTB "arch/arm/dts/k3-j721e-sk.dtb"
&binman {
ti-dm {
@ -361,28 +358,13 @@
arch = "arm";
compression = "none";
ti-secure {
content = <&spl_j721e_evm_dtb>;
content = <&spl_j721e_dtb>;
keyfile = "custMpk.pem";
};
spl_j721e_evm_dtb: blob-ext {
spl_j721e_dtb: blob-ext {
filename = SPL_J721E_EVM_DTB;
};
};
fdt-1 {
description = "k3-j721e-sk";
type = "flat_dt";
arch = "arm";
compression = "none";
ti-secure {
content = <&spl_j721e_sk_dtb>;
keyfile = "custMpk.pem";
};
spl_j721e_sk_dtb: blob-ext {
filename = SPL_J721E_SK_DTB;
};
};
};
configurations {
@ -394,13 +376,6 @@
loadables = "tee", "dm", "spl";
fdt = "fdt-0";
};
conf-1 {
description = "k3-j721e-sk";
firmware = "atf";
loadables = "tee", "dm", "spl";
fdt = "fdt-1";
};
};
};
};
@ -422,35 +397,17 @@
arch = "arm";
compression = "none";
ti-secure {
content = <&j721e_evm_dtb>;
content = <&j721e_dtb>;
keyfile = "custMpk.pem";
};
j721e_evm_dtb: blob-ext {
j721e_dtb: blob-ext {
filename = J721E_EVM_DTB;
};
hash {
algo = "crc32";
};
};
fdt-1 {
description = "k3-j721e-sk";
type = "flat_dt";
arch = "arm";
compression = "none";
ti-secure {
content = <&j721e_sk_dtb>;
keyfile = "custMpk.pem";
};
j721e_sk_dtb: blob-ext {
filename = J721E_SK_DTB;
};
hash {
algo = "crc32";
};
};
};
configurations {
@ -462,13 +419,6 @@
loadables = "uboot";
fdt = "fdt-0";
};
conf-1 {
description = "k3-j721e-sk";
firmware = "uboot";
loadables = "uboot";
fdt = "fdt-1";
};
};
};
};
@ -491,20 +441,10 @@
type = "flat_dt";
arch = "arm";
compression = "none";
blob {
spl_j721e_dtb_unsigned: blob {
filename = SPL_J721E_EVM_DTB;
};
};
fdt-1 {
description = "k3-j721e-sk";
type = "flat_dt";
arch = "arm";
compression = "none";
blob {
filename = SPL_J721E_SK_DTB;
};
};
};
configurations {
@ -516,13 +456,6 @@
loadables = "tee", "dm", "spl";
fdt = "fdt-0";
};
conf-1 {
description = "k3-j721e-sk";
firmware = "atf";
loadables = "tee", "dm", "spl";
fdt = "fdt-1";
};
};
};
};
@ -543,26 +476,13 @@
type = "flat_dt";
arch = "arm";
compression = "none";
blob {
j721e_dtb_unsigned: blob {
filename = J721E_EVM_DTB;
};
hash {
algo = "crc32";
};
};
fdt-1 {
description = "k3-j721e-sk";
type = "flat_dt";
arch = "arm";
compression = "none";
blob {
filename = J721E_SK_DTB;
};
hash {
algo = "crc32";
};
};
};
configurations {
@ -574,13 +494,6 @@
loadables = "uboot";
fdt = "fdt-0";
};
conf-1 {
description = "k3-j721e-sk";
firmware = "uboot";
loadables = "uboot";
fdt = "fdt-1";
};
};
};
};

View file

@ -155,3 +155,26 @@
bootph-all;
};
};
#ifdef CONFIG_TARGET_J721E_A72_EVM
#define SPL_J721E_SK_DTB "spl/dts/k3-j721e-sk.dtb"
#define J721E_SK_DTB "u-boot.dtb"
&spl_j721e_dtb {
filename = SPL_J721E_SK_DTB;
};
&j721e_dtb {
filename = J721E_SK_DTB;
};
&spl_j721e_dtb_unsigned {
filename = SPL_J721E_SK_DTB;
};
&j721e_dtb_unsigned {
filename = J721E_SK_DTB;
};
#endif

View file

@ -5,5 +5,7 @@ F: board/ti/j721e
F: include/configs/j721e_evm.h
F: configs/j721e_evm_r5_defconfig
F: configs/j721e_evm_a72_defconfig
F: configs/j721e_sk_r5_defconfig
F: configs/j721e_sk_a72_defconfig
F: configs/j7200_evm_r5_defconfig
F: configs/j7200_evm_a72_defconfig

View file

@ -88,7 +88,7 @@ CONFIG_MMC_SPEED_MODE_SET=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_LIST="k3-j721e-common-proc-board k3-j721e-sk"
CONFIG_OF_LIST="k3-j721e-common-proc-board"
CONFIG_MULTI_DTB_FIT=y
CONFIG_SPL_MULTI_DTB_FIT=y
CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y

View file

@ -81,7 +81,7 @@ CONFIG_CMD_MTDPARTS=y
CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_SPL_MULTI_DTB_FIT=y
CONFIG_SPL_OF_LIST="k3-j721e-r5-common-proc-board k3-j721e-r5-sk"
CONFIG_SPL_OF_LIST="k3-j721e-r5-common-proc-board"
CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
CONFIG_ENV_OVERWRITE=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y

View file

@ -0,0 +1,9 @@
#include <configs/j721e_evm_a72_defconfig>
CONFIG_ARM=y
CONFIG_ARCH_K3=y
CONFIG_SOC_K3_J721E=y
CONFIG_TARGET_J721E_A72_EVM=y
CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-sk"
CONFIG_OF_LIST="k3-j721e-sk"

View file

@ -0,0 +1,10 @@
#include <configs/j721e_evm_r5_defconfig>
CONFIG_ARM=y
CONFIG_ARCH_K3=y
CONFIG_SOC_K3_J721E=y
CONFIG_TARGET_J721E_R5_EVM=y
CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-sk"
CONFIG_SPL_OF_LIST="k3-j721e-r5-sk"
CONFIG_OF_LIST="k3-j721e-r5-sk"