Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 13:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

board: ti: j721s2: Set fdtfile from C code instead of findfdt script

Browse source 
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>
This commit is contained in:
Nishanth Menon 2024-02-12 13:47:23 -06:00 committed by Tom Rini
parent c6d065817c
commit e41453c999
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
board/ti/j721s2/evm.c
View file

@ -23,6 +23,7 @@
#include <dm/root.h> #include <dm/root.h>
#include "../common/board_detect.h" #include "../common/board_detect.h"
#include "../common/fdt_ops.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -114,6 +115,12 @@ int checkboard(void)
return 0; 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) static void setup_board_eeprom_env(void)
{ {
char *name = "j721s2"; char *name = "j721s2";
@ -131,6 +138,7 @@ static void setup_board_eeprom_env(void)
invalid_eeprom: invalid_eeprom:
set_board_info_env_am6(name); set_board_info_env_am6(name);
ti_set_fdt_env(name, ti_j721s2_evm_fdt_map);
} }
static void setup_serial(void) static void setup_serial(void)

8
board/ti/j721s2/j721s2.env
View file

@ -7,14 +7,6 @@
#include <env/ti/k3_rproc.env> #include <env/ti/k3_rproc.env>
#endif #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 name_kern=Image
console=ttyS2,115200n8 console=ttyS2,115200n8
args_all=setenv optargs earlycon=ns16550a,mmio32,0x02880000 args_all=setenv optargs earlycon=ns16550a,mmio32,0x02880000