Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-11 07:24:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm64: configs: Remove obsolete TI config

Browse source 
This config is causing conflicts with how fdtfile variable is
initialized.
For K3 devices, CONFIG_DEFAULT_DEVICE_TREE= "ti/k3-<board>.dtb".
With CONFIG_TI_FDT_FOLDER_PATH also prefixing "ti", fdtfile is then
"ti/ti/k3-<board>.dtb". This variable is updated when fitImage is
booted and fails to boot due to the parsing error "ti/ti/".

Given that there are no other users of this config other than K3 for
now, it is being removed.

Since am64x, j721e and j721s2 also define a DEFAULT_FDT_FILE, update
them to conform to the DEFAULT_DEVICE_TREE standard.

Signed-off-by: Aashvij Shenai <a-shenai@ti.com>
This commit is contained in:
Aashvij Shenai 2025-01-20 14:20:42 +05:30 • committed by Tom Rini
parent 87f9f591be
commit 9057a48af4
7 changed files with 12 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
board/beagle/beagleboneai64/beagleboneai64.c
View file

@ -73,8 +73,7 @@ int board_late_init(void)
{
char fdtfile[50];
snprintf(fdtfile, sizeof(fdtfile), "%s/%s.dtb",
CONFIG_TI_FDT_FOLDER_PATH, CONFIG_DEFAULT_DEVICE_TREE);
snprintf(fdtfile, sizeof(fdtfile), "%s.dtb", CONFIG_DEFAULT_DEVICE_TREE);
env_set("fdtfile", fdtfile);

3
board/beagle/beagleplay/beagleplay.c
View file

@ -69,8 +69,7 @@ int board_late_init(void)
{
char fdtfile[50];
snprintf(fdtfile, sizeof(fdtfile), "%s/%s.dtb",
CONFIG_TI_FDT_FOLDER_PATH, CONFIG_DEFAULT_DEVICE_TREE);
snprintf(fdtfile, sizeof(fdtfile), "%s.dtb", CONFIG_DEFAULT_DEVICE_TREE);
env_set("fdtfile", fdtfile);

4
board/ti/am64x/evm.c
View file

@ -158,8 +158,8 @@ int checkboard(void)
#ifdef CONFIG_BOARD_LATE_INIT
static struct ti_fdt_map ti_am64_evm_fdt_map[] = {
{"am64x_gpevm", "k3-am642-evm.dtb"},
{"am64x_skevm", "k3-am642-sk.dtb"},
{"am64x_gpevm", "ti/k3-am642-evm.dtb"},
{"am64x_skevm", "ti/k3-am642-sk.dtb"},
{ /* Sentinel. */ }
};

11
board/ti/common/Kconfig
View file

@ -51,14 +51,3 @@ config TI_COMMON_CMD_OPTIONS
imply CMD_TIME
imply CMD_USB if USB
config TI_FDT_FOLDER_PATH
string "Location of Folder path where dtb is present"
default "ti/davinci" if ARCH_DAVINCI
default "ti/keystone" if ARCH_KEYSTONE
default "ti/omap" if ARCH_OMAP2PLUS
default "ti" if ARCH_K3
depends on ARCH_DAVINCI || ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3
help
Folder path for kernel device tree default.
This is used along with fdtfile path to locate the kernel
device tree blob.

9
board/ti/common/fdt_ops.c
View file

@ -35,17 +35,14 @@ void ti_set_fdt_env(const char *board_name, struct ti_fdt_map *fdt_map)
*/
#ifdef CONFIG_DEFAULT_FDT_FILE
if (strlen(CONFIG_DEFAULT_FDT_FILE)) {
snprintf(fdtfile, sizeof(fdtfile), "%s/%s",
CONFIG_TI_FDT_FOLDER_PATH, CONFIG_DEFAULT_FDT_FILE);
snprintf(fdtfile, sizeof(fdtfile), "%s", CONFIG_DEFAULT_FDT_FILE);
} else
#endif
{
snprintf(fdtfile, sizeof(fdtfile), "%s/%s.dtb",
CONFIG_TI_FDT_FOLDER_PATH, CONFIG_DEFAULT_DEVICE_TREE);
snprintf(fdtfile, sizeof(fdtfile), "%s.dtb", CONFIG_DEFAULT_DEVICE_TREE);
}
} else {
snprintf(fdtfile, sizeof(fdtfile), "%s/%s", CONFIG_TI_FDT_FOLDER_PATH,
fdt_file_name);
snprintf(fdtfile, sizeof(fdtfile), "%s", fdt_file_name);
}
env_set("fdtfile", fdtfile);

6
board/ti/j721e/evm.c
View file

@ -368,9 +368,9 @@ static int probe_daughtercards(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"},
{"j721e", "ti/k3-j721e-common-proc-board.dtb"},
{"j721e-sk", "ti/k3-j721e-sk.dtb"},
{"j7200", "ti/k3-j7200-common-proc-board.dtb"},
{ /* Sentinel. */ }
};
static void setup_board_eeprom_env(void)

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

@ -101,8 +101,8 @@ int checkboard(void)
}
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"},
{"j721s2", "ti/k3-j721s2-common-proc-board.dtb"},
{"am68-sk", "ti/k3-am68-sk-base-board.dtb"},
{ /* Sentinel. */ }
};