diff options
| author | Nishanth Menon <nm@ti.com> | 2024-01-09 13:15:01 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-20 09:58:32 -0500 |
| commit | ac030e15a93bf87aa28d514a96a0e3bf946f45f2 (patch) | |
| tree | f00a21d36f3af3b0065d2317fd9e925f42ad4683 | |
| parent | de1b4cf998ddf1ca9a3f0d3e1e480915bf265738 (diff) | |
| download | u-boot-ac030e15a93bf87aa28d514a96a0e3bf946f45f2.zip u-boot-ac030e15a93bf87aa28d514a96a0e3bf946f45f2.tar.gz u-boot-ac030e15a93bf87aa28d514a96a0e3bf946f45f2.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.
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Jonathan Humphreys <j-humphreys@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 c541880..ad6ef45 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"}, + {"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 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 |