Nishanth Menon <n...@ti.com> writes: > Stop using the findfdt script and switch to setting the fdtfile from C > code. > > Signed-off-by: Nishanth Menon <n...@ti.com> > --- > Changes from V1: > * Just macro name change s/TI_EVM_FDT_FOLDER_PATH/TI_FDT_FOLDER_PATH > * Commit message update to drop the "warning added to findfdt" since > that is not done. > > I have retained the explicit setting of fdtfile to remove dependency on > TI evm specific logic. Also, the dynamic population of fdtfile instead > of env_set("fdtfile", "ti/k3-am625-beagleplay.dtb") to allow for the > upcoming board variants to be able to configure the dtb name via a > config fragment. > > V1: https://lore.kernel.org/r/20240108173301.2692332-10...@ti.com > board/beagle/beagleplay/beagleplay.c | 14 ++++++++++++++ > board/beagle/beagleplay/beagleplay.env | 1 - > configs/am62x_beagleplay_a53_defconfig | 3 ++- > 3 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/board/beagle/beagleplay/beagleplay.c > b/board/beagle/beagleplay/beagleplay.c > index 1c376dea372f..20819ecf45b4 100644 > --- a/board/beagle/beagleplay/beagleplay.c > +++ b/board/beagle/beagleplay/beagleplay.c > @@ -27,3 +27,17 @@ int dram_init_banksize(void) > { > return fdtdec_setup_memory_banksize(); > } > + > +#ifdef CONFIG_BOARD_LATE_INIT > +int board_late_init(void) > +{ > + char fdtfile[50]; > + > + snprintf(fdtfile, sizeof(fdtfile), "%s/%s.dtb", > + CONFIG_TI_FDT_FOLDER_PATH, CONFIG_DEFAULT_DEVICE_TREE); > + > + env_set("fdtfile", fdtfile); > + > + return 0; > +} > +#endif > diff --git a/board/beagle/beagleplay/beagleplay.env > b/board/beagle/beagleplay/beagleplay.env > index 4f0a94a8113e..647b25d14c8e 100644 > --- a/board/beagle/beagleplay/beagleplay.env > +++ b/board/beagle/beagleplay/beagleplay.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/configs/am62x_beagleplay_a53_defconfig > b/configs/am62x_beagleplay_a53_defconfig > index 0be20045a974..1f43891d10bb 100644 > --- a/configs/am62x_beagleplay_a53_defconfig > +++ b/configs/am62x_beagleplay_a53_defconfig > @@ -33,7 +33,8 @@ CONFIG_AUTOBOOT_KEYED=y > CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" > CONFIG_AUTOBOOT_DELAY_STR="d" > CONFIG_AUTOBOOT_STOP_STR=" " > -CONFIG_BOOTCOMMAND="run set_led_state_start_load;run findfdt; run envboot; > bootflow scan -lb;run set_led_state_fail_load" > +CONFIG_BOOTCOMMAND="run set_led_state_start_load; run envboot; bootflow scan > -lb;run set_led_state_fail_load" > +CONFIG_BOARD_LATE_INIT=y > CONFIG_SPL_MAX_SIZE=0x58000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > CONFIG_SPL_BSS_START_ADDR=0x80c80000 > -- > 2.43.0
Reviewed-by: Jonathan Humphreys <j-humphr...@ti.com>