board: ti: am64,j721*: use correct fdt if eeprom detection fails

We currently provide default board names for each board in their
respective evm.c file. However for custom boards, this behaviour
overwrites the default DT as set in the defconfig
(CONFIG_DEFAULT_FDT_FILE or CONFIG_DEFAULT_DEVICE_TREE).

This patch changes the default name to be NULL which prevents this
overwrite and allows ti_set_fdt_env to instead fallback to the correct
DT as set in Kconfig.

Signed-off-by: Anshul Dalal <anshuld@ti.com>
Reviewed-by: Bryan Brattlof <bb@ti.com>

diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c
index 25076a8a5886e2161ef6572aab7e84fc58ff1f06..c6ddc44d14c5ade9b7533956f2912b6c1c788d75 100644 (file)
--- a/board/ti/am64x/evm.c
+++ b/board/ti/am64x/evm.c
@@ -138,7 +138,7 @@ static struct ti_fdt_map ti_am64_evm_fdt_map[] = {
 
 static void setup_board_eeprom_env(void)
 {
-       char *name = "am64x_gpevm";
+       char *name = NULL;
 
        if (do_board_detect())
                goto invalid_eeprom;

diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index d9be9ce2ed73bee88f5eb9d5c061532db4f26671..881392bd963a57c555cb70dfc47780ec74a95ceb 100644 (file)
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -363,7 +363,7 @@ static struct ti_fdt_map ti_j721e_evm_fdt_map[] = {
 };
 static void setup_board_eeprom_env(void)
 {
-       char *name = "j721e";
+       char *name = NULL;
 
        if (do_board_detect())
                goto invalid_eeprom;

diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c
index b6d1964146d178c565fa645be101a1cabc8cfc37..92d5c849864388ee9484883d35e6c7e81f588225 100644 (file)
--- a/board/ti/j721s2/evm.c
+++ b/board/ti/j721s2/evm.c
@@ -103,7 +103,7 @@ static struct ti_fdt_map ti_j721s2_evm_fdt_map[] = {
 
 static void setup_board_eeprom_env(void)
 {
-       char *name = "j721s2";
+       char *name = NULL;
 
        if (do_board_detect())
                goto invalid_eeprom;