Merge branch 'build-v0.3.2'

ikwzm · Apr 12, 2017 · 0cf5ca7 · 0cf5ca7
2 parents cb2cc52 + 46e747d
commit 0cf5ca7
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 22 deletions.
diff --git a/files/linux-4.8.17-armv7-fpga.diff b/files/linux-4.8.17-armv7-fpga.diff
@@ -1,18 +1,25 @@
-diff --git arch/arm/boot/dts/Makefile arch/arm/boot/dts/Makefile
-index faacd52..9d09920 100644
---- arch/arm/boot/dts/Makefile
-+++ arch/arm/boot/dts/Makefile
-@@ -863,6 +863,7 @@ dtb-$(CONFIG_ARCH_VT8500) += \
- 	wm8850-w70v2.dtb
- dtb-$(CONFIG_ARCH_ZYNQ) += \
- 	zynq-parallella.dtb \
-+	zynq-pynqz1.dtb \
- 	zynq-zc702.dtb \
- 	zynq-zc706.dtb \
- 	zynq-zed.dtb \
+diff --git arch/arm/boot/dts/zynq-7000.dtsi arch/arm/boot/dts/zynq-7000.dtsi
+index f283ff0..2a9be16 100644
+--- arch/arm/boot/dts/zynq-7000.dtsi
++++ arch/arm/boot/dts/zynq-7000.dtsi
+@@ -364,4 +364,14 @@
+ 			timeout-sec = <10>;
+ 		};
+ 	};
++
++	reserved-memory {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		ranges;
++
++		zynq-dma-unusable-area {
++			reg = <0x0 0x80000>;
++		};
++	};
+ };
 diff --git arch/arm/boot/dts/zynq-pynqz1.dts arch/arm/boot/dts/zynq-pynqz1.dts
 new file mode 100644
-index 0000000..4a4a7b2
+index 0000000..6529ef8
 --- /dev/null
 +++ arch/arm/boot/dts/zynq-pynqz1.dts
 @@ -0,0 +1,64 @@
@@ -27,7 +34,7 @@ index 0000000..4a4a7b2
 +#include "zynq-7000.dtsi"
 +
 +/ {
-+	model = "Zynq ARTY Z7 Development Board";
++	model = "Zynq PYNQ-Z1 Development Board";
 +	compatible = "digilent,zynq-pynqz1", "xlnx,zynq-7000";
 +
 +	aliases {

diff --git a/target/zynq-pynqz1/boot/devicetree-4.8.17-zynq-pynqz1.dtb b/target/zynq-pynqz1/boot/devicetree-4.8.17-zynq-pynqz1.dtb
diff --git a/target/zynq-pynqz1/boot/devicetree-4.8.17-zynq-pynqz1.dts b/target/zynq-pynqz1/boot/devicetree-4.8.17-zynq-pynqz1.dts
@@ -4,7 +4,7 @@
 	#address-cells = <0x1>;
 	#size-cells = <0x1>;
 	compatible = "digilent,zynq-pynqz1", "xlnx,zynq-7000";
-	model = "Zynq ARTY Z7 Development Board";
+	model = "Zynq PYNQ-Z1 Development Board";
 
 	chosen {
 		bootargs = "earlycon";
@@ -373,6 +373,16 @@
 		};
 	};
 
+	reserved-memory {
+		#address-cells = <0x1>;
+		#size-cells = <0x1>;
+		ranges;
+
+		zynq-dma-unusable-area {
+			reg = <0x0 0x80000>;
+		};
+	};
+
 	phy0 {
 		#phy-cells = <0x0>;
 		compatible = "usb-nop-xceiv";

diff --git a/target/zynq-pynqz1/boot/uEnv.txt b/target/zynq-pynqz1/boot/uEnv.txt
@@ -5,6 +5,6 @@ fpga_set_cmd=run slcr_unlock_cmd && mw.l 0xF8000170 0x00100A00 && run slcr_lock_
 boot_image=zImage-4.8.17-armv7-fpga
 fdt_image=devicetree-4.8.17-zynq-pynqz1.dtb
 linux_load_cmd=fatload mmc 0 0x03000000 $boot_image && fatload mmc 0 0x02A00000 $fdt_image
-linux_boot_cmd=setenv bootargs console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait uio_pdrv_genirq.of_id=generic-uio sdhci.debug_quirks=64 && bootz 0x03000000 - 0x02A00000
+linux_boot_cmd=setenv bootargs console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait uio_pdrv_genirq.of_id=generic-uio && bootz 0x03000000 - 0x02A00000
 uenvcmd=run linux_load_cmd && run linux_boot_cmd
 
diff --git a/target/zynq-zybo-de0-nano-soc/boot/boot.script b/target/zynq-zybo-de0-nano-soc/boot/boot.script
@@ -12,9 +12,6 @@ if test $config = "zynq-zybo"; then
     fatload mmc 0 0x03000000 $boot_image
     fatload mmc 0 0x02A00000 $fdt_image
     setenv bootargs console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait uio_pdrv_genirq.of_id=generic-uio
-    if test $kernel_version = "4.8.17"; then
-        setenv bootargs $bootargs sdhci.debug_quirks=64
-    fi
     bootz 0x03000000 - 0x02A00000
 fi
 if test $config = "socfpga_cyclone5_de0_nano_soc"; then

diff --git a/target/zynq-zybo/boot/devicetree-4.8.17-zynq-zybo.dtb b/target/zynq-zybo/boot/devicetree-4.8.17-zynq-zybo.dtb
diff --git a/target/zynq-zybo/boot/devicetree-4.8.17-zynq-zybo.dts b/target/zynq-zybo/boot/devicetree-4.8.17-zynq-zybo.dts
@@ -373,6 +373,16 @@
 		};
 	};
 
+	reserved-memory {
+		#address-cells = <0x1>;
+		#size-cells = <0x1>;
+		ranges;
+
+		zynq-dma-unusable-area {
+			reg = <0x0 0x80000>;
+		};
+	};
+
 	phy0 {
 		#phy-cells = <0x0>;
 		compatible = "usb-nop-xceiv";

diff --git a/target/zynq-zybo/boot/uEnv.txt b/target/zynq-zybo/boot/uEnv.txt
@@ -5,6 +5,6 @@ fpga_set_cmd=run slcr_unlock_cmd && mw.l 0xF8000170 0x00100A00 && run slcr_lock_
 boot_image=zImage-4.8.17-armv7-fpga
 fdt_image=devicetree-4.8.17-zynq-zybo.dtb
 linux_load_cmd=fatload mmc 0 0x03000000 $boot_image && fatload mmc 0 0x02A00000 $fdt_image
-linux_boot_cmd=setenv bootargs console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait uio_pdrv_genirq.of_id=generic-uio sdhci.debug_quirks=64 && bootz 0x03000000 - 0x02A00000
+linux_boot_cmd=setenv bootargs console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait uio_pdrv_genirq.of_id=generic-uio && bootz 0x03000000 - 0x02A00000
 uenvcmd=run fpga_load_cmd && run fpga_set_cmd && run linux_load_cmd && run linux_boot_cmd