From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 9 Jan 2015 11:15:47 +0000 (+0100)
Subject: karo: reset fdtaddr to the original value due to prevent overlap with linux kernel
X-Git-Tag: KARO-TX6-2015-02-05~11
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=cce4dee35eced4de9217a21bb7a6055205d759d6

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 e3c5f521e4..6447c1d5ba 100644
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -109,7 +109,7 @@
 #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
diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 7f6bbd9038..0281d2530d 100644
--- 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_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
diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index ce72d7420c..dff09cecbc 100644
--- 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_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
diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 248776dd41..fad1b28d3a 100644
--- 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_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
diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 6cc28b3c89..8b3d40fbbf 100644
--- 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_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