From dcca8fbc69784be27e221947f9180757f6b3459e Mon Sep 17 00:00:00 2001
From: Niel Fourie <niel.fourie@gmail.com>
Date: Sun, 19 Mar 2017 21:49:30 +0200
Subject: [PATCH] Updated README.md, tweaked kernel boot parameters, and made
 xylonfb optional.

---
 README.md                                              | 10 +++++++++-
 conf/machine/zturn-zynq7.conf                          |  2 --
 recipes-bsp/u-boot/u-boot-xlnx/u-boot-xlnx-zturn.patch |  2 +-
 recipes-kernel/linux/linux-xlnx_4.6.bb                 |  7 ++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 36d745e..18debc1 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,14 @@ https://github.com/q3k/zturn-stuff
 
 Based on the above the information, ZTurn support was added to newer versions of u-boot-xlnx and linux-xlnx, much newer than what Myir was running.
 
-Known issues:
+This repository does not (as yet) supply any bitstreams. The original bitstreams released by MYIR should work (7z020-hdmi.bit was tested), which can be extracted from MYIR supplied CD (also available via links in the zturn-stuff repo listed above). Compiling the mys-xc7z020-trd project also resulted in a working bitstream.
+
+To create a custom bitstream from scratch, start with https://wiki.hackerspace.pl/projects:zturn-hackers:helloworld as the resulting bitstream boots just fine, albeit without the LED, accelerometer and temperature sensor.
 
+Tweaks
+------
+The MYIR images/bitstreams included support vir xylonfb. To enable kernel support for zturn modified linux-xlnx, uncomment the lines indicated at the bottom of meta-zturn/recipes-kernel/linux/linux-xlnx_4.6.bb.
+
+Known issues:
+------------
 Connman takes ages to initialise, apparantly because it is blocking on "random: nonblocking pool is initialized". Added haveged to the image, and tweaked connman.service to at least not block log-in.
diff --git a/conf/machine/zturn-zynq7.conf b/conf/machine/zturn-zynq7.conf
index b6f9d20..9ab190f 100644
--- a/conf/machine/zturn-zynq7.conf
+++ b/conf/machine/zturn-zynq7.conf
@@ -14,7 +14,5 @@ SPL_BINARY = "boot.bin"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
-KERNEL_DEVICETREE = "zynq-zturn.dtb zynq-zturn-xylon.dtb"
-
 IMAGE_BOOT_FILES += "boot.bin ${KERNEL_IMAGETYPE}-zynq-zturn.dtb ${KERNEL_IMAGETYPE}-zynq-zturn-xylon.dtb"
 
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/u-boot-xlnx-zturn.patch b/recipes-bsp/u-boot/u-boot-xlnx/u-boot-xlnx-zturn.patch
index e1c6084..e2f2afe 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx/u-boot-xlnx-zturn.patch
+++ b/recipes-bsp/u-boot/u-boot-xlnx/u-boot-xlnx-zturn.patch
@@ -127,7 +127,7 @@
 +
 +#include <configs/zynq-common.h>
 +
-+#define CONFIG_BOOTARGS "console=ttyPS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw earlyprintk"
++#define CONFIG_BOOTARGS "console=ttyPS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw earlyprintk rootwait"
 +
 +#endif /* __CONFIG_ZYNQ_ZED_H */
 --- /dev/null
diff --git a/recipes-kernel/linux/linux-xlnx_4.6.bb b/recipes-kernel/linux/linux-xlnx_4.6.bb
index 31c1c87..3505b28 100644
--- a/recipes-kernel/linux/linux-xlnx_4.6.bb
+++ b/recipes-kernel/linux/linux-xlnx_4.6.bb
@@ -11,5 +11,10 @@ SRC_URI_append_zybo-linux-bd-zynq7 = " \
 	"
 
 SRC_URI_append = " file://linux-xlnx-zturn.patch \
-	file://linux-xlnx-zturn-xylon.patch \
 	file://defconfig"
+
+KERNEL_DEVICETREE = "zynq-zturn.dtb"
+
+# If xylonfb support is desired, uncomment the following lines:
+#SRC_URI_append += " file://linux-xlnx-zturn-xylon.patch"
+#KERNEL_DEVICETREE += " zynq-zturn-xylon.dtb"