[U-Boot] [PATCH] powerpc/85xx: Increase fdt address

20 Jul 2016

Loading the fdt at 0xc00000 fails if the uncompressed kernel image is
greater than 12 MiB, which is quite common with modern kernels and
multiplatform defconfigs.  Move fdtaddr to 0x1e00000 which is just under
the ramdiskaddr on most targets.
Signed-off-by: Scott Wood oss@buserror.net
Cc: Peter Tyser ptyser@xes-inc.com
Cc: Dirk Eibach eibach@gdsys.de
Cc: Andy Fleming afleming@gmail.com
Cc: Paul Gortmaker paul.gortmaker@windriver.com
---
 include/configs/B4860QDS.h       | 4 ++--
 include/configs/BSC9131RDB.h     | 2 +-
 include/configs/BSC9132QDS.h     | 2 +-
 include/configs/C29XPCIE.h       | 2 +-
 include/configs/MPC8536DS.h      | 2 +-
 include/configs/MPC8544DS.h      | 2 +-
 include/configs/MPC8548CDS.h     | 2 +-
 include/configs/MPC8572DS.h      | 2 +-
 include/configs/P1010RDB.h       | 2 +-
 include/configs/P1022DS.h        | 2 +-
 include/configs/P1023RDB.h       | 2 +-
 include/configs/P2041RDB.h       | 2 +-
 include/configs/T102xRDB.h       | 2 +-
 include/configs/T1040QDS.h       | 2 +-
 include/configs/T104xRDB.h       | 2 +-
 include/configs/T208xQDS.h       | 2 +-
 include/configs/T208xRDB.h       | 2 +-
 include/configs/T4240QDS.h       | 2 +-
 include/configs/T4240RDB.h       | 2 +-
 include/configs/controlcenterd.h | 2 +-
 include/configs/corenet_ds.h     | 2 +-
 include/configs/cyrus.h          | 2 +-
 include/configs/p1_p2_rdb_pc.h   | 2 +-
 include/configs/p1_twr.h         | 2 +-
 include/configs/sbc8548.h        | 2 +-
 include/configs/xpedite1000.h    | 2 +-
 include/configs/xpedite517x.h    | 2 +-
 include/configs/xpedite520x.h    | 2 +-
 include/configs/xpedite537x.h    | 2 +-
 include/configs/xpedite550x.h    | 2 +-
 30 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 5249751..444a1fc 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -831,7 +831,7 @@ unsigned long get_board_ddr_clk(void);
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=b4860qds/ramdisk.uboot\0"			\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=b4860qds/b4860qds.dtb\0"				\
    "bdev=sda3\0"
@@ -869,7 +869,7 @@ unsigned long get_board_ddr_clk(void);
  "setenv bootargs root=/dev/ram rw "		\
  "console=$consoledev,$baudrate $othbootargs;"	\
  "setenv ramdiskaddr 0x02000000;"		\
- "setenv fdtaddr 0x00c00000;"			\
+ "setenv fdtaddr 0x01e00000;"			\
  "setenv loadaddr 0x1000000;"			\
  "bootm $loadaddr $ramdiskaddr $fdtaddr"
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index b092933..9e56640 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -404,7 +404,7 @@ extern unsigned long get_sdram_size(void);
    "consoledev=ttyS0\0"				\
    "ramdiskaddr=2000000\0"			\
    "ramdiskfile=rootfs.ext2.gz.uboot\0"		\
-	"fdtaddr=c00000\0"				\
+	"fdtaddr=1e00000\0"				\
    "fdtfile=bsc9131rdb.dtb\0"		\
    "bdev=sda1\0"	\
    "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0"	\
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index aaddfca..4ca9fc0 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -648,7 +648,7 @@ combinations. this should be removed later
    "consoledev=ttyS0\0"				\
    "ramdiskaddr=2000000\0"			\
    "ramdiskfile=rootfs.ext2.gz.uboot\0"		\
-	"fdtaddr=c00000\0"				\
+	"fdtaddr=1e00000\0"				\
    "fdtfile=bsc9132qds.dtb\0"		\
    "bdev=sda1\0"	\
    CONFIG_DEF_HWCONFIG\
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 1e5b501..a36e6be 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -531,7 +531,7 @@
    "consoledev=ttyS0\0"				\
    "ramdiskaddr=2000000\0"				\
    "ramdiskfile=rootfs.ext2.gz.uboot\0"		\
-	"fdtaddr=c00000\0"				\
+	"fdtaddr=1e00000\0"				\
    "fdtfile=name/of/device-tree.dtb\0"			\
    "othbootargs=ramdisk_size=600000\0"		\
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 03f17f9..a4e8f55 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -728,7 +728,7 @@
 "consoledev=ttyS0\0"				\
 "ramdiskaddr=2000000\0"			\
 "ramdiskfile=8536ds/ramdisk.uboot\0"		\
-"fdtaddr=c00000\0"				\
+"fdtaddr=1e00000\0"				\
 "fdtfile=8536ds/mpc8536ds.dtb\0"		\
 "bdev=sda3\0"					\
 "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0"
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index f3036c1..58c5c81 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -463,7 +463,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 "consoledev=ttyS0\0"				\
 "ramdiskaddr=2000000\0"			\
 "ramdiskfile=8544ds/ramdisk.uboot\0"		\
-"fdtaddr=c00000\0"				\
+"fdtaddr=1e00000\0"				\
 "fdtfile=8544ds/mpc8544ds.dtb\0"		\
 "bdev=sda3\0"
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 5de8b19..5fbcacf 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -563,7 +563,7 @@ extern unsigned long get_clock_freq(void);
    "consoledev=ttyS1\0"			\
    "ramdiskaddr=2000000\0"			\
    "ramdiskfile=ramdisk.uboot\0"		\
-	"fdtaddr=c00000\0"			\
+	"fdtaddr=1e00000\0"			\
    "fdtfile=mpc8548cds.dtb\0"
#define CONFIG_NFSBOOTCOMMAND						\
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index bb7f38e..5d4d9aa 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -669,7 +669,7 @@
 "consoledev=ttyS0\0"				\
 "ramdiskaddr=2000000\0"			\
 "ramdiskfile=8572ds/ramdisk.uboot\0"		\
-"fdtaddr=c00000\0"				\
+"fdtaddr=1e00000\0"				\
 "fdtfile=8572ds/mpc8572ds.dtb\0"		\
 "bdev=sda3\0"
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 4d08555..e3389f4 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -863,7 +863,7 @@ extern unsigned long get_sdram_size(void);
    "consoledev=ttyS0\0"				\
    "ramdiskaddr=2000000\0"			\
    "ramdiskfile=rootfs.ext2.gz.uboot\0"		\
-	"fdtaddr=c00000\0"				\
+	"fdtaddr=1e00000\0"				\
    "fdtfile=p1010rdb.dtb\0"		\
    "bdev=sda1\0"	\
    "hwconfig=usb1:dr_mode=host,phy_type=utmi\0"	\
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 7457dfc..3f5a558 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -732,7 +732,7 @@
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=rootfs.ext2.gz.uboot\0"			\
-	"fdtaddr=c00000\0"	  			      	\
+	"fdtaddr=1e00000\0"	  			      	\
    "fdtfile=p1022ds.dtb\0"	  				\
    "bdev=sda3\0"		  			      	\
    "hwconfig=esdhc;audclk:12\0"
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index a10310e..27dd6d4 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -376,7 +376,7 @@ extern unsigned long get_clock_freq(void);
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=rootfs.ext2.gz.uboot\0"			\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=p1023rdb.dtb\0"				\
    "othbootargs=ramdisk_size=600000\0"			\
    "bdev=sda1\0"						\
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index b3fb38c..3937a777 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -699,7 +699,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
    "usb_dr_mode=host\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=p2041rdb/ramdisk.uboot\0"			\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=p2041rdb/p2041rdb.dtb\0"			\
    "bdev=sda3\0"
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 778c64b..ffb3461 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -898,7 +898,7 @@ unsigned long get_board_ddr_clk(void);
    "cmp.b $loadaddr $ubootaddr $filesize\0"		\
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "bdev=sda3\0"
#define CONFIG_LINUX					\
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index be4ae71..8b1605f 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -771,7 +771,7 @@ unsigned long get_board_ddr_clk(void);
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=t1040qds/ramdisk.uboot\0"			\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=t1040qds/t1040qds.dtb\0"			\
    "bdev=sda3\0"
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index ed3493b..706aa17 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -874,7 +874,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=" __stringify(RAMDISKFILE) "\0"		\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=" __stringify(FDTFILE) "\0"			\
    "bdev=sda3\0"
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index f48697c..cb071a2 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -841,7 +841,7 @@ unsigned long get_board_ddr_clk(void);
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=t2080qds/ramdisk.uboot\0"			\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=t2080qds/t2080qds.dtb\0"			\
    "bdev=sda3\0"
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index b6be46e0..ab8f8e6 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -793,7 +793,7 @@ unsigned long get_board_ddr_clk(void);
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=t2080rdb/ramdisk.uboot\0"			\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=t2080rdb/t2080rdb.dtb\0"			\
    "bdev=sda3\0"
diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 276428f..ec2f0f3 100644
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -578,7 +578,7 @@ unsigned long get_board_ddr_clk(void);
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=t4240qds/ramdisk.uboot\0"			\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=t4240qds/t4240qds.dtb\0"				\
    "bdev=sda3\0"
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index ab838a8..a6196e6 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -771,7 +771,7 @@ unsigned long get_board_ddr_clk(void);
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=t4240rdb/ramdisk.uboot\0"			\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=t4240rdb/t4240rdb.dtb\0"			\
    "bdev=sda3\0"
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index c60c644..cfab79d 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -449,7 +449,7 @@
    "consoledev=ttyS1\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=rootfs.ext2.gz.uboot\0"			\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=controlcenterd.dtb\0"				\
    "bdev=sda3\0"
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index a06bfe0..e03fd67 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -709,7 +709,7 @@
    "consoledev=ttyS0\0"					\
    "ramdiskaddr=2000000\0"					\
    "ramdiskfile=p4080ds/ramdisk.uboot\0"			\
-	"fdtaddr=c00000\0"					\
+	"fdtaddr=1e00000\0"					\
    "fdtfile=p4080ds/p4080ds.dtb\0"				\
    "bdev=sda3\0"
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 660646e..b607c3b 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -521,7 +521,7 @@
 "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0"			\
 "consoledev=ttyS0\0"					\
 "ramdiskaddr=2000000\0"					\
-"fdtaddr=c00000\0"					\
+"fdtaddr=1e00000\0"					\
 "bdev=sda3\0"
#define CONFIG_HDBOOT					\
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 71b2fa9..01d3cee 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -990,7 +990,7 @@ i2c mw 18 3 __SW_BOOT_MASK 1; reset
 "consoledev=ttyS0\0"	\
 "ramdiskaddr=2000000\0"	\
 "ramdiskfile=rootfs.ext2.gz.uboot\0"	\
-"fdtaddr=c00000\0"	\
+"fdtaddr=1e00000\0"	\
 "bdev=sda1\0" \
 "jffs2nor=mtdblock3\0"	\
 "norbootaddr=ef080000\0"	\
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 9b75afe..699d0d8 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -514,7 +514,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 "consoledev=ttyS0\0"	\
 "ramdiskaddr=2000000\0"	\
 "ramdiskfile=rootfs.ext2.gz.uboot\0"	\
-"fdtaddr=c00000\0"	\
+"fdtaddr=1e00000\0"	\
 "bdev=sda1\0"	\
 "norbootaddr=ef080000\0"	\
 "norfdtaddr=ef040000\0"	\
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index bbd1a63..74f219f 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -596,7 +596,7 @@
 "consoledev=ttyS0\0"				\
 "ramdiskaddr=2000000\0"			\
 "ramdiskfile=uRamdisk\0"			\
-"fdtaddr=c00000\0"				\
+"fdtaddr=1e00000\0"				\
 "fdtfile=sbc8548.dtb\0"
#define CONFIG_NFSBOOTCOMMAND						\
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index 9838fbf..4cc3b4d 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -305,7 +305,7 @@ extern void out32(unsigned int, unsigned long);
    "osfile=/home/user/board.uImage\0"				\
    "fdtfile=/home/user/board.dtb\0"				\
    "ubootfile=/home/user/u-boot.bin\0"				\
-	"fdtaddr=c00000\0"						\
+	"fdtaddr=0x1e00000\0"						\
    "osaddr=0x1000000\0"						\
    "loadaddr=0x1000000\0"						\
    "prog_uboot="CONFIG_PROG_UBOOT"\0"				\
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 86c9b4c..701cad5 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -700,7 +700,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
    "osfile=/home/user/board.uImage\0"				\
    "fdtfile=/home/user/board.dtb\0"				\
    "ubootfile=/home/user/u-boot.bin\0"				\
-	"fdtaddr=c00000\0"						\
+	"fdtaddr=0x1e00000\0"						\
    "osaddr=0x1000000\0"						\
    "loadaddr=0x1000000\0"						\
    "prog_uboot1="CONFIG_PROG_UBOOT1"\0"				\
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index d1847ac..1541f9e 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -484,7 +484,7 @@
    "osfile=/home/user/board.uImage\0"				\
    "fdtfile=/home/user/board.dtb\0"				\
    "ubootfile=/home/user/u-boot.bin\0"				\
-	"fdtaddr=c00000\0"						\
+	"fdtaddr=0x1e00000\0"						\
    "osaddr=0x1000000\0"						\
    "loadaddr=0x1000000\0"						\
    "prog_uboot1="CONFIG_PROG_UBOOT1"\0"				\
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 6a06b0a..d8f29c5 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -555,7 +555,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
    "osfile=/home/user/board.uImage\0"				\
    "fdtfile=/home/user/board.dtb\0"				\
    "ubootfile=/home/user/u-boot.bin\0"				\
-	"fdtaddr=c00000\0"						\
+	"fdtaddr=0x1e00000\0"						\
    "osaddr=0x1000000\0"						\
    "loadaddr=0x1000000\0"						\
    "prog_uboot1="CONFIG_PROG_UBOOT1"\0"				\
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 5b377e3..6409511 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -539,7 +539,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
    "osfile=/home/user/board.uImage\0"				\
    "fdtfile=/home/user/board.dtb\0"				\
    "ubootfile=/home/user/u-boot.bin\0"				\
-	"fdtaddr=c00000\0"						\
+	"fdtaddr=0x1e00000\0"						\
    "osaddr=0x1000000\0"						\
    "loadaddr=0x1000000\0"						\
    "prog_uboot1="CONFIG_PROG_UBOOT1"\0"				\
-- 
2.7.4


    