[PATCH V2 05/10] board: ti: am65x: Set fdtfile from C code instead of findfdt script

Nishanth Menon
2024-01-09T19:18:10Z

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.
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-6-nm@ti.com
board/ti/am65x/am65x.env | 3 ---
board/ti/am65x/evm.c | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/board/ti/am65x/am65x.env b/board/ti/am65x/am65x.env
index 286b9c300c05..814374d68cf0 100644
--- a/board/ti/am65x/am65x.env
+++ b/board/ti/am65x/am65x.env
@@ -5,9 +5,6 @@
#include <env/ti/k3_rproc.env>
#endif

-findfdt=
- setenv name_fdt ti/k3-am654-base-board.dtb;
- setenv fdtfile ${name_fdt}
name_kern=Image
console=ttyS2,115200n8
args_all=setenv optargs ${optargs} earlycon=ns16550a,mmio32,0x02800000
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index df209021c1b7..3109c9a2acac 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -22,6 +22,7 @@
#include <linux/printk.h>

#include "../common/board_detect.h"
+#include "../common/fdt_ops.h"

#define board_is_am65x_base_board() board_ti_is("AM6-COMPROCEVM")

@@ -141,6 +142,7 @@ static void setup_board_eeprom_env(void)

invalid_eeprom:
set_board_info_env_am6(name);
+ ti_set_fdt_env(NULL, NULL);
}

static int init_daughtercard_det_gpio(char *gpio_name, struct gpio_desc *desc)
--
2.43.0