karo: tx6: prevent DTB from either being out of reach of kernel or overwritten during...

The current setting of fdtaddr and fdt_high has proven to be
inappropriate in that either the FDT may be out of reach of the
kernel or may be overwritten by the uncompressing Linux kernel.

Set fdt_high to an offset of 256MiB from SDRAM start, so that it is
valid for any board regardless of memory size while preventing the
described problems.

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 146f22040b1a33ba7dfd6a084db5474773814cb1..a5bab22582307fcc3059452706a469803eac792a 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -99,10 +99,10 @@
 #define PHYS_SDRAM_1_SIZE              (UL(CONFIG_SYS_SDRAM_CHIP_SIZE) * \
                                         SZ_1M / 32 *                   \
                                         CONFIG_SYS_SDRAM_BUS_WIDTH)
 #define PHYS_SDRAM_1_SIZE              (UL(CONFIG_SYS_SDRAM_CHIP_SIZE) * \
                                         SZ_1M / 32 *                   \
                                         CONFIG_SYS_SDRAM_BUS_WIDTH)

-#if PHYS_SDRAM_1_SIZE > SZ_1G
-#define FDT_HIGH_STR                   "fdt_high=ffffffff\0"
+#ifndef CONFIG_BOARD_TX6UL
+#define FDT_HIGH_ADDR_STR              "20000000"

 #else
 #else

-#define FDT_HIGH_STR                   ""
+#define FDT_HIGH_ADDR_STR              "90000000"

 #endif
 
 #ifdef CONFIG_SOC_MX6Q
 #endif
 
 #ifdef CONFIG_SOC_MX6Q


@@ -237,8 +237,8 @@
        EMMC_BOOT_PART_STR                                              \
        EMMC_BOOT_ACK_STR                                               \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
        EMMC_BOOT_PART_STR                                              \
        EMMC_BOOT_ACK_STR                                               \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \

-       FDT_HIGH_STR                                                    \

        FDTSAVE_CMD_STR                                                 \
        FDTSAVE_CMD_STR                                                 \

+       "fdt_high=" FDT_HIGH_ADDR_STR "\0"                              \

        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "nfsroot=/tftpboot/rootfs\0"                                    \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "nfsroot=/tftpboot/rootfs\0"                                    \