Merge branch 'build-v1.2.x'

ikwzm · Aug 31, 2020 · 1d65694 · 1d65694
2 parents a3a4016 + 5bd7eb5
commit 1d65694
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 9 deletions.
diff --git a/Readme.md b/Readme.md
@@ -41,6 +41,7 @@ This Repository provides a Linux Boot Image(U-boot, Kernel, Root-fs) for FPGA-So
   + [fclkcfg    (FPGA Clock Configuration Device Driver)](https://github.com/ikwzm/fclkcfg)
   + [u-dma-buf  (User space mappable DMA Buffer)](https://github.com/ikwzm/udmabuf)
   + [zptty      (Pseudo TeleTYpewriter for FPGA Device)](https://github.com/ikwzm/PTTY_AXI4)
+  + zynq-afi   (Xilinx ZYNQ AFI Kernel Module)
 
 Install
 ------------------------------------------------------------------------------------

diff --git a/doc/build/device-drivers.md b/doc/build/device-drivers.md
@@ -11,7 +11,7 @@ shell$ cd dtbocfg-kmod-dpkg
 ##### Cross Compile for linux-5.4.59-armv7-fpga
 
 ```console
-shell$ sudo debian/rules arch=arm deb_arch=armhf kernel_release=5.4.59-armv7-fpga kernel_src_dir=../../linux-5.4.59-armv7-fpga binary
+shell$ sudo debian/rules arch=arm deb_arch=armhf kernel_release=5.4.59-armv7-fpga kernel_src_dir=$PWD/../linux-5.4.59-armv7-fpga binary
     :
     :
     :
@@ -31,7 +31,7 @@ shell$ cd u-dma-buf-kmod-dpkg
 ##### Cross Compile for linux-5.4.59-armv7-fpga
 
 ```console
-shell$ sudo debian/rules arch=arm deb_arch=armhf kernel_release=5.4.59-armv7-fpga kernel_src_dir=../../linux-5.4.59-armv7-fpga binary
+shell$ sudo debian/rules arch=arm deb_arch=armhf kernel_release=5.4.59-armv7-fpga kernel_src_dir=$PWD/../linux-5.4.59-armv7-fpga binary
     :
     :
     :
@@ -51,7 +51,7 @@ shell$ cd fclkcfg-kmod-dpkg
 ##### Cross Compile for linux-5.4.59-armv7-fpga
 
 ```console
-shell$ sudo debian/rules arch=arm deb_arch=armhf kernel_release=5.4.59-armv7-fpga kernel_src_dir=../../linux-5.4.59-armv7-fpga binary
+shell$ sudo debian/rules arch=arm deb_arch=armhf kernel_release=5.4.59-armv7-fpga kernel_src_dir=$PWD/../linux-5.4.59-armv7-fpga binary
     :
     :
     :
@@ -71,14 +71,33 @@ shell$ cd zptty-kmod-dpkg
 ##### Cross Compile for linux-5.4.59-armv7-fpga
 
 ```console
-shell$ sudo debian/rules arch=arm deb_arch=armhf kernel_release=5.4.59-armv7-fpga kernel_src_dir=../../../../../linux-5.4.59-armv7-fpga binary
+shell$ sudo debian/rules arch=arm deb_arch=armhf kernel_release=5.4.59-armv7-fpga kernel_src_dir=$PWD/../linux-5.4.59-armv7-fpga binary
     :
     :
     :
 shell$ file ../zptty-5.4.59-armv7-fpga_1.0.0-1_armhf.deb
 ../zptty-5.4.59-armv7-fpga_1.0.0-1_armhf.deb: Debian binary package (format 2.0)
 ```
 
+#### zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb
+
+##### Download repository
+
+```console
+shell$ git clone --recursive --depth=1 -b v0.0.1 git://github.com/ikwzm/zynq-afi-kmod-dpkg
+shell$ cd zynq-afi-kmod-dpkg
+```
+##### Cross Compile for linux-5.4.59-armv7-fpga
+
+```console
+shell$ sudo debian/rules arch=arm deb_arch=armhf kernel_release=5.4.59-armv7-fpga kernel_src_dir=$PWD/../linux-5.4.59-armv7-fpga binary
+    :
+    :
+    :
+shell$ file file ../zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb 
+../zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb: Debian binary package (format 2.0)
+```
+
 #### dtbocfg-ctrl_0.0.5-1_all.deb
 
 ##### Download repository

diff --git a/doc/install/de0-nano-soc.md b/doc/install/de0-nano-soc.md
@@ -5,7 +5,7 @@
 **Note: Downloading the entire repository is time consuming, so download only the branch you need.**
 
 ```console
-shell$ git clone --depth=1 --branch v1.2.0 git://github.com/ikwzm/FPGA-SoC-Linux
+shell$ git clone --depth=1 --branch v1.2.1 git://github.com/ikwzm/FPGA-SoC-Linux
 shell$ cd FPGA-SoC-Linux
 shell$ git lfs pull
 ```

diff --git a/doc/install/de10-nano.md b/doc/install/de10-nano.md
@@ -5,7 +5,7 @@
 **Note: Downloading the entire repository is time consuming, so download only the branch you need.**
 
 ```console
-shell$ git clone --depth=1 --branch v1.2.0 git://github.com/ikwzm/FPGA-SoC-Linux
+shell$ git clone --depth=1 --branch v1.2.1 git://github.com/ikwzm/FPGA-SoC-Linux
 shell$ cd FPGA-SoC-Linux
 shell$ git lfs pull
 ```

diff --git a/doc/install/device-drivers.md b/doc/install/device-drivers.md
@@ -78,6 +78,20 @@ Unpacking zptty-5.4.59-armv7-fpga (1.0.0-1) ...
 Setting up zptty-5.4.59-armv7-fpga (1.0.0-1) ...
 ```
 
+#### Install zynq-afi kernel module package
+
+This debian package only installs ZYNQ(ZYBO/ZYBO-Z7/PYNQ-Z1).
+
+```console
+fpga@debian-fpga:~$ cd /home/fpga/debian
+fpga@debian-fpga:~/debian$ sudo dpkg -i zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb
+Selecting previously unselected package zynq-afi-5.4.59-armv7-fpga.
+(Reading database ... 84118 files and directories currently installed.)
+Preparing to unpack zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb ...
+Unpacking zynq-afi-5.4.59-armv7-fpga (0.0.1-0) ...
+Setting up zynq-afi-5.4.59-armv7-fpga (0.0.1-0) ...
+```
+
 #### Install dtbocfg control package
 
 ```console

diff --git a/doc/install/zynq-pynqz1.md b/doc/install/zynq-pynqz1.md
@@ -5,7 +5,7 @@
 **Note: Downloading the entire repository is time consuming, so download only the branch you need.**
 
 ```console
-shell$ git clone --depth=1 --branch v1.2.0 git://github.com/ikwzm/FPGA-SoC-Linux
+shell$ git clone --depth=1 --branch v1.2.1 git://github.com/ikwzm/FPGA-SoC-Linux
 shell$ cd FPGA-SoC-Linux
 shell$ git lfs pull
 ```
@@ -29,6 +29,7 @@ shell$ git lfs pull
  * fclkcfg-5.4.59-armv7-fpga_1.7.2-1_armhf.deb                       : fclkcfg Kernel Module    (use Git LFS)
  * u-dma-buf-5.4.59-armv7-fpga_3.2.2-0_armhf.deb                     : u-dma-buf Kernel Module  (use Git LFS)
  * zptty-5.4.59-armv7-fpga_1.0.0-1_armhf.deb                         : zptty   Kernel Module    (use Git LFS)
+ * zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb                      : Zynq AFI Kernel Module   (use Git LFS)
 
 #### Format SD-Card
 
@@ -49,6 +50,7 @@ shell$ cp dtbocfg-5.4.59-armv7-fpga_0.0.8-1_armhf.deb                       /mnt
 shell# cp fclkcfg-5.4.59-armv7-fpga_1.7.2-1_armhf.deb                       /mnt/usb2/home/fpga/debian
 shell# cp u-dma-buf-5.4.59-armv7-fpga_3.2.2-0_armhf.deb                     /mnt/usb2/home/fpga/debian
 shell# cp zptty-5.4.59-armv7-fpga_1.0.0-1_armhf.deb                         /mnt/usb2/home/fpga/debian
+shell# cp zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb                      /mnt/usb2/home/fpga/debian
 shell# cp -r target/zynq-pynqz1/examples                                    /mnt/usb2/home/fpga
 shell# umount mnt/usb1
 shell# umount mnt/usb2

diff --git a/doc/install/zynq-zybo-z7.md b/doc/install/zynq-zybo-z7.md
@@ -5,7 +5,7 @@
 **Note: Downloading the entire repository is time consuming, so download only the branch you need.**
 
 ```console
-shell$ git clone --depth=1 --branch v1.2.0 git://github.com/ikwzm/FPGA-SoC-Linux
+shell$ git clone --depth=1 --branch v1.2.1 git://github.com/ikwzm/FPGA-SoC-Linux
 shell$ cd FPGA-SoC-Linux
 shell$ git lfs pull
 ```
@@ -28,6 +28,7 @@ shell$ git lfs pull
  * fclkcfg-5.4.59-armv7-fpga_1.2.0-1_armhf.deb                       : fclkcfg Kernel Module    (use Git LFS)
  * u-dma-buf-5.4.59-armv7-fpga_3.0.1-0_armhf.deb                     : u-dma-buf Kernel Module  (use Git LFS)
  * zptty-5.4.59-armv7-fpga_1.0.0-1_armhf.deb                         : zptty   Kernel Module    (use Git LFS)
+ * zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb                      : Zynq AFI Kernel Module   (use Git LFS)
 
 #### Format SD-Card
 
@@ -48,6 +49,7 @@ shell$ cp dtbocfg-5.4.59-armv7-fpga_0.0.8-1_armhf.deb                       /mnt
 shell# cp fclkcfg-5.4.59-armv7-fpga_1.7.2-1_armhf.deb                       /mnt/usb2/home/fpga/debian
 shell# cp u-dma-buf-5.4.59-armv7-fpga_3.2.2-0_armhf.deb                     /mnt/usb2/home/fpga/debian
 shell# cp zptty-5.4.59-armv7-fpga_1.0.0-1_armhf.deb                         /mnt/usb2/home/fpga/debian
+shell# cp zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb                      /mnt/usb2/home/fpga/debian
 shell# umount mnt/usb1
 shell# umount mnt/usb2
 ````

diff --git a/doc/install/zynq-zybo.md b/doc/install/zynq-zybo.md
@@ -5,7 +5,7 @@
 **Note: Downloading the entire repository is time consuming, so download only the branch you need.**
 
 ```console
-shell$ git clone --depth=1 --branch v1.2.0 git://github.com/ikwzm/FPGA-SoC-Linux
+shell$ git clone --depth=1 --branch v1.2.1 git://github.com/ikwzm/FPGA-SoC-Linux
 shell$ cd FPGA-SoC-Linux
 shell$ git lfs pull
 ```
@@ -30,6 +30,7 @@ shell$ git lfs pull
  * fclkcfg-5.4.59-armv7-fpga_1.2.0-1_armhf.deb                       : fclkcfg Kernel Module    (use Git LFS)
  * u-dma-buf-5.4.59-armv7-fpga_3.0.1-0_armhf.deb                     : u-dma-buf Kernel Module  (use Git LFS)
  * zptty-5.4.59-armv7-fpga_1.0.0-1_armhf.deb                         : zptty   Kernel Module    (use Git LFS)
+ * zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb                      : Zynq AFI Kernel Module   (use Git LFS)
 
 #### Format SD-Card
 
@@ -50,6 +51,7 @@ shell$ cp dtbocfg-5.4.59-armv7-fpga_0.0.8-1_armhf.deb                       /mnt
 shell# cp fclkcfg-5.4.59-armv7-fpga_1.7.2-1_armhf.deb                       /mnt/usb2/home/fpga/debian
 shell# cp u-dma-buf-5.4.59-armv7-fpga_3.2.2-0_armhf.deb                     /mnt/usb2/home/fpga/debian
 shell# cp zptty-5.4.59-armv7-fpga_1.0.0-1_armhf.deb                         /mnt/usb2/home/fpga/debian
+shell# cp zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb                      /mnt/usb2/home/fpga/debian
 shell# cp -r target/zynq-zybo/examples                                      /mnt/usb2/home/fpga
 shell# umount mnt/usb1
 shell# umount mnt/usb2

diff --git a/zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb b/zynq-afi-5.4.59-armv7-fpga_0.0.1-0_armhf.deb