| Message ID | 20240228112042.3437691-2-n-francis@ti.com |
|---|---|
| State | RFC |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Cleanup J721E EVM and SK | expand |
On 2/28/24 5:20 AM, Neha Malcom Francis wrote: > 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> > --- > board/ti/j721e/MAINTAINERS | 2 ++ > configs/j721e_evm_a72_defconfig | 2 +- > configs/j721e_evm_r5_defconfig | 2 +- > configs/j721e_sk_a72_defconfig | 4 ++++ > configs/j721e_sk_r5_defconfig | 5 +++++ > 5 files changed, 13 insertions(+), 2 deletions(-) > create mode 100644 configs/j721e_sk_a72_defconfig > create mode 100644 configs/j721e_sk_r5_defconfig > > diff --git a/board/ti/j721e/MAINTAINERS b/board/ti/j721e/MAINTAINERS > index f5ca7d06a34..06aba53d9b0 100644 > --- a/board/ti/j721e/MAINTAINERS > +++ b/board/ti/j721e/MAINTAINERS > @@ -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 > diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig > index 74af5bebb51..21081a2a684 100644 > --- a/configs/j721e_evm_a72_defconfig > +++ b/configs/j721e_evm_a72_defconfig > @@ -86,7 +86,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 > diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig > index bc4f35cce11..ce2b7df58cf 100644 > --- a/configs/j721e_evm_r5_defconfig > +++ b/configs/j721e_evm_r5_defconfig > @@ -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 > diff --git a/configs/j721e_sk_a72_defconfig b/configs/j721e_sk_a72_defconfig > new file mode 100644 > index 00000000000..c47ad4a7616 > --- /dev/null > +++ b/configs/j721e_sk_a72_defconfig > @@ -0,0 +1,4 @@ > +#include <configs/j721e_evm_a72_defconfig> > + > +CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-sk" > +CONFIG_OF_LIST="k3-j721e-sk" These two overrides should be all that is needed, but currently the `buildman` tool parses the *_defconfigs directly to determine what arch to build every defconfig for when doing testing. So you also for now need to re-define the ARCH, even though it comes in from the include. See how it was done here[0]. Basically just add here: CONFIG_ARM=y CONFIG_ARCH_K3=y CONFIG_SOC_K3_J721E=y CONFIG_TARGET_J721E_A72_EVM=y Andrew [0] https://lore.kernel.org/u-boot/20240223202153.3756094-15-a-nandan@ti.com/ > diff --git a/configs/j721e_sk_r5_defconfig b/configs/j721e_sk_r5_defconfig > new file mode 100644 > index 00000000000..077e8606d57 > --- /dev/null > +++ b/configs/j721e_sk_r5_defconfig > @@ -0,0 +1,5 @@ > +#include <configs/j721e_evm_r5_defconfig> > + > +CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-sk" > +CONFIG_SPL_OF_LIST="k3-j721e-r5-sk" > +CONFIG_OF_LIST="k3-j721e-r5-sk"
Hi Andrew On 28/02/24 20:41, Andrew Davis wrote: > On 2/28/24 5:20 AM, Neha Malcom Francis wrote: >> 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> >> --- >> board/ti/j721e/MAINTAINERS | 2 ++ >> configs/j721e_evm_a72_defconfig | 2 +- >> configs/j721e_evm_r5_defconfig | 2 +- >> configs/j721e_sk_a72_defconfig | 4 ++++ >> configs/j721e_sk_r5_defconfig | 5 +++++ >> 5 files changed, 13 insertions(+), 2 deletions(-) >> create mode 100644 configs/j721e_sk_a72_defconfig >> create mode 100644 configs/j721e_sk_r5_defconfig >> >> diff --git a/board/ti/j721e/MAINTAINERS b/board/ti/j721e/MAINTAINERS >> index f5ca7d06a34..06aba53d9b0 100644 >> --- a/board/ti/j721e/MAINTAINERS >> +++ b/board/ti/j721e/MAINTAINERS >> @@ -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 >> diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig >> index 74af5bebb51..21081a2a684 100644 >> --- a/configs/j721e_evm_a72_defconfig >> +++ b/configs/j721e_evm_a72_defconfig >> @@ -86,7 +86,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 >> diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig >> index bc4f35cce11..ce2b7df58cf 100644 >> --- a/configs/j721e_evm_r5_defconfig >> +++ b/configs/j721e_evm_r5_defconfig >> @@ -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 >> diff --git a/configs/j721e_sk_a72_defconfig b/configs/j721e_sk_a72_defconfig >> new file mode 100644 >> index 00000000000..c47ad4a7616 >> --- /dev/null >> +++ b/configs/j721e_sk_a72_defconfig >> @@ -0,0 +1,4 @@ >> +#include <configs/j721e_evm_a72_defconfig> >> + >> +CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-sk" >> +CONFIG_OF_LIST="k3-j721e-sk" > > These two overrides should be all that is needed, but currently the `buildman` > tool parses the *_defconfigs directly to determine what arch to build every > defconfig for when doing testing. So you also for now need to re-define the > ARCH, even though it comes in from the include. See how it was done here[0]. > > Basically just add here: > > CONFIG_ARM=y > CONFIG_ARCH_K3=y > CONFIG_SOC_K3_J721E=y > CONFIG_TARGET_J721E_A72_EVM=y > > Andrew > > [0] https://lore.kernel.org/u-boot/20240223202153.3756094-15-a-nandan@ti.com/ > Ah didn't realise that thanks! >> diff --git a/configs/j721e_sk_r5_defconfig b/configs/j721e_sk_r5_defconfig >> new file mode 100644 >> index 00000000000..077e8606d57 >> --- /dev/null >> +++ b/configs/j721e_sk_r5_defconfig >> @@ -0,0 +1,5 @@ >> +#include <configs/j721e_evm_r5_defconfig> >> + >> +CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-sk" >> +CONFIG_SPL_OF_LIST="k3-j721e-r5-sk" >> +CONFIG_OF_LIST="k3-j721e-r5-sk"
diff --git a/board/ti/j721e/MAINTAINERS b/board/ti/j721e/MAINTAINERS index f5ca7d06a34..06aba53d9b0 100644 --- a/board/ti/j721e/MAINTAINERS +++ b/board/ti/j721e/MAINTAINERS @@ -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 diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig index 74af5bebb51..21081a2a684 100644 --- a/configs/j721e_evm_a72_defconfig +++ b/configs/j721e_evm_a72_defconfig @@ -86,7 +86,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 diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig index bc4f35cce11..ce2b7df58cf 100644 --- a/configs/j721e_evm_r5_defconfig +++ b/configs/j721e_evm_r5_defconfig @@ -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 diff --git a/configs/j721e_sk_a72_defconfig b/configs/j721e_sk_a72_defconfig new file mode 100644 index 00000000000..c47ad4a7616 --- /dev/null +++ b/configs/j721e_sk_a72_defconfig @@ -0,0 +1,4 @@ +#include <configs/j721e_evm_a72_defconfig> + +CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-sk" +CONFIG_OF_LIST="k3-j721e-sk" diff --git a/configs/j721e_sk_r5_defconfig b/configs/j721e_sk_r5_defconfig new file mode 100644 index 00000000000..077e8606d57 --- /dev/null +++ b/configs/j721e_sk_r5_defconfig @@ -0,0 +1,5 @@ +#include <configs/j721e_evm_r5_defconfig> + +CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-sk" +CONFIG_SPL_OF_LIST="k3-j721e-r5-sk" +CONFIG_OF_LIST="k3-j721e-r5-sk"
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> --- board/ti/j721e/MAINTAINERS | 2 ++ configs/j721e_evm_a72_defconfig | 2 +- configs/j721e_evm_r5_defconfig | 2 +- configs/j721e_sk_a72_defconfig | 4 ++++ configs/j721e_sk_r5_defconfig | 5 +++++ 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 configs/j721e_sk_a72_defconfig create mode 100644 configs/j721e_sk_r5_defconfig