Re: [PATCH V2 02/10] board: ti: am62ax: Set fdtfile from C code instead of findfdt script

Jon Humphreys
2024-01-12T21:26:56Z

Nishanth Menon <nm@ti.com> writes:

> Stop using the findfdt script and switch to setting the fdtfile from
> C code.
>
> While at this, replace findfdt in environment with a warning as it is
> no longer needed
>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
> Changes from V1: None.
> I have retained the central call ti_set_fdt_env() to retain the
> population of fdtfile name using the CONFIG fall back logic and the
> population of (now deprecated) legacy variables for downstream script
> users.
>
> V1: https://lore.kernel.org/r/20240108173301.2692332-3-nm@ti.com
>
> board/ti/am62ax/am62ax.env | 1 -
> board/ti/am62ax/evm.c | 10 ++++++++++
> configs/am62ax_evm_a53_defconfig | 1 +
> 3 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/board/ti/am62ax/am62ax.env b/board/ti/am62ax/am62ax.env
> index a6d967e982d4..334374abb73e 100644
> --- a/board/ti/am62ax/am62ax.env
> +++ b/board/ti/am62ax/am62ax.env
> @@ -1,5 +1,4 @@
> #include <env/ti/ti_common.env>
> -#include <env/ti/default_findfdt.env>
> #include <env/ti/mmc.env>
>
> name_kern=Image
> diff --git a/board/ti/am62ax/evm.c b/board/ti/am62ax/evm.c
> index cd3360a43029..62d3664936e7 100644
> --- a/board/ti/am62ax/evm.c
> +++ b/board/ti/am62ax/evm.c
> @@ -13,6 +13,8 @@
> #include <fdt_support.h>
> #include <spl.h>
>
> +#include "../common/fdt_ops.h"
> +
> int board_init(void)
> {
> return 0;
> @@ -27,3 +29,11 @@ int dram_init_banksize(void)
> {
> return fdtdec_setup_memory_banksize();
> }
> +
> +#ifdef CONFIG_BOARD_LATE_INIT
> +int board_late_init(void)
> +{
> + ti_set_fdt_env(NULL, NULL);
> + return 0;
> +}
> +#endif
> diff --git a/configs/am62ax_evm_a53_defconfig b/configs/am62ax_evm_a53_defconfig
> index 38083586a3ec..e5fcd8cc5b6f 100644
> --- a/configs/am62ax_evm_a53_defconfig
> +++ b/configs/am62ax_evm_a53_defconfig
> @@ -24,6 +24,7 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
> CONFIG_BOOTSTD_FULL=y
> CONFIG_BOOTSTD_DEFAULTS=y
> CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
> +CONFIG_BOARD_LATE_INIT=y
> CONFIG_SPL_MAX_SIZE=0x58000
> CONFIG_SPL_PAD_TO=0x0
> CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> --
> 2.43.0

Reviewed-by: Jonathan Humphreys <j-humphreys@ti.com>