[PATCH v2 2/3] include: configs: j721s2_evm: Change to using .env
Nikhil M Jain
n-jain1 at ti.com
Fri Mar 17 06:57:00 CET 2023
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 at ti.com>
> Reviewed-by: Tom Rini <trini at 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 at 22_17;" \
> - "gpio clear gpio at 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
More information about the U-Boot
mailing list