arm64: configs: Remove obsolete TI config
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>
diff --git a/board/beagle/beagleboneai64/beagleboneai64.c b/board/beagle/beagleboneai64/beagleboneai64.c
index 1e43d1c..e8d07f1 100644
--- a/board/beagle/beagleboneai64/beagleboneai64.c
+++ b/board/beagle/beagleboneai64/beagleboneai64.c
@@ -73,8 +73,7 @@
{
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);
diff --git a/board/beagle/beagleplay/beagleplay.c b/board/beagle/beagleplay/beagleplay.c
index a21f09e..fae69b3 100644
--- a/board/beagle/beagleplay/beagleplay.c
+++ b/board/beagle/beagleplay/beagleplay.c
@@ -69,8 +69,7 @@
{
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);
diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c
index 6f7e1f8..6a17737 100644
--- a/board/ti/am64x/evm.c
+++ b/board/ti/am64x/evm.c
@@ -158,8 +158,8 @@
#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. */ }
};
diff --git a/board/ti/common/Kconfig b/board/ti/common/Kconfig
index 821f02b..c03aa3a 100644
--- a/board/ti/common/Kconfig
+++ b/board/ti/common/Kconfig
@@ -51,14 +51,3 @@
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.
diff --git a/board/ti/common/fdt_ops.c b/board/ti/common/fdt_ops.c
index 8a33009..47df572 100644
--- a/board/ti/common/fdt_ops.c
+++ b/board/ti/common/fdt_ops.c
@@ -35,17 +35,14 @@
*/
#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);
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 4b5b9dd..1fa78ff 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -368,9 +368,9 @@
#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)
diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c
index b3eea3b..8c8f8e2 100644
--- a/board/ti/j721s2/evm.c
+++ b/board/ti/j721s2/evm.c
@@ -101,8 +101,8 @@
}
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. */ }
};