Xilinx: ARM: Changed environment to load device trees

The Linux kernel is now defaulting to device tree mode such
that a device tree blob is to be loaded into memory when
loading Linux from each of the flash memory types.

This only changed the commands in the environment for
each flash to also load the device tree blob.

I found that the commands can get too long such that
u-boot gives an error so they are not as verbose as
previously.

diff --git a/include/configs/xpele.h b/include/configs/xpele.h
index b9e6579bb1733488dcea00bffe3dd8d7399d9201..bdbfebf69d88be52ed459a90ab5c70a7a604346b 100644 (file)
--- a/include/configs/xpele.h
+++ b/include/configs/xpele.h
@@ -29,20 +29,23 @@
        "nand_kernel_size=0x400000\0"   \
        "nand_ramdisk_size=0x400000\0"  \
        "bootcmd=run modeboot\0"        \
-       "norboot=echo Copying Linux from NOR flash to RAM...;                   \
-                           cp 0xE2100000 0x8000 ${kernel_size};                \
-                           echo Copying ramdisk from NOR flash to RAM...;      \
-                           cp 0xE3000000 0x800000 ${ramdisk_size};             \
-                           go 0x8000\0"                                        \
-       "qspiboot=echo Copying Linux from QSPI flash to RAM...;                 \
-                           cp 0xFC100000 0x8000 ${kernel_size};                \
-                           echo Copying ramdisk from QSPI flash to RAM...;     \
-                           cp 0xFC800000 0x800000 ${ramdisk_size};             \
-                           go 0x8000\0"                                        \
-       "nandboot=echo Copying Linux from NAND flash to RAM...;                 \
-                           nand read 0x8000 0x200000 ${nand_kernel_size};      \
-                           echo Copying ramdisk from NAND flash to RAM...;     \
-                           nand read 0x800000 0x900000 ${nand_ramdisk_size};   \
+       "norboot=echo Copying Linux from NOR flash to RAM...; \
+                           cp 0xE2100000 0x8000 ${kernel_size}; \
+                           cp 0xE2600000 0x1000000 0x8000; \
+                           echo Copying ramdisk...; \
+                           cp 0xE3000000 0x800000 ${ramdisk_size}; \
+                           go 0x8000\0" \
+       "qspiboot=echo Copying Linux from QSPI flash to RAM...; \
+                           cp 0xFC100000 0x8000 ${kernel_size}; \
+                           cp 0xFC600000 0x1000000 0x8000; \
+                           echo Copying ramdisk...; \
+                           cp 0xFC800000 0x800000 ${ramdisk_size};\
+                           go 0x8000\0" \
+       "nandboot=echo Copying Linux from NAND flash to RAM...; \
+                           nand read 0x8000 0x200000 ${nand_kernel_size}; \
+                           nand read 0x1000000 0x700000 0x20000; \
+                           echo Copying ramdisk...; \
+                           nand read 0x800000 0x900000 ${nand_ramdisk_size}; \
                            go 0x8000\0"
 
 #undef CONFIG_PELE_XIL_LQSPI