[PATCH 13/18] configs: k3: make consistent bootcmd across all k3 socs

[Nikhil M Jain]

Hi Manorit,

On 14/07/23 11:22, Manorit Chawdhry wrote:
> From: Kamlesh Gurudasani <kamlesh at ti.com>
> 
> Default to common bootcmd that is set across all k3 devices.
> 
> Signed-off-by: Manorit Chawdhry <m-chawdhry at ti.com>
> Signed-off-by: Kamlesh Gurudasani <kamlesh at ti.com>
> ---
>   configs/am62ax_evm_a53_defconfig | 1 +
>   configs/am62x_evm_a53_defconfig  | 3 +--
>   configs/am64x_evm_a53_defconfig  | 2 +-
>   configs/j7200_evm_a72_defconfig  | 2 +-
>   configs/j721e_evm_a72_defconfig  | 2 +-
>   configs/j721s2_evm_a72_defconfig | 2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/configs/am62ax_evm_a53_defconfig b/configs/am62ax_evm_a53_defconfig
> index 76ec5ed40463..773cf3a591c6 100644
> --- a/configs/am62ax_evm_a53_defconfig
> +++ b/configs/am62ax_evm_a53_defconfig
> @@ -23,6 +23,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
>   CONFIG_SPL_LOAD_FIT=y
>   CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
>   CONFIG_DISTRO_DEFAULTS=y
> +CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
>   CONFIG_SPL_MAX_SIZE=0x58000
>   CONFIG_SPL_PAD_TO=0x0
>   CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig
> index 7c3bc184cf73..de90663383ec 100644
> --- a/configs/am62x_evm_a53_defconfig
> +++ b/configs/am62x_evm_a53_defconfig
> @@ -29,8 +29,7 @@ CONFIG_SPL_SPI=y
>   CONFIG_SPL_LOAD_FIT=y
>   CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
>   CONFIG_DISTRO_DEFAULTS=y
> -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; setenv fdtfile ti/${name_fdt}; run distro_bootcmd"
> -CONFIG_SPL_MAX_SIZE=0x58000

Please add this config back.

> +CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
>   CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>   CONFIG_SPL_BSS_START_ADDR=0x80c80000
>   CONFIG_SPL_BSS_MAX_SIZE=0x80000
> diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig
> index 123a70049aeb..f792b5859e94 100644
> --- a/configs/am64x_evm_a53_defconfig
> +++ b/configs/am64x_evm_a53_defconfig
> @@ -33,7 +33,7 @@ CONFIG_SPL_SPI=y
>   CONFIG_SPL_LOAD_FIT=y
>   CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
>   CONFIG_DISTRO_DEFAULTS=y
> -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_kern_${boot}; run get_fdt_${boot}; run run_kern"
> +CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
>   CONFIG_BOARD_LATE_INIT=y
>   CONFIG_SPL_MAX_SIZE=0x180000
>   CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> diff --git a/configs/j7200_evm_a72_defconfig b/configs/j7200_evm_a72_defconfig
> index 0abc865cb5d5..c68d52537e54 100644
> --- a/configs/j7200_evm_a72_defconfig
> +++ b/configs/j7200_evm_a72_defconfig
> @@ -33,7 +33,7 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
>   CONFIG_OF_BOARD_SETUP=y
>   CONFIG_OF_SYSTEM_SETUP=y
>   CONFIG_DISTRO_DEFAULTS=y
> -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run main_cpsw0_qsgmii_phyinit; run boot_rprocs; if test ${boot_fit} -eq 1; then run get_fit_${boot}; run get_overlaystring; run run_fit; else; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; fi;"
> +CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
>   CONFIG_LOGLEVEL=7
>   CONFIG_SPL_MAX_SIZE=0xc0000
>   CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
> index 825dbd865cd9..525f150e91d9 100644
> --- a/configs/j721e_evm_a72_defconfig
> +++ b/configs/j721e_evm_a72_defconfig
> @@ -33,7 +33,7 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
>   CONFIG_OF_BOARD_SETUP=y
>   CONFIG_OF_SYSTEM_SETUP=y
>   CONFIG_DISTRO_DEFAULTS=y
> -CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run main_cpsw0_qsgmii_phyinit; run boot_rprocs; if test ${boot_fit} -eq 1; then run get_fit_${boot}; run get_overlaystring; run run_fit; else; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; fi;"
> +CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
>   CONFIG_LOGLEVEL=7
>   CONFIG_SPL_MAX_SIZE=0xc0000
>   CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> diff --git a/configs/j721s2_evm_a72_defconfig b/configs/j721s2_evm_a72_defconfig
> index 13c1a0cdbe9b..d59f3156d105 100644
> --- a/configs/j721s2_evm_a72_defconfig
> +++ b/configs/j721s2_evm_a72_defconfig
> @@ -32,7 +32,7 @@ CONFIG_SPL_LOAD_FIT=y
>   CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
>   CONFIG_OF_SYSTEM_SETUP=y
>   CONFIG_DISTRO_DEFAULTS=y
> -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run boot_rprocs; if test ${boot_fit} -eq 1; then run get_fit_${boot}; run get_overlaystring; run run_fit; else; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; fi;"
> +CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
>   CONFIG_LOGLEVEL=7
>   CONFIG_SPL_MAX_SIZE=0xc0000
>   CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> 

Thanks,
Nikhil