[meta-xilinx] [PATCH 6/12] u-boot-xlnx: Add recipe for xilinx-v2017.1 release

[Nathan Rossi]

Add a recipe for the u-boot-xlnx xilinx-v2017.1 release, this release is
based on v2017.01 of U-Boot. Also add an updated version of the patches.

This patch also moves the FILESEXTRAPATHS prepend to the u-boot-xlnx.inc
due to common use. And a u-boot-xlnx/${XILINX_RELEASE_VERSION} subdir is
added to the list for version specific patches.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 recipes-bsp/u-boot/u-boot-xlnx.inc                 |  4 +++
 ...xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch | 39 ++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-xlnx_2016.4.bb           |  3 --
 recipes-bsp/u-boot/u-boot-xlnx_2017.1.bb           | 24 +++++++++++++
 4 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-xlnx/v2017.1/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch
 create mode 100644 recipes-bsp/u-boot/u-boot-xlnx_2017.1.bb

diff --git a/recipes-bsp/u-boot/u-boot-xlnx.inc b/recipes-bsp/u-boot/u-boot-xlnx.inc
index 09feb7f271..dd28a0530d 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -8,3 +8,7 @@ SRC_URI = "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https;branch=${UBRAN
 S = "${WORKDIR}/git"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:"
+FILESEXTRAPATHS_prepend := "${@'${THISDIR}/u-boot-xlnx/${XILINX_RELEASE_VERSION}:' if d.getVar('XILINX_RELEASE_VERSION') else ''}"
+
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/v2017.1/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch b/recipes-bsp/u-boot/u-boot-xlnx/v2017.1/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch
new file mode 100644
index 0000000000..de7954a8a0
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-xlnx/v2017.1/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch
@@ -0,0 +1,39 @@
+From 05fc0a41a14dac435248aa4ea2afa44450f70d46 Mon Sep 17 00:00:00 2001
+From: Nathan Rossi <nathan at nathanrossi.com>
+Date: Fri, 4 Nov 2016 21:33:14 +1000
+Subject: [PATCH] arm: zynqmp: xilinx_zynqmp.h: Auto boot in JTAG if images in
+ memory
+
+Add a command that checks if the Kernel image (in aarch64 Image format)
+and optionally a rootfs is in memory and automatically boot these images
+if in JTAG boot mode.
+
+This allows for simpler boot automation in JTAG boot environments
+(including QEMU) where manual interaction would otherwise be required.
+
+Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
+Upstream-Status: Denied [Upstream prefers FIT instead]
+---
+ include/configs/xilinx_zynqmp.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
+index 9371dbb585..cd4edcf2b5 100644
+--- a/include/configs/xilinx_zynqmp.h
++++ b/include/configs/xilinx_zynqmp.h
+@@ -253,8 +253,10 @@
+ 		"run xen_prepare_dt_qemu && " \
+ 		"tftpb 6000000 xen.ub && tftpb 0x1000000 image.ub && " \
+ 		"bootm 6000000 0x1000000 $fdt_addr\0" \
+-	"jtagboot=tftpboot 80000 Image && tftpboot $fdt_addr system.dtb && " \
+-		 "tftpboot 6000000 rootfs.cpio.ub && booti 80000 6000000 $fdt_addr\0" \
++	"jtagmemboot=if itest.w *0x80038 == 0x644d5241; then if iminfo 0x6000000; then booti 0x80000 0x6000000 $fdt_addr; else booti 0x80000 - $fdt_addr; fi; fi\0" \
++	"jtagboot=run jtagmemboot || " \
++		"tftpboot 80000 Image && tftpboot $fdt_addr system.dtb && " \
++		"tftpboot 6000000 rootfs.cpio.ub && booti 80000 6000000 $fdt_addr\0" \
+ 	"nosmp=setenv bootargs $bootargs maxcpus=1\0" \
+ 	"nfsroot=setenv bootargs $bootargs root=/dev/nfs nfsroot=$serverip:/mnt/sata,tcp ip=$ipaddr:$serverip:$serverip:255.255.255.0:zynqmp:eth0:off rw\0" \
+ 	"sdroot0=setenv bootargs $bootargs root=/dev/mmcblk0p2 rw rootwait\0" \
+-- 
+2.11.0
+
diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2016.4.bb b/recipes-bsp/u-boot/u-boot-xlnx_2016.4.bb
index ed4c771d3f..9730cb331d 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx_2016.4.bb
+++ b/recipes-bsp/u-boot/u-boot-xlnx_2016.4.bb
@@ -5,9 +5,6 @@ XILINX_RELEASE_VERSION = "v2016.4"
 SRCREV = "0b94ce5ed4a6c2cd0fec7b8337e776b03e387347"
 PV = "v2016.07-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:"
-
 SRC_URI_append = " \
 		file://0001-fdt-add-memory-bank-decoding-functions-for-board-set.patch \
 		file://0002-ARM-zynq-Replace-board-specific-with-generic-memory-.patch \
diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2017.1.bb b/recipes-bsp/u-boot/u-boot-xlnx_2017.1.bb
new file mode 100644
index 0000000000..d70dfefd76
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-xlnx_2017.1.bb
@@ -0,0 +1,24 @@
+include u-boot-xlnx.inc
+include u-boot-spl-zynq-init.inc
+
+XILINX_RELEASE_VERSION = "v2017.1"
+SRCREV = "92e3dd638b50ad22dd90072673c80d8730903e95"
+PV = "v2017.01-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
+
+SRC_URI_append = " \
+		file://arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch \
+		"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c"
+
+# u-boot 2016.07 has support for these
+HAS_PLATFORM_INIT ?= " \
+		zynq_microzed_config \
+		zynq_zed_config \
+		zynq_zc702_config \
+		zynq_zc706_config \
+		zynq_zybo_config \
+		xilinx_zynqmp_zcu102_config \
+		"
+
-- 
2.11.0