diff options
| author | Nishanth Menon <nm@ti.com> | 2024-02-12 13:47:23 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-02-20 17:57:41 -0500 |
| commit | e41453c999f5182c57dfe1e566a71de55268c12a (patch) | |
| tree | d51f5c61ca3039a424274d9844ce0052b134a51f | |
| parent | c6d065817c825f537ad0162d6c5503f6e251cf1a (diff) | |
| download | u-boot-e41453c999f5182c57dfe1e566a71de55268c12a.zip u-boot-e41453c999f5182c57dfe1e566a71de55268c12a.tar.gz u-boot-e41453c999f5182c57dfe1e566a71de55268c12a.tar.bz2 | |
board: ti: j721s2: 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/j721s2/evm.c | 8 | ||||
| -rw-r--r-- | 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 1220cd8..5a0281d 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 64e3d9d..9a03b9f 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 |