* [PATCH v2 2/3] include: configs: j721s2_evm: Change to using .env
2023-03-15 5:27 [PATCH v2 1/3] include: environment: ti: Use .env for environment variables Neha Malcom Francis
@ 2023-03-15 5:27 ` Neha Malcom Francis
2023-03-17 5:57 ` Nikhil M Jain
2023-03-30 1:54 ` Tom Rini
2023-03-15 5:27 ` [PATCH v2 3/3] include: configs: j721e_evm: " Neha Malcom Francis
` (2 subsequent siblings)
3 siblings, 2 replies; 8+ messages in thread
From: Neha Malcom Francis @ 2023-03-15 5:27 UTC (permalink / raw)
To: u-boot, trini, n-jain1; +Cc: n-francis, u-kumar1, vigneshr
Move to using .env file for setting up environment variables for J721S2.
Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v2:
- Added CONFIG_CMD_REMOTEPROC guard to including k3_rproc.env
- Retained Reviewed-by tag
board/ti/j721s2/Kconfig | 6 ++
board/ti/j721s2/j721s2.env | 56 +++++++++++++++++
include/configs/j721s2_evm.h | 118 +----------------------------------
3 files changed, 63 insertions(+), 117 deletions(-)
create mode 100644 board/ti/j721s2/j721s2.env
diff --git a/board/ti/j721s2/Kconfig b/board/ti/j721s2/Kconfig
index 6141798333..70972d1227 100644
--- a/board/ti/j721s2/Kconfig
+++ b/board/ti/j721s2/Kconfig
@@ -40,6 +40,9 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "j721s2_evm"
+config ENV_SOURCE_FILE
+ default "j721s2"
+
source "board/ti/common/Kconfig"
endif
@@ -55,6 +58,9 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "j721s2_evm"
+config ENV_SOURCE_FILE
+ default "j721s2"
+
source "board/ti/common/Kconfig"
endif
diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env
new file mode 100644
index 0000000000..2152f8849f
--- /dev/null
+++ b/board/ti/j721s2/j721s2.env
@@ -0,0 +1,56 @@
+#include <environment/ti/ti_armv7_common.env>
+#include <environment/ti/mmc.env>
+#include <environment/ti/ufs.env>
+#include <environment/ti/k3_dfu.env>
+
+#if CONFIG_CMD_REMOTEPROC
+#include <environment/ti/k3_rproc.env>
+#endif
+
+default_device_tree=k3-j721s2-common-proc-board.dtb
+findfdt=
+ setenv name_fdt ${default_device_tree};
+ if test $board_name = j721s2; then \
+ setenv name_fdt k3-j721s2-common-proc-board.dtb; fi;
+ if test $board_name = am68-sk; then
+ setenv name_fdt k3-am68-sk-base-board.dtb; fi;
+ setenv fdtfile ${name_fdt}
+name_kern=Image
+console=ttyS2,115200n8
+args_all=setenv optargs earlycon=ns16550a,mmio32,0x02880000
+ ${mtdparts}
+run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
+
+boot=mmc
+mmcdev=1
+bootpart=1:2
+bootdir=/boot
+#if CONFIG_SYS_K3_SPL_ATF
+#if CONFIG_TARGET_J721S2_R5_EVM
+addr_mcur5f0_0load=0x89000000
+name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw
+#endif
+#endif
+rd_spec=-
+init_mmc=run args_all args_mmc
+get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_mmc=
+ fdt address ${fdtaddr};
+ fdt resize 0x100000;
+ for overlay in $name_overlays;
+ do;
+ load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} &&
+ fdt apply ${dtboaddr};
+ done;
+partitions=uuid_disk=${uuid_gpt_disk};
+ name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
+get_kern_mmc=load mmc ${bootpart} ${loadaddr}
+ ${bootdir}/${name_kern}
+get_fit_mmc=load mmc ${bootpart} ${addr_fit}
+ ${bootdir}/${name_fit}
+partitions=uuid_disk=${uuid_gpt_disk};
+ name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
+
+rproc_fw_binaries= 2 /lib/firmware/j721s2-main-r5f0_0-fw 3 /lib/firmware/j721s2-main-r5f0_1-fw 4 /lib/firmware/j721s2-main-r5f1_0-fw 5 /lib/firmware/j721s2-main-r5f1_1-fw 6 /lib/firmware/j721s2-c71_0-fw 7 /lib/firmware/j721s2-c71_1-fw
+
+
diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h
index bfada9eebc..2fa93b7961 100644
--- a/include/configs/j721s2_evm.h
+++ b/include/configs/j721s2_evm.h
@@ -11,10 +11,6 @@
#include <linux/sizes.h>
#include <config_distro_bootcmd.h>
-#include <environment/ti/mmc.h>
-#include <environment/ti/k3_rproc.h>
-#include <environment/ti/ufs.h>
-#include <environment/ti/k3_dfu.h>
/* DDR Configuration */
#define CFG_SYS_SDRAM_BASE1 0x880000000
@@ -27,120 +23,8 @@
#define CFG_SYS_UBOOT_BASE 0x50080000
#endif
-/* U-Boot general configuration */
-#define EXTRA_ENV_J721S2_BOARD_SETTINGS \
- "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
- "findfdt=" \
- "setenv name_fdt ${default_device_tree};" \
- "if test $board_name = j721s2; then " \
- "setenv name_fdt k3-j721s2-common-proc-board.dtb; fi;" \
- "if test $board_name = am68-sk; then " \
- "setenv name_fdt k3-am68-sk-base-board.dtb; fi;"\
- "setenv fdtfile ${name_fdt}\0" \
- "name_kern=Image\0" \
- "console=ttyS2,115200n8\0" \
- "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02880000 " \
- "${mtdparts}\0" \
- "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
-
-#define PARTS_DEFAULT \
- /* Linux partitions */ \
- "uuid_disk=${uuid_gpt_disk};" \
- "name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0"
-
-#ifdef CONFIG_SYS_K3_SPL_ATF
-#if defined(CONFIG_TARGET_J721S2_R5_EVM)
-#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
- "addr_mcur5f0_0load=0x89000000\0" \
- "name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw\0"
-#elif defined(CONFIG_TARGET_J7200_R5_EVM)
-#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
- "addr_mcur5f0_0load=0x89000000\0" \
- "name_mcur5f0_0fw=/lib/firmware/j7200-mcu-r5f0_0-fw\0"
-#endif /* CONFIG_TARGET_J721S2_R5_EVM */
-#else
-#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC ""
-#endif /* CONFIG_SYS_K3_SPL_ATF */
-
-/* U-Boot MMC-specific configuration */
-#define EXTRA_ENV_J721S2_BOARD_SETTINGS_MMC \
- "boot=mmc\0" \
- "mmcdev=1\0" \
- "bootpart=1:2\0" \
- "bootdir=/boot\0" \
- EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
- "rd_spec=-\0" \
- "init_mmc=run args_all args_mmc\0" \
- "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \
- "get_overlay_mmc=" \
- "fdt address ${fdtaddr};" \
- "fdt resize 0x100000;" \
- "for overlay in $name_overlays;" \
- "do;" \
- "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \
- "fdt apply ${dtboaddr};" \
- "done;\0" \
- "partitions=" PARTS_DEFAULT \
- "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \
- "${bootdir}/${name_kern}\0" \
- "get_fit_mmc=load mmc ${bootpart} ${addr_fit} " \
- "${bootdir}/${name_fit}\0" \
- "partitions=" PARTS_DEFAULT
-
-/* Set the default list of remote processors to boot */
-#if defined(CONFIG_TARGET_J721S2_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
-#ifdef DEFAULT_RPROCS
-#undef DEFAULT_RPROCS
-#endif
-#endif
-
-#ifdef CONFIG_TARGET_J721S2_A72_EVM
-#define DEFAULT_RPROCS "" \
- "2 /lib/firmware/j721s2-main-r5f0_0-fw " \
- "3 /lib/firmware/j721s2-main-r5f0_1-fw " \
- "4 /lib/firmware/j721s2-main-r5f1_0-fw " \
- "5 /lib/firmware/j721s2-main-r5f1_1-fw " \
- "6 /lib/firmware/j721s2-c71_0-fw " \
- "7 /lib/firmware/j721s2-c71_1-fw "
-#endif /* CONFIG_TARGET_J721S2_A72_EVM */
-
-#ifdef CONFIG_TARGET_J7200_A72_EVM
-#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY \
- "do_main_cpsw0_qsgmii_phyinit=1\0" \
- "init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;" \
- "gpio clear gpio@22_16\0" \
- "main_cpsw0_qsgmii_phyinit=" \
- "if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && " \
- "test ${boot} = mmc; then " \
- "run init_main_cpsw0_qsgmii_phy;" \
- "fi;\0"
-#define DEFAULT_RPROCS "" \
- "2 /lib/firmware/j7200-main-r5f0_0-fw " \
- "3 /lib/firmware/j7200-main-r5f0_1-fw "
-#endif /* CONFIG_TARGET_J7200_A72_EVM */
-
-#ifndef EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
-#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
-#endif
-
-/* set default dfu_bufsiz to 128KB (sector size of OSPI) */
-#define EXTRA_ENV_DFUARGS \
- DFU_ALT_INFO_MMC \
- DFU_ALT_INFO_EMMC \
- DFU_ALT_INFO_RAM \
- DFU_ALT_INFO_OSPI
-
/* Incorporate settings into the U-Boot environment */
-#define CFG_EXTRA_ENV_SETTINGS \
- DEFAULT_LINUX_BOOT_ENV \
- DEFAULT_MMC_TI_ARGS \
- DEFAULT_FIT_TI_ARGS \
- EXTRA_ENV_J721S2_BOARD_SETTINGS \
- EXTRA_ENV_J721S2_BOARD_SETTINGS_MMC \
- EXTRA_ENV_RPROC_SETTINGS \
- EXTRA_ENV_DFUARGS \
- DEFAULT_UFS_TI_ARGS \
- EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
+#define CFG_EXTRA_ENV_SETTINGS
/* Now for the remaining common defines */
#include <configs/ti_armv7_common.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/3] include: configs: j721s2_evm: Change to using .env
2023-03-15 5:27 ` [PATCH v2 2/3] include: configs: j721s2_evm: Change to using .env Neha Malcom Francis
@ 2023-03-17 5:57 ` Nikhil M Jain
2023-03-30 1:54 ` Tom Rini
1 sibling, 0 replies; 8+ messages in thread
From: Nikhil M Jain @ 2023-03-17 5:57 UTC (permalink / raw)
To: Neha Malcom Francis, u-boot, trini; +Cc: u-kumar1, vigneshr
Hi Neha,
Thanks for the patch.
On 15/03/23 10:57, Neha Malcom Francis wrote:
> Move to using .env file for setting up environment variables for J721S2.
>
> Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
> Changes in v2:
> - Added CONFIG_CMD_REMOTEPROC guard to including k3_rproc.env
> - Retained Reviewed-by tag
>
> board/ti/j721s2/Kconfig | 6 ++
> board/ti/j721s2/j721s2.env | 56 +++++++++++++++++
> include/configs/j721s2_evm.h | 118 +----------------------------------
> 3 files changed, 63 insertions(+), 117 deletions(-)
> create mode 100644 board/ti/j721s2/j721s2.env
>
> diff --git a/board/ti/j721s2/Kconfig b/board/ti/j721s2/Kconfig
> index 6141798333..70972d1227 100644
> --- a/board/ti/j721s2/Kconfig
> +++ b/board/ti/j721s2/Kconfig
> @@ -40,6 +40,9 @@ config SYS_VENDOR
> config SYS_CONFIG_NAME
> default "j721s2_evm"
>
> +config ENV_SOURCE_FILE
> + default "j721s2"
> +
> source "board/ti/common/Kconfig"
>
> endif
> @@ -55,6 +58,9 @@ config SYS_VENDOR
> config SYS_CONFIG_NAME
> default "j721s2_evm"
>
> +config ENV_SOURCE_FILE
> + default "j721s2"
> +
> source "board/ti/common/Kconfig"
>
> endif
> diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env
> new file mode 100644
> index 0000000000..2152f8849f
> --- /dev/null
> +++ b/board/ti/j721s2/j721s2.env
> @@ -0,0 +1,56 @@
> +#include <environment/ti/ti_armv7_common.env>
> +#include <environment/ti/mmc.env>
> +#include <environment/ti/ufs.env>
> +#include <environment/ti/k3_dfu.env>
> +
> +#if CONFIG_CMD_REMOTEPROC
> +#include <environment/ti/k3_rproc.env>
> +#endif
> +
> +default_device_tree=k3-j721s2-common-proc-board.dtb
> +findfdt=
> + setenv name_fdt ${default_device_tree};
> + if test $board_name = j721s2; then \
> + setenv name_fdt k3-j721s2-common-proc-board.dtb; fi;
> + if test $board_name = am68-sk; then
> + setenv name_fdt k3-am68-sk-base-board.dtb; fi;
> + setenv fdtfile ${name_fdt}
> +name_kern=Image
> +console=ttyS2,115200n8
> +args_all=setenv optargs earlycon=ns16550a,mmio32,0x02880000
> + ${mtdparts}
> +run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
> +
> +boot=mmc
> +mmcdev=1
> +bootpart=1:2
> +bootdir=/boot
> +#if CONFIG_SYS_K3_SPL_ATF
> +#if CONFIG_TARGET_J721S2_R5_EVM
> +addr_mcur5f0_0load=0x89000000
> +name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw
> +#endif
> +#endif
> +rd_spec=-
> +init_mmc=run args_all args_mmc
> +get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
> +get_overlay_mmc=
> + fdt address ${fdtaddr};
> + fdt resize 0x100000;
> + for overlay in $name_overlays;
> + do;
> + load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} &&
> + fdt apply ${dtboaddr};
> + done;
> +partitions=uuid_disk=${uuid_gpt_disk};
> + name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
> +get_kern_mmc=load mmc ${bootpart} ${loadaddr}
> + ${bootdir}/${name_kern}
> +get_fit_mmc=load mmc ${bootpart} ${addr_fit}
> + ${bootdir}/${name_fit}
> +partitions=uuid_disk=${uuid_gpt_disk};
> + name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
> +
> +rproc_fw_binaries= 2 /lib/firmware/j721s2-main-r5f0_0-fw 3 /lib/firmware/j721s2-main-r5f0_1-fw 4 /lib/firmware/j721s2-main-r5f1_0-fw 5 /lib/firmware/j721s2-main-r5f1_1-fw 6 /lib/firmware/j721s2-c71_0-fw 7 /lib/firmware/j721s2-c71_1-fw
> +
> +
You have two extra lines at the end of the file.
> diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h
> index bfada9eebc..2fa93b7961 100644
> --- a/include/configs/j721s2_evm.h
> +++ b/include/configs/j721s2_evm.h
> @@ -11,10 +11,6 @@
>
> #include <linux/sizes.h>
> #include <config_distro_bootcmd.h>
> -#include <environment/ti/mmc.h>
> -#include <environment/ti/k3_rproc.h>
> -#include <environment/ti/ufs.h>
> -#include <environment/ti/k3_dfu.h>
>
> /* DDR Configuration */
> #define CFG_SYS_SDRAM_BASE1 0x880000000
> @@ -27,120 +23,8 @@
> #define CFG_SYS_UBOOT_BASE 0x50080000
> #endif
>
> -/* U-Boot general configuration */
> -#define EXTRA_ENV_J721S2_BOARD_SETTINGS \
> - "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
> - "findfdt=" \
> - "setenv name_fdt ${default_device_tree};" \
> - "if test $board_name = j721s2; then " \
> - "setenv name_fdt k3-j721s2-common-proc-board.dtb; fi;" \
> - "if test $board_name = am68-sk; then " \
> - "setenv name_fdt k3-am68-sk-base-board.dtb; fi;"\
> - "setenv fdtfile ${name_fdt}\0" \
> - "name_kern=Image\0" \
> - "console=ttyS2,115200n8\0" \
> - "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02880000 " \
> - "${mtdparts}\0" \
> - "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
> -
> -#define PARTS_DEFAULT \
> - /* Linux partitions */ \
> - "uuid_disk=${uuid_gpt_disk};" \
> - "name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0"
> -
> -#ifdef CONFIG_SYS_K3_SPL_ATF
> -#if defined(CONFIG_TARGET_J721S2_R5_EVM)
> -#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
> - "addr_mcur5f0_0load=0x89000000\0" \
> - "name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw\0"
> -#elif defined(CONFIG_TARGET_J7200_R5_EVM)
> -#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
> - "addr_mcur5f0_0load=0x89000000\0" \
> - "name_mcur5f0_0fw=/lib/firmware/j7200-mcu-r5f0_0-fw\0"
> -#endif /* CONFIG_TARGET_J721S2_R5_EVM */
> -#else
> -#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC ""
> -#endif /* CONFIG_SYS_K3_SPL_ATF */
> -
> -/* U-Boot MMC-specific configuration */
> -#define EXTRA_ENV_J721S2_BOARD_SETTINGS_MMC \
> - "boot=mmc\0" \
> - "mmcdev=1\0" \
> - "bootpart=1:2\0" \
> - "bootdir=/boot\0" \
> - EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
> - "rd_spec=-\0" \
> - "init_mmc=run args_all args_mmc\0" \
> - "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \
> - "get_overlay_mmc=" \
> - "fdt address ${fdtaddr};" \
> - "fdt resize 0x100000;" \
> - "for overlay in $name_overlays;" \
> - "do;" \
> - "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \
> - "fdt apply ${dtboaddr};" \
> - "done;\0" \
> - "partitions=" PARTS_DEFAULT \
> - "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \
> - "${bootdir}/${name_kern}\0" \
> - "get_fit_mmc=load mmc ${bootpart} ${addr_fit} " \
> - "${bootdir}/${name_fit}\0" \
> - "partitions=" PARTS_DEFAULT
> -
> -/* Set the default list of remote processors to boot */
> -#if defined(CONFIG_TARGET_J721S2_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
> -#ifdef DEFAULT_RPROCS
> -#undef DEFAULT_RPROCS
> -#endif
> -#endif
> -
> -#ifdef CONFIG_TARGET_J721S2_A72_EVM
> -#define DEFAULT_RPROCS "" \
> - "2 /lib/firmware/j721s2-main-r5f0_0-fw " \
> - "3 /lib/firmware/j721s2-main-r5f0_1-fw " \
> - "4 /lib/firmware/j721s2-main-r5f1_0-fw " \
> - "5 /lib/firmware/j721s2-main-r5f1_1-fw " \
> - "6 /lib/firmware/j721s2-c71_0-fw " \
> - "7 /lib/firmware/j721s2-c71_1-fw "
> -#endif /* CONFIG_TARGET_J721S2_A72_EVM */
> -
> -#ifdef CONFIG_TARGET_J7200_A72_EVM
> -#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY \
> - "do_main_cpsw0_qsgmii_phyinit=1\0" \
> - "init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;" \
> - "gpio clear gpio@22_16\0" \
> - "main_cpsw0_qsgmii_phyinit=" \
> - "if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && " \
> - "test ${boot} = mmc; then " \
> - "run init_main_cpsw0_qsgmii_phy;" \
> - "fi;\0"
> -#define DEFAULT_RPROCS "" \
> - "2 /lib/firmware/j7200-main-r5f0_0-fw " \
> - "3 /lib/firmware/j7200-main-r5f0_1-fw "
> -#endif /* CONFIG_TARGET_J7200_A72_EVM */
> -
> -#ifndef EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
> -#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
> -#endif
> -
> -/* set default dfu_bufsiz to 128KB (sector size of OSPI) */
> -#define EXTRA_ENV_DFUARGS \
> - DFU_ALT_INFO_MMC \
> - DFU_ALT_INFO_EMMC \
> - DFU_ALT_INFO_RAM \
> - DFU_ALT_INFO_OSPI
> -
> /* Incorporate settings into the U-Boot environment */
> -#define CFG_EXTRA_ENV_SETTINGS \
> - DEFAULT_LINUX_BOOT_ENV \
> - DEFAULT_MMC_TI_ARGS \
> - DEFAULT_FIT_TI_ARGS \
> - EXTRA_ENV_J721S2_BOARD_SETTINGS \
> - EXTRA_ENV_J721S2_BOARD_SETTINGS_MMC \
> - EXTRA_ENV_RPROC_SETTINGS \
> - EXTRA_ENV_DFUARGS \
> - DEFAULT_UFS_TI_ARGS \
> - EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
> +#define CFG_EXTRA_ENV_SETTINGS
>
> /* Now for the remaining common defines */
> #include <configs/ti_armv7_common.h>
Regards,
Nikhil
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/3] include: configs: j721s2_evm: Change to using .env
2023-03-15 5:27 ` [PATCH v2 2/3] include: configs: j721s2_evm: Change to using .env Neha Malcom Francis
2023-03-17 5:57 ` Nikhil M Jain
@ 2023-03-30 1:54 ` Tom Rini
1 sibling, 0 replies; 8+ messages in thread
From: Tom Rini @ 2023-03-30 1:54 UTC (permalink / raw)
To: Neha Malcom Francis; +Cc: u-boot, n-jain1, u-kumar1, vigneshr
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
On Wed, Mar 15, 2023 at 10:57:44AM +0530, Neha Malcom Francis wrote:
> Move to using .env file for setting up environment variables for J721S2.
>
> Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/next, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] include: configs: j721e_evm: Change to using .env
2023-03-15 5:27 [PATCH v2 1/3] include: environment: ti: Use .env for environment variables Neha Malcom Francis
2023-03-15 5:27 ` [PATCH v2 2/3] include: configs: j721s2_evm: Change to using .env Neha Malcom Francis
@ 2023-03-15 5:27 ` Neha Malcom Francis
2023-03-30 1:54 ` Tom Rini
2023-03-16 18:16 ` [PATCH v2 1/3] include: environment: ti: Use .env for environment variables Tom Rini
2023-03-30 1:54 ` Tom Rini
3 siblings, 1 reply; 8+ messages in thread
From: Neha Malcom Francis @ 2023-03-15 5:27 UTC (permalink / raw)
To: u-boot, trini, n-jain1; +Cc: n-francis, u-kumar1, vigneshr
Move to using .env file for setting up environment variables for J721E
and J7200.
Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v2:
- Added CONFIG_CMD_REMOTEPROC guard to including k3_rproc.env
- Retained Reviewed-by tag
board/ti/j721e/Kconfig | 12 ++++
board/ti/j721e/j721e.env | 82 ++++++++++++++++++++++
include/configs/j721e_evm.h | 134 ------------------------------------
3 files changed, 94 insertions(+), 134 deletions(-)
create mode 100644 board/ti/j721e/j721e.env
diff --git a/board/ti/j721e/Kconfig b/board/ti/j721e/Kconfig
index d19d30d59e..d5e12183f0 100644
--- a/board/ti/j721e/Kconfig
+++ b/board/ti/j721e/Kconfig
@@ -60,6 +60,9 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "j721e_evm"
+config ENV_SOURCE_FILE
+ default "j721e"
+
source "board/ti/common/Kconfig"
endif
@@ -75,6 +78,9 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "j721e_evm"
+config ENV_SOURCE_FILE
+ default "j721e"
+
source "board/ti/common/Kconfig"
endif
@@ -90,6 +96,9 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "j721e_evm"
+config ENV_SOURCE_FILE
+ default "j721e"
+
source "board/ti/common/Kconfig"
endif
@@ -105,6 +114,9 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "j721e_evm"
+config ENV_SOURCE_FILE
+ default "j721e"
+
source "board/ti/common/Kconfig"
endif
diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env
new file mode 100644
index 0000000000..446395adfa
--- /dev/null
+++ b/board/ti/j721e/j721e.env
@@ -0,0 +1,82 @@
+#include <environment/ti/ti_armv7_common.env>
+#include <environment/ti/mmc.env>
+#include <environment/ti/ufs.env>
+#include <environment/ti/k3_dfu.env>
+
+#if CONFIG_CMD_REMOTEPROC
+#include <environment/ti/k3_rproc.env>
+#endif
+
+default_device_tree=k3-j721e-common-proc-board.dtb
+findfdt=
+ setenv name_fdt ${default_device_tree};
+ if test $board_name = j721e; then
+ setenv name_fdt k3-j721e-common-proc-board.dtb; fi;
+ if test $board_name = j721e-eaik || test $board_name = j721e-sk; then
+ setenv name_fdt k3-j721e-sk.dtb; fi;
+ setenv fdtfile ${name_fdt}
+name_kern=Image
+console=ttyS2,115200n8
+args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000
+ ${mtdparts}
+run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
+
+#if CONFIG_SYS_K3_SPL_ATF
+#if CONFIG_TARGET_J721E_R5_EVM
+addr_mcur5f0_0load=0x89000000
+name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw
+#elif CONFIG_TARGET_J7200_R5_EVM
+addr_mcur5f0_0load=0x89000000
+name_mcur5f0_0fw=/lib/firmware/j7200-mcu-r5f0_0-fw
+#endif
+#endif
+
+boot=mmc
+mmcdev=1
+bootpart=1:2
+bootdir=/boot
+rd_spec=-
+init_mmc=run args_all args_mmc
+get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_mmc=
+ fdt address ${fdtaddr};
+ fdt resize 0x100000;
+ for overlay in $name_overlays;
+ do;
+ load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} &&
+ fdt apply ${dtboaddr};
+ done;
+partitions=uuid_disk=${uuid_gpt_disk};
+ name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
+get_kern_mmc=load mmc ${bootpart} ${loadaddr}
+ ${bootdir}/${name_kern}
+get_fit_mmc=load mmc ${bootpart} ${addr_fit}
+ ${bootdir}/${name_fit}
+
+#if CONFIG_TARGET_J7200_A72_EVM
+do_main_cpsw0_qsgmii_phyinit=1
+init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;
+ gpio clear gpio@22_16
+main_cpsw0_qsgmii_phyinit=
+ if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && test ${boot} = mmc; then
+ run init_main_cpsw0_qsgmii_phy;
+ fi;
+#elif CONFIG_TARGET_J721E_A72_EVM
+init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;
+ gpio clear gpio@22_16
+main_cpsw0_qsgmii_phyinit=
+ if test $board_name = J721EX-PM1-SOM || test $board_name = J721EX-PM2-SOM || test $board_name = j721e; then
+ do_main_cpsw0_qsgmii_phyinit=1; else
+ do_main_cpsw0_qsgmii_phyinit=0; fi;
+ if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && test ${boot} = mmc; then
+ run init_main_cpsw0_qsgmii_phy; \
+ fi;
+#endif
+
+#if CONFIG_TARGET_J721E_A72_EVM
+rproc_fw_binaries=2 /lib/firmware/j7-main-r5f0_0-fw 3 /lib/firmware/j7-main-r5f0_1-fw 4 /lib/firmware/j7-main-r5f1_0-fw 5 /lib/firmware/j7-main-r5f1_1-fw 6 /lib/firmware/j7-c66_0-fw 7 /lib/firmware/j7-c66_1-fw 8 /lib/firmware/j7-c71_0-fw
+#endif
+
+#if CONFIG_TARGET_J7200_A72_EVM
+rproc_fw_binaries=2 /lib/firmware/j7200-main-r5f0_0-fw 3 /lib/firmware/j7200-main-r5f0_1-fw
+#endif
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 48b1cea6e3..de92cd48fb 100644
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -10,10 +10,6 @@
#define __CONFIG_J721E_EVM_H
#include <linux/sizes.h>
-#include <environment/ti/mmc.h>
-#include <environment/ti/k3_rproc.h>
-#include <environment/ti/ufs.h>
-#include <environment/ti/k3_dfu.h>
/* DDR Configuration */
#define CFG_SYS_SDRAM_BASE1 0x880000000
@@ -28,127 +24,6 @@
#define CFG_SYS_UBOOT_BASE 0x50080000
#endif
-/* HyperFlash related configuration */
-
-/* U-Boot general configuration */
-#define EXTRA_ENV_J721E_BOARD_SETTINGS \
- "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
- "findfdt=" \
- "setenv name_fdt ${default_device_tree};" \
- "if test $board_name = j721e; then " \
- "setenv name_fdt k3-j721e-common-proc-board.dtb; fi;" \
- "if test $board_name = j721e-eaik || test $board_name = j721e-sk; then " \
- "setenv name_fdt k3-j721e-sk.dtb; fi;" \
- "setenv fdtfile ${name_fdt}\0" \
- "name_kern=Image\0" \
- "console=ttyS2,115200n8\0" \
- "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \
- "${mtdparts}\0" \
- "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
-
-#define PARTS_DEFAULT \
- /* Linux partitions */ \
- "uuid_disk=${uuid_gpt_disk};" \
- "name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0"
-
-#ifdef CONFIG_SYS_K3_SPL_ATF
-#if defined(CONFIG_TARGET_J721E_R5_EVM)
-#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
- "addr_mcur5f0_0load=0x89000000\0" \
- "name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw\0"
-#elif defined(CONFIG_TARGET_J7200_R5_EVM)
-#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
- "addr_mcur5f0_0load=0x89000000\0" \
- "name_mcur5f0_0fw=/lib/firmware/j7200-mcu-r5f0_0-fw\0"
-#endif /* CONFIG_TARGET_J721E_R5_EVM */
-#else
-#define EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC ""
-#endif /* CONFIG_SYS_K3_SPL_ATF */
-
-/* U-Boot MMC-specific configuration */
-#define EXTRA_ENV_J721E_BOARD_SETTINGS_MMC \
- "boot=mmc\0" \
- "mmcdev=1\0" \
- "bootpart=1:2\0" \
- "bootdir=/boot\0" \
- EXTRA_ENV_R5_SPL_RPROC_FW_ARGS_MMC \
- "rd_spec=-\0" \
- "init_mmc=run args_all args_mmc\0" \
- "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \
- "get_overlay_mmc=" \
- "fdt address ${fdtaddr};" \
- "fdt resize 0x100000;" \
- "for overlay in $name_overlays;" \
- "do;" \
- "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \
- "fdt apply ${dtboaddr};" \
- "done;\0" \
- "partitions=" PARTS_DEFAULT \
- "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \
- "${bootdir}/${name_kern}\0" \
- "get_fit_mmc=load mmc ${bootpart} ${addr_fit} " \
- "${bootdir}/${name_fit}\0" \
- "partitions=" PARTS_DEFAULT
-
-/* Set the default list of remote processors to boot */
-#if defined(CONFIG_TARGET_J7200_A72_EVM)
-#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY \
- "do_main_cpsw0_qsgmii_phyinit=1\0" \
- "init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;" \
- "gpio clear gpio@22_16\0" \
- "main_cpsw0_qsgmii_phyinit=" \
- "if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && " \
- "test ${boot} = mmc; then " \
- "run init_main_cpsw0_qsgmii_phy;" \
- "fi;\0"
-#ifdef DEFAULT_RPROCS
-#undef DEFAULT_RPROCS
-#endif
-#elif defined(CONFIG_TARGET_J721E_A72_EVM)
-#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY \
- "init_main_cpsw0_qsgmii_phy=gpio set gpio@22_17;" \
- "gpio clear gpio@22_16\0" \
- "main_cpsw0_qsgmii_phyinit=" \
- "if test $board_name = J721EX-PM1-SOM || test $board_name = J721EX-PM2-SOM " \
- "|| test $board_name = j721e; then " \
- "do_main_cpsw0_qsgmii_phyinit=1; else " \
- "do_main_cpsw0_qsgmii_phyinit=0; fi;" \
- "if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1 && test ${dorprocboot} -eq 1 && " \
- "test ${boot} = mmc; then " \
- "run init_main_cpsw0_qsgmii_phy;" \
- "fi;\0"
-#ifdef DEFAULT_RPROCS
-#undef DEFAULT_RPROCS
-#endif
-#endif
-
-#ifdef CONFIG_TARGET_J721E_A72_EVM
-#define DEFAULT_RPROCS "" \
- "2 /lib/firmware/j7-main-r5f0_0-fw " \
- "3 /lib/firmware/j7-main-r5f0_1-fw " \
- "4 /lib/firmware/j7-main-r5f1_0-fw " \
- "5 /lib/firmware/j7-main-r5f1_1-fw " \
- "6 /lib/firmware/j7-c66_0-fw " \
- "7 /lib/firmware/j7-c66_1-fw " \
- "8 /lib/firmware/j7-c71_0-fw "
-#endif /* CONFIG_TARGET_J721E_A72_EVM */
-
-#ifdef CONFIG_TARGET_J7200_A72_EVM
-#define DEFAULT_RPROCS "" \
- "2 /lib/firmware/j7200-main-r5f0_0-fw " \
- "3 /lib/firmware/j7200-main-r5f0_1-fw "
-#endif /* CONFIG_TARGET_J7200_A72_EVM */
-
-#ifndef EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
-#define EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY
-#endif
-
-#define EXTRA_ENV_DFUARGS \
- DFU_ALT_INFO_MMC \
- DFU_ALT_INFO_EMMC \
- DFU_ALT_INFO_RAM \
- DFU_ALT_INFO_OSPI
-
#if CONFIG_IS_ENABLED(CMD_PXE)
# define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
#else
@@ -178,15 +53,6 @@
/* Incorporate settings into the U-Boot environment */
#define CFG_EXTRA_ENV_SETTINGS \
- DEFAULT_LINUX_BOOT_ENV \
- DEFAULT_MMC_TI_ARGS \
- DEFAULT_FIT_TI_ARGS \
- EXTRA_ENV_J721E_BOARD_SETTINGS \
- EXTRA_ENV_J721E_BOARD_SETTINGS_MMC \
- EXTRA_ENV_RPROC_SETTINGS \
- EXTRA_ENV_DFUARGS \
- DEFAULT_UFS_TI_ARGS \
- EXTRA_ENV_CONFIG_MAIN_CPSW0_QSGMII_PHY \
BOOTENV
/* Now for the remaining common defines */
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/3] include: configs: j721e_evm: Change to using .env
2023-03-15 5:27 ` [PATCH v2 3/3] include: configs: j721e_evm: " Neha Malcom Francis
@ 2023-03-30 1:54 ` Tom Rini
0 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2023-03-30 1:54 UTC (permalink / raw)
To: Neha Malcom Francis; +Cc: u-boot, n-jain1, u-kumar1, vigneshr
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
On Wed, Mar 15, 2023 at 10:57:45AM +0530, Neha Malcom Francis wrote:
> Move to using .env file for setting up environment variables for J721E
> and J7200.
>
> Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/next, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] include: environment: ti: Use .env for environment variables
2023-03-15 5:27 [PATCH v2 1/3] include: environment: ti: Use .env for environment variables Neha Malcom Francis
2023-03-15 5:27 ` [PATCH v2 2/3] include: configs: j721s2_evm: Change to using .env Neha Malcom Francis
2023-03-15 5:27 ` [PATCH v2 3/3] include: configs: j721e_evm: " Neha Malcom Francis
@ 2023-03-16 18:16 ` Tom Rini
2023-03-30 1:54 ` Tom Rini
3 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2023-03-16 18:16 UTC (permalink / raw)
To: Neha Malcom Francis; +Cc: u-boot, n-jain1, u-kumar1, vigneshr
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
On Wed, Mar 15, 2023 at 10:57:43AM +0530, Neha Malcom Francis wrote:
> Add K3 common environment variables to .env. We retain the old-style C
> environment .h files to maintain compatibility with other K3 boards that
> have not moved to using .env yet.
>
> Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] include: environment: ti: Use .env for environment variables
2023-03-15 5:27 [PATCH v2 1/3] include: environment: ti: Use .env for environment variables Neha Malcom Francis
` (2 preceding siblings ...)
2023-03-16 18:16 ` [PATCH v2 1/3] include: environment: ti: Use .env for environment variables Tom Rini
@ 2023-03-30 1:54 ` Tom Rini
3 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2023-03-30 1:54 UTC (permalink / raw)
To: Neha Malcom Francis; +Cc: u-boot, n-jain1, u-kumar1, vigneshr
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
On Wed, Mar 15, 2023 at 10:57:43AM +0530, Neha Malcom Francis wrote:
> Add K3 common environment variables to .env. We retain the old-style C
> environment .h files to maintain compatibility with other K3 boards that
> have not moved to using .env yet.
>
> Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/next, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread