NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
As reported in bug , 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>
This commit is contained in:
Thomas Petazzoni 2016-07-08 20:30:28 +02:00
parent 55e04e8d4a
commit 4846700a1b
2 changed files with 7 additions and 7 deletions

6
board/avnet/microzed/uboot/0001-zynq-Create-microzed-specific-U-Boot-environment.patch
View File

@ -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;" \

8
board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch
View File

@ -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;" \