diff options
| author | Nishanth Menon <nm@ti.com> | 2024-02-12 13:47:22 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-02-20 17:57:40 -0500 |
| commit | c6d065817c825f537ad0162d6c5503f6e251cf1a (patch) | |
| tree | 1ed93d351b7224ad4ff1335c83fead0bc7d4071b | |
| parent | 6e20016924d0a7c9ec491d7e6b4f82dfb4f3bb62 (diff) | |
| download | u-boot-c6d065817c825f537ad0162d6c5503f6e251cf1a.zip u-boot-c6d065817c825f537ad0162d6c5503f6e251cf1a.tar.gz u-boot-c6d065817c825f537ad0162d6c5503f6e251cf1a.tar.bz2 | |
board: ti: j721e: Set fdtfile from C code instead of findfdt script
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.
Reviewed-by: Jonathan Humphreys <j-humphreys@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
| -rw-r--r-- | board/ti/j721e/evm.c | 8 | ||||
| -rw-r--r-- | 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 b77cffc..9dc3ed6 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")) @@ -353,6 +354,12 @@ static int probe_daughtercards(void) #endif #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"}, + {"j7200", "k3-j7200-common-proc-board.dtb"}, + { /* Sentinel. */ } +}; static void setup_board_eeprom_env(void) { char *name = "j721e"; @@ -372,6 +379,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 cb27bf5..38bfd7d 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 |