karo: reset fdtaddr to the original value due to prevent overlap with linux kernel

Moving the FDT to low RAM leaves only 28KiB between the FDT start
address and the standard address to which the linux image is unpacked
during boot. Thus the linux kernel will overwrite portions of the FDT
if this is larger than 28KiB (which is already the case for TX6).

Put the FDT at the original address 16MiB from RAM start to prevent
this.

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index e3c5f521e47e0e61589a73a088a8388b1d0b36dd..6447c1d5ba5cfdb3521e2ebc57ffa4d24b69c277 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -109,7 +109,7 @@
 #else
 #define CONFIG_LOADADDR                        43000000
 #endif
 #else
 #define CONFIG_LOADADDR                        43000000
 #endif

-#define CONFIG_FDTADDR                 40001000
+#define CONFIG_FDTADDR                 41000000

 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 7f6bbd90384ae564c7830df13aeae884dd4a0f2d..0281d2530de0852753d1a17dcf122e2b1e75969a 100644 (file)
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -108,7 +108,7 @@
 #define CONFIG_BOOTARGS                        "init=/linuxrc console=ttyO0,115200 ro debug panic=1"
 #define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #define CONFIG_LOADADDR                        83000000
 #define CONFIG_BOOTARGS                        "init=/linuxrc console=ttyO0,115200 ro debug panic=1"
 #define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #define CONFIG_LOADADDR                        83000000

-#define CONFIG_FDTADDR                 80001000
+#define CONFIG_FDTADDR                 81000000

 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M

diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index ce72d7420ccf1fd8d30b1415bbe1575e010b8a80..dff09cecbc69cadc084a16e6c0db1b9bf904f822 100644 (file)
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -106,7 +106,7 @@
 #define CONFIG_BOOTARGS                        "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
 #define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #define CONFIG_LOADADDR                        94000000
 #define CONFIG_BOOTARGS                        "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
 #define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #define CONFIG_LOADADDR                        94000000

-#define CONFIG_FDTADDR                 90001000
+#define CONFIG_FDTADDR                 91000000

 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 248776dd412925ff3fbd9cc7d06361af41ea3e59..fad1b28d3af4bb41b658eb0dcfdc02fc10d24315 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -101,7 +101,7 @@
 #define CONFIG_BOOTARGS                        "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
 #define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #define CONFIG_LOADADDR                        78000000
 #define CONFIG_BOOTARGS                        "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
 #define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #define CONFIG_LOADADDR                        78000000

-#define CONFIG_FDTADDR                 70001000
+#define CONFIG_FDTADDR                 71000000

 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 6cc28b3c89ab992d6b03c9f8f0796b2c2508a8d9..8b3d40fbbfaa107790b0c5576017289c97593393 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -131,7 +131,7 @@
 #define CONFIG_DELAY_ENVIRONMENT
 #endif /* CONFIG_MFG */
 #define CONFIG_LOADADDR                        18000000
 #define CONFIG_DELAY_ENVIRONMENT
 #endif /* CONFIG_MFG */
 #define CONFIG_LOADADDR                        18000000

-#define CONFIG_FDTADDR                 10001000
+#define CONFIG_FDTADDR                 11000000

 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_HW_WATCHDOG