diff options
| author | Jason <jason.hy.wu@gmail.com> | 2017-03-10 20:11:34 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan@nathanrossi.com> | 2017-03-12 00:45:24 +1000 |
| commit | 58e67a3cc13018fd03b3404301960c48a5097c4a (patch) | |
| tree | ad894841311f0b60a8199a4b6e4d027917eba3c7 | |
| parent | 96755b4a5ee5d329f4a12a138706121368d6db51 (diff) | |
| download | meta-xilinx-58e67a3cc13018fd03b3404301960c48a5097c4a.tar.gz | |
u-boot-xlinx: Workaround to trigger network based jtagboot
Currently the jtagboot cmd fails when jtagmemboot failed. This is
because the jtagmemboot returns false when it fail the itest.w or the
booti failed. Thus the network based jtagboot cmd never gets triggered.
The jtagboot can't be purely base on the itest.w because sometimes
the dhcp command triggers the Image download which has valid image
in the ram. This passes the itest.w and iminfo test but fail the
booti.
This patch triggers the network based jtagboot cmd if jtagmemboot
failed.
Signed-off-by: Jason Wu <jason.hy.wu@gmail.com>
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-xlnx/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch b/recipes-bsp/u-boot/u-boot-xlnx/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch index 08a0a205..badff7e6 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch +++ b/recipes-bsp/u-boot/u-boot-xlnx/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch | |||
| @@ -28,7 +28,7 @@ index 4714b3317d..0441f3f24f 100644 | |||
| 28 | - "jtagboot=tftpboot 80000 Image && tftpboot $fdt_addr system.dtb && " \ | 28 | - "jtagboot=tftpboot 80000 Image && tftpboot $fdt_addr system.dtb && " \ |
| 29 | - "tftpboot 6000000 rootfs.cpio.ub && booti 80000 6000000 $fdt_addr\0" \ | 29 | - "tftpboot 6000000 rootfs.cpio.ub && booti 80000 6000000 $fdt_addr\0" \ |
| 30 | + "jtagmemboot=if itest.w *0x80038 == 0x644d5241; then if iminfo 0x6000000; then booti 0x80000 0x6000000 $fdt_addr; else booti 0x80000 - $fdt_addr; fi; fi\0" \ | 30 | + "jtagmemboot=if itest.w *0x80038 == 0x644d5241; then if iminfo 0x6000000; then booti 0x80000 0x6000000 $fdt_addr; else booti 0x80000 - $fdt_addr; fi; fi\0" \ |
| 31 | + "jtagboot=run jtagmemboot && " \ | 31 | + "jtagboot=run jtagmemboot || " \ |
| 32 | + "tftpboot 80000 Image && tftpboot $fdt_addr system.dtb && " \ | 32 | + "tftpboot 80000 Image && tftpboot $fdt_addr system.dtb && " \ |
| 33 | + "tftpboot 6000000 rootfs.cpio.ub && booti 80000 6000000 $fdt_addr\0" \ | 33 | + "tftpboot 6000000 rootfs.cpio.ub && booti 80000 6000000 $fdt_addr\0" \ |
| 34 | "nosmp=setenv bootargs $bootargs maxcpus=1\0" \ | 34 | "nosmp=setenv bootargs $bootargs maxcpus=1\0" \ |