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

Jon Humphreys
2024-01-12T21:27:45Z

Nishanth Menon <nm@ti.com> writes:

> We now can provide a map and have the standard fdtfile variable set from
> code itself. This allows for bootstd to "just work".
>
> 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.
>
> V1: https://lore.kernel.org/r/20240108173301.2692332-8-nm@ti.com
> board/ti/j721s2/evm.c | 8 ++++++++
> board/ti/j721s2/j721s2.env | 8 --------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c
> index 1220cd84519b..5a0281d6b483 100644
> --- a/board/ti/j721s2/evm.c
> +++ b/board/ti/j721s2/evm.c
> @@ -23,6 +23,7 @@
> #include <dm/root.h>
>
> #include "../common/board_detect.h"
> +#include "../common/fdt_ops.h"
>
> DECLARE_GLOBAL_DATA_PTR;
>
> @@ -114,6 +115,12 @@ int checkboard(void)
> return 0;
> }
>
> +static struct ti_fdt_map ti_j721s2_evm_fdt_map[] = {
> + {"j721s2", "k3-j721s2-common-proc-board.dtb"},
> + {"am68-sk", "k3-am68-sk-base-board.dtb"},
> + { /* Sentinel. */ }
> +};
> +
> static void setup_board_eeprom_env(void)
> {
> char *name = "j721s2";
> @@ -131,6 +138,7 @@ static void setup_board_eeprom_env(void)
>
> invalid_eeprom:
> set_board_info_env_am6(name);
> + ti_set_fdt_env(name, ti_j721s2_evm_fdt_map);
> }
>
> static void setup_serial(void)
> diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env
> index 64e3d9da85f0..9a03b9f30aee 100644
> --- a/board/ti/j721s2/j721s2.env
> +++ b/board/ti/j721s2/j721s2.env
> @@ -7,14 +7,6 @@
> #include <env/ti/k3_rproc.env>
> #endif
>
> -default_device_tree=ti/k3-j721s2-common-proc-board.dtb
> -findfdt=
> - setenv name_fdt ${default_device_tree};
> - if test $board_name = j721s2; then \
> - setenv name_fdt ti/k3-j721s2-common-proc-board.dtb; fi;
> - if test $board_name = am68-sk; then
> - setenv name_fdt ti/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
> --
> 2.43.0

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