On 08/01/2024 19:32, Nishanth Menon wrote:
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
board/ti/j721e/evm.c | 8 ++++++++ board/ti/j721e/j721e.env | 10 ---------- 2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index c541880107ec..ad6ef4553e04 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -16,6 +16,7 @@ #include <dm.h>
#include "../common/board_detect.h" +#include "../common/fdt_ops.h"
#define board_is_j721e_som() (board_ti_k3_is("J721EX-PM1-SOM") || \ board_ti_k3_is("J721EX-PM2-SOM")) @@ -424,6 +425,12 @@ void configure_serdes_sierra(void) }
#ifdef CONFIG_BOARD_LATE_INIT +static struct ti_fdt_map ti_j721e_evm_fdt_map[] = {
- {"j721e", "k3-j721e-common-proc-board.dtb"},
- {"j721e-sk", "k3-j721e-sk.dtb"},
You missed "j721e-eaik"
- {"j7200", "k3-j7200-common-proc-board.dtb"},
- { /* Sentinel. */ }
+}; static void setup_board_eeprom_env(void) { char *name = "j721e"; @@ -443,6 +450,7 @@ static void setup_board_eeprom_env(void)
invalid_eeprom: set_board_info_env_am6(name);
- ti_set_fdt_env(name, ti_j721e_evm_fdt_map);
}
static void setup_serial(void) diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env index cb27bf5e2b24..38bfd7d49634 100644 --- a/board/ti/j721e/j721e.env +++ b/board/ti/j721e/j721e.env @@ -7,16 +7,6 @@ #include <env/ti/k3_rproc.env> #endif
-default_device_tree=ti/k3-j721e-common-proc-board.dtb -findfdt=
- setenv name_fdt ${default_device_tree};
- if test $board_name = j721e; then
setenv name_fdt ti/k3-j721e-common-proc-board.dtb; fi;- if test $board_name = j7200; then
setenv name_fdt ti/k3-j7200-common-proc-board.dtb; fi;- if test $board_name = j721e-eaik || test $board_name = j721e-sk; then
setenv name_fdt ti/k3-j721e-sk.dtb; fi;- setenv fdtfile ${name_fdt}
name_kern=Image console=ttyS2,115200n8 args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000