board/avnet: swap ramdisk and DT load addresses in U-Boot environment

As reported in bug #9091, the U-Boot environment we provide for the
Microzed and Zedboard platforms loads the ramdisk at 0x2000000 and the
DT at 0x3000000. This means that a large enough ramdisk overwrites the
DT. It makes more sense to load the DT at 0x2000000 and the ramdisk at
0x3000000.

Reported-by:  Michael Monaghan <michaellmonaghan@gmail.com>
Tested-by: Michael Monaghan <michaellmonaghan@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch b/board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch
index 6a7725fcde792c45a1f3ec6c2d63fcb55ece42c0..b9d0c383e4950374858f62b0fea886a92c947495 100644 (file)
--- a/board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch
+++ b/board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch
@@ -29,9 +29,9 @@ Signed-off-by: Davide Viti <d.viti@infosolution.it>
 +      "sdboot=echo Booting from SD...;"                      \
 +      " run envload; run fpgaboot;"                          \
 +      " fatload mmc 0 0x1000000 ${kernel_image}"             \
-+      " && fatload mmc 0 0x2000000 ${ramdisk_image}"         \
-+      " && fatload mmc 0 0x3000000 ${devicetree_image}"      \
-+      " && bootm 0x1000000 0x2000000 0x3000000\0"            \
++      " && fatload mmc 0 0x3000000 ${ramdisk_image}"         \
++      " && fatload mmc 0 0x2000000 ${devicetree_image}"      \
++      " && bootm 0x1000000 0x3000000 0x2000000\0"            \
 +      "fpgaboot=if fatload mmc 0 0x1000000 ${fpga_image};"   \
 +      " then echo Booting FPGA from ${fpga_image};"          \
 +      " fpga info 0 && fpga loadb 0 0x1000000 $filesize;"    \

diff --git a/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch b/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch
index 6dae31ea8959e12625a65200ca527b7a1b6367ba..b7f8297cae5fd98e4bf68a2799e6c3df41c5df4a 100644 (file)
--- a/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch
+++ b/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch
@@ -11,7 +11,7 @@ diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
 index 946de95..2400a88 100644
 --- a/include/configs/zynq_zed.h
 +++ b/include/configs/zynq_zed.h
-@@ -24,4 +24,28 @@
+@@ -24,0 +24,0 @@
 
  #include <configs/zynq-common.h>
 
@@ -30,9 +30,9 @@ index 946de95..2400a88 100644
 +      "fpga_image=system.bit\0"                              \
 +      "sdboot=echo Booting from SD...; run fpgaboot;"        \
 +      " fatload mmc 0 0x1000000 ${kernel_image}"             \
-+      " && fatload mmc 0 0x2000000 ${ramdisk_image}"         \
-+      " && fatload mmc 0 0x3000000 ${devicetree_image}"      \
-+      " && bootm 0x1000000 0x2000000 0x3000000\0"            \
++      " && fatload mmc 0 0x3000000 ${ramdisk_image}"         \
++      " && fatload mmc 0 0x2000000 ${devicetree_image}"      \
++      " && bootm 0x1000000 0x3000000 0x2000000\0"            \
 +      "fpgaboot=if fatload mmc 0 0x1000000 ${fpga_image};"   \
 +      " then echo Booting FPGA from ${fpga_image};"          \
 +      " fpga info 0 && fpga loadb 0 0x1000000 $filesize;"    \