]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
powerpc/85xx: Increase fdt address
authorScott Wood <oss@buserror.net>
Tue, 19 Jul 2016 22:52:06 +0000 (17:52 -0500)
committerYork Sun <york.sun@nxp.com>
Thu, 21 Jul 2016 18:11:44 +0000 (11:11 -0700)
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>
Acked-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Reviewed-by: York Sun <york.sun@nxp.com>
30 files changed:
include/configs/B4860QDS.h
include/configs/BSC9131RDB.h
include/configs/BSC9132QDS.h
include/configs/C29XPCIE.h
include/configs/MPC8536DS.h
include/configs/MPC8544DS.h
include/configs/MPC8548CDS.h
include/configs/MPC8572DS.h
include/configs/P1010RDB.h
include/configs/P1022DS.h
include/configs/P1023RDB.h
include/configs/P2041RDB.h
include/configs/T102xRDB.h
include/configs/T1040QDS.h
include/configs/T104xRDB.h
include/configs/T208xQDS.h
include/configs/T208xRDB.h
include/configs/T4240QDS.h
include/configs/T4240RDB.h
include/configs/controlcenterd.h
include/configs/corenet_ds.h
include/configs/cyrus.h
include/configs/p1_p2_rdb_pc.h
include/configs/p1_twr.h
include/configs/sbc8548.h
include/configs/xpedite1000.h
include/configs/xpedite517x.h
include/configs/xpedite520x.h
include/configs/xpedite537x.h
include/configs/xpedite550x.h

index 2c3c4ac093305e85bec57fa4716e5a21fe6c9677..5de9bb72cf3359acb9c1d98868e0ae18b814eae0 100644 (file)
@@ -830,7 +830,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"
 
@@ -868,7 +868,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"
 
index 0a9d8a64aff8ace7105bb402ebdcf683c9f2297b..f2a7c69ad2c72d5a422aa89cf477bcca05a681a4 100644 (file)
@@ -403,7 +403,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"    \
index 756beec61b775d79085a5e2bff8e5793d56afa0e..4744f08c9ad56729bb4fae85b3f53b62e73b71c5 100644 (file)
@@ -647,7 +647,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\
index 69a9798540efe1c33fd8674abcd71587f7327194..cc5359fe44c2ca2265d4117dd28d67779d063ac0 100644 (file)
        "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"             \
 
index 7c19ff84bccaab3fe1b237a08396841e5380cc67..874261a146d66768caa413d2efd1eab956bf91c7 100644 (file)
 "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"
index 321f71e80f1abb4dfbf67e309601a5e7f9ef6e42..cd1043204f10e03167b03450d4b8ca347c7d7089 100644 (file)
@@ -462,7 +462,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"
 
index e73be48d5189402127be4e2b618d1963a0db4657..b81a4eddd784c53da3c2ca894390992ce38b77e7 100644 (file)
@@ -562,7 +562,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                                          \
index 2e6989f81602403f53e5137f2dfa1270a1d2dacf..390b1ef61b0c40b533ee910fe631a91a44bf2cc9 100644 (file)
 "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"
 
index 5384584c184749e975165240db5d2a9b194bdea0..5b6b4bd5d8098519c245885aa4fadaf0d611f0db 100644 (file)
@@ -862,7 +862,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"    \
index bdf0323bfc764959be60a8c7518f077d9c520b34..fe19957c39ee882b63186ece62a7d82a59c95e0a 100644 (file)
        "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"
index 07a594d15dbe3b66deea228fc9cc8acf4d6cc7b9..d044c7bc2eeb9f345565dff9a6fa3358376c8ba7 100644 (file)
@@ -375,7 +375,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"                                           \
index 24e54318452d5426ec9a1cc01492e0ef32edb2aa..8479410ee749eda77809ce0ce45f274efd061680 100644 (file)
@@ -698,7 +698,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"
 
index 06d1d0fc497148112347e585f7ee32a0f8c23096..25a0652b5b05bd9421b1feeec1de3c62db753c14 100644 (file)
@@ -897,7 +897,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                                   \
index 9f5063c33378438b607ff6be1349e2178beaf1d7..7ce6420d4863ad134af61b14d3a5c636d002bbf6 100644 (file)
@@ -770,7 +770,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"
 
index 2ec1962f5f817bd8828663c0a9574afb12ace018..ae1acbdd0415ff236e7c11555822f924906be53d 100644 (file)
@@ -900,7 +900,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"
 
index 1f07a83a1a742800b9c2882142b67dd4a0355fb8..621755526a0271a7596be36a1c579b6a4625c8b9 100644 (file)
@@ -840,7 +840,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"
 
index 0ded41e0dd5229810d6dc6de755c8d08972fdcb5..7a7de9703fc24c97d6f9c358f3e37ae872ec6e46 100644 (file)
@@ -792,7 +792,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"
 
index f075dfb5f05859f21c223dbc3f217930134f6a08..85aab183ff009d51659627e1c61a5099d509acfe 100644 (file)
@@ -577,7 +577,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"
 
index 9ba69a1d1237c1b92470bc77d291e3cdb4a70fdc..4133165ea8225f97118aa51d78b0c83da9ac0e2b 100644 (file)
@@ -770,7 +770,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"
 
index 30c283185bcba7be66e7f4c841d69bc2d2aedbc7..44e115da6d9c915935c82899a11567fac12b6f5f 100644 (file)
        "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"
 
index 4a770b05460a14c8a84cb924ea6731bef79fb75a..0c99e9f5e6d4d3d2ee80188a6eb41e838dd101b6 100644 (file)
        "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"
 
index 708d5f730ddc867361d8d59b1809d2c3bf7d9e08..da38709fbf5ea63c64d84bad1361f86e1e431834 100644 (file)
 "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                                  \
index 4f22d12a3f2bbb3c676e41d9390ff97d3f2dfe9b..3d3342141dda072e8eed5f5e9fa1a30b077cc72c 100644 (file)
@@ -989,7 +989,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"       \
index 30bfbf44f5c3354632e3d8680cd8cc0427ce5fea..79e4991563af68861330c32e33ee98e2873205c2 100644 (file)
@@ -513,7 +513,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"        \
index 46766a6779752bbc40beff4c7ad9b974178fc185..ec9ad4556785a8561d45dddc89d267076d2caee3 100644 (file)
 "consoledev=ttyS0\0"                           \
 "ramdiskaddr=2000000\0"                        \
 "ramdiskfile=uRamdisk\0"                       \
-"fdtaddr=c00000\0"                             \
+"fdtaddr=1e00000\0"                            \
 "fdtfile=sbc8548.dtb\0"
 
 #define CONFIG_NFSBOOTCOMMAND                                          \
index 73c8d5b6fd4d230fcaf160166546d1cd9d9d5add..bc91714cf7bf98e251ecb5b7ddf872e33c78d347 100644 (file)
@@ -304,7 +304,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"                              \
index 9f3158d056bb36be5c3cf9c24336d1ca01a76068..eaea33babfb9b25997fbca24d1703e79810041e5 100644 (file)
@@ -699,7 +699,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"                            \
index a418fc5c9e267071e7622f0aa5a0f23f5e693504..f7cfc9ea865fbab6873d9f15c48bcdfb9fc573dd 100644 (file)
        "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"                            \
index 36df6682b280492f2708dad07fa8636c197870e3..3306e44a6d0d6f26d0df5c62b65fc043fbdbcb81 100644 (file)
@@ -554,7 +554,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"                            \
index 1794ba10a37bf4f3b59cbf0adf94ac822ddb141c..276dde7d3e32ed3f09ea051e4f03581bb87f9250 100644 (file)
@@ -538,7 +538,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"                            \