use default fdtaddr if not set

diff --git a/board/karo/common/fdt.c b/board/karo/common/fdt.c
index 76d1ba3575cfdf07f192b5ef33122380ccd218d7..20333c854abdf0c32b7578d7b8c0b45e08ec105c 100644 (file)
--- a/board/karo/common/fdt.c
+++ b/board/karo/common/fdt.c
@@ -53,8 +53,9 @@ void karo_fdt_move_fdt(void)
        unsigned long fdt_addr = getenv_ulong("fdtaddr", 16, 0);
 
        if (!fdt_addr) {
-               printf("fdtaddr is not set\n");
-               return;
+               fdt_addr = CONFIG_SYS_FDT_ADDR;
+               printf("fdtaddr is not set; using default: %08lx\n",
+                       fdt_addr);
        }
 
        fdt = karo_fdt_load_dtb();

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 3448bf2df657c16f00f080816ffe9c944dc09e9a..ff607c11074fb4c5af918e8b5832eca547908c8b 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -89,6 +89,7 @@
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_DEFAULT_DEVICE_TREE     tx53
 #define CONFIG_ARCH_DEVICE_TREE                mx53
+#define CONFIG_SYS_FDT_ADDR            (PHYS_SDRAM_1 + SZ_16M)
 
 /*
  * Boot Linux
@@ -134,7 +135,6 @@
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
        " video=${video_mode} ${append_bootargs}\0"                     \
        "cpu_clk=800\0"                                                 \
-       "fdtaddr=71000000\0"                                            \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "otg_mode=device\0"                                             \