Merge branch 'build-v2021.1'

ikwzm · Jul 27, 2022 · 59e89d1 · 59e89d1
2 parents 4c00605 + 791f862
commit 59e89d1
Show file tree

Hide file tree

Showing 45 changed files with 82 additions and 89 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/debian11-rootfs-vanilla.tgz b/debian11-rootfs-vanilla.tgz
diff --git a/debian11-rootfs-vanilla.tgz.files/x00 b/debian11-rootfs-vanilla.tgz.files/x00
diff --git a/debian11-rootfs-vanilla.tgz.files/x01 b/debian11-rootfs-vanilla.tgz.files/x01
diff --git a/debian11-rootfs-vanilla.tgz.files/x02 b/debian11-rootfs-vanilla.tgz.files/x02
diff --git a/debian11-rootfs-vanilla.tgz.files/x03 b/debian11-rootfs-vanilla.tgz.files/x03
diff --git a/debian11-rootfs-vanilla.tgz.files/x04 b/debian11-rootfs-vanilla.tgz.files/x04
diff --git a/debian11-rootfs-vanilla.tgz.files/x05 b/debian11-rootfs-vanilla.tgz.files/x05
diff --git a/debian11-rootfs-vanilla.tgz.files/x06 b/debian11-rootfs-vanilla.tgz.files/x06
diff --git a/debian11-rootfs-vanilla.tgz.files/x07 b/debian11-rootfs-vanilla.tgz.files/x07
diff --git a/debian11-rootfs-vanilla.tgz.files/x08 b/debian11-rootfs-vanilla.tgz.files/x08
diff --git a/doc/build/debian11-rootfs.md b/doc/build/debian11-rootfs.md
@@ -262,5 +262,15 @@ shell$ sudo mv    $PWD/$targetdir/dpkg-list.txt files/debian11-dpkg-list.txt
 ```console
 shell$ cd $PWD/$targetdir
 shell$ sudo tar cfz ../debian11-rootfs-vanilla.tgz *
+shell$ cd ..
+```
+
+## Build debian11-rootfs-vanilla.tgz.files
+
+```consle
+shell$ mkdir debian11-rootfs-vanilla.tgz.files
+shell$ cd    debian11-rootfs-vanilla.tgz.files
+shell$ split -d --bytes=40M ../debian11-rootfs-vanilla.tgz
+shell$ cd ..
 ```
 
diff --git a/doc/build/linux-xlnx-v2021.1-zynqmp-fpga.md b/doc/build/linux-xlnx-v2021.1-zynqmp-fpga.md
@@ -120,34 +120,36 @@ shell$ export DTC_FLAGS=--symbols
 shell$ make deb-pkg
 ```
 
-### Build kernel image and devicetree to target/UltraZed-EG-IOCC/boot/
+### Copy Image to image-5.10.0-xlnx-v2021.1-zynqmp-fpga
+
+```console
+shell$ cp arch/arm64/boot/Image ../image-5.10.0-xlnx-v2021.1-zynqmp-fpga
+```
+
+### Copy devicetree to target/UltraZed-EG-IOCC/boot/
 
 ```console
-shell$ cp arch/arm64/boot/Image ../target/UltraZed-EG-IOCC/boot/image-5.10.0-xlnx-v2021.1-zynqmp-fpga
 shell$ cp arch/arm64/boot/dts/xilinx/zynqmp-uz3eg-iocc.dtb ../target/UltraZed-EG-IOCC/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-uz3eg-iocc.dtb
 shell$ ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/UltraZed-EG-IOCC/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-uz3eg-iocc.dts ../target/UltraZed-EG-IOCC/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-uz3eg-iocc.dtb
 ```
 
-### Build kernel image and devicetree to target/Ultra96/boot/
+### Copy devicetree to target/Ultra96/boot/
 
 ```console
-shell$ cp arch/arm64/boot/Image ../target/Ultra96/boot/image-5.10.0-xlnx-v2021.1-zynqmp-fpga
 shell$ cp arch/arm64/boot/dts/xilinx/avnet-ultra96-rev1.dtb ../target/Ultra96/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-ultra96.dtb
 shell$ ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/Ultra96/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-ultra96.dts ../target/Ultra96/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-ultra96.dtb
 ```
 
-### Build kernel image and devicetree to target/Ultra96-V2/boot/
+### Copy devicetree to target/Ultra96-V2/boot/
 
 ```console
-shell$ cp arch/arm64/boot/Image ../target/Ultra96-V2/boot/image-5.10.0-xlnx-v2021.1-zynqmp-fpga
 shell$ cp arch/arm64/boot/dts/xilinx/avnet-ultra96v2-rev1.dtb ../target/Ultra96-V2/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-ultra96v2.dtb
 shell$ ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/Ultra96-V2/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-ultra96v2.dts ../target/Ultra96-V2/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-ultra96v2.dtb
 ```
 
-### Build kernel image and devicetree to target/Kv260/boot/
+### Copy devicetree to target/Kv260/boot/
 
 ```console
-shell$ cp arch/arm64/boot/Image ../target/Kv260/boot/image-5.10.0-xlnx-v2021.1-zynqmp-fpga
 shell$ cp arch/arm64/boot/dts/xilinx/zynqmp-kv260-revB.dtb ../target/Kv260/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-kv260-revB.dtb
 shell$ ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/Kv260/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-kv260-revB.dts ../target/Kv260/boot/devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-kv260-revB.dtb
 ```

diff --git a/doc/install/kv260.md b/doc/install/kv260.md
@@ -5,9 +5,9 @@
 **Note: Downloading the entire repository takes time, so download the source code from https://github.com/ikwzm/ZynqMP-FPGA-Linux/releases.**
 
 ```console
-shell$ wget https://github.com/ikwzm/ZynqMP-FPGA-Linux/archive/refs/tags/v2021.1.1.tar.gz
-shell$ tar xfz v2021.1.1.tar.gz
-shell$ cd ZynqMP-FPGA-Linux-2021.1.1
+shell$ wget https://github.com/ikwzm/ZynqMP-FPGA-Linux/archive/refs/tags/v2021.1.2.tar.gz
+shell$ tar xfz v2021.1.2.tar.gz
+shell$ cd ZynqMP-FPGA-Linux-2021.1.2
 ```
 
 ### File Description
@@ -17,12 +17,13 @@ shell$ cd ZynqMP-FPGA-Linux-2021.1.1
      - boot.scr                                                    : Stage Script file
      - uEnv.txt                                                    : U-Boot environment variables for linux boot
      - uEnv-linux-5.10.0-xlnx-v2021.1-zynqmp-fpga.txt              : U-Boot environment variables for boot menu
-     - image-5.10.0-xlnx-v2021.1-zynqmp-fpga                       : Linux Kernel Image       (use Git LFS)
      - devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-kv260-revB.dtb   : Linux Device Tree Blob   
      - devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-kv260-revB.dts   : Linux Device Tree Source
- * debian11-rootfs-vanilla.tgz                                     : Debian11 Root File System (use Git LFS)
- * linux-image-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb   : Linux Image Package      (use Git LFS)
- * linux-headers-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb : Linux Headers Package    (use Git LFS)
+ * image-5.10.0-xlnx-v2021.1-zynqmp-fpga                           : Linux Kernel Image
+ * debian11-rootfs-vanilla.tgz.files/                              : Debian11 Root File System
+   + x00 .. x08                                                    : (splited files)
+ * linux-image-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb   : Linux Image Package
+ * linux-headers-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb : Linux Headers Package
  * fclkcfg-5.10.0-xlnx-v2021.1-zynqmp-fpga_1.7.2-1_arm64.deb       : fclkcfg(1.7.2) Device Driver and Services Package
  * u-dma-buf-5.10.0-xlnx-v2021.1-zynqmp-fpga_3.2.4-0_arm64.deb     : u-dma-buf(3.2.4) Device Driver and Services Package
 
@@ -42,12 +43,13 @@ shell# mount /dev/sdc2 /mnt/usb2
 
 ```console
 shell# cp target/Kv260/boot/*                                             /mnt/usb1
+shell# cp image-5.10.0-xlnx-v2021.1-zynqmp-fpga                           /mnt/usb1
 ```
 
 #### Make RootFS Partition
 
 ```console
-shell# tar xfz debian11-rootfs-vanilla.tgz -C                             /mnt/usb2
+shell# cat debian11-rootfs-vanilla.tgz.files/* | tar xfz - -C             /mnt/usb2
 shell# mkdir                                                              /mnt/usb2/home/fpga/debian
 shell# cp linux-image-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb   /mnt/usb2/home/fpga/debian
 shell# cp linux-headers-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb /mnt/usb2/home/fpga/debian

diff --git a/doc/install/ultra96.md b/doc/install/ultra96.md
@@ -5,9 +5,9 @@
 **Note: Downloading the entire repository takes time, so download the source code from https://github.com/ikwzm/ZynqMP-FPGA-Linux/releases.**
 
 ```console
-shell$ wget https://github.com/ikwzm/ZynqMP-FPGA-Linux/archive/refs/tags/v2021.1.1.tar.gz
-shell$ tar xfz v2021.1.1.tar.gz
-shell$ cd ZynqMP-FPGA-Linux-2021.1.1
+shell$ wget https://github.com/ikwzm/ZynqMP-FPGA-Linux/archive/refs/tags/v2021.1.2.tar.gz
+shell$ tar xfz v2021.1.2.tar.gz
+shell$ cd ZynqMP-FPGA-Linux-2021.1.2
 ```
 
 ### File Description
@@ -16,19 +16,20 @@ shell$ cd ZynqMP-FPGA-Linux-2021.1.1
    + boot/
      - boot.bin                                                    : Stage 1 Boot Loader
      - uEnv.txt                                                    : U-Boot environment variables for linux boot
-     - image-5.4.0-xlnx-v2020.2-zynqmp-fpga                        : Linux Kernel Image       (use Git LFS)
      - devicetree-5.4.0-xlnx-v2020.2-zynqmp-fpga-ultra96.dtb       : Linux Device Tree Blob   
      - devicetree-5.4.0-xlnx-v2020.2-zynqmp-fpga-ultra96.dts       : Linux Device Tree Blob   
-     - image-5.10.0-xlnx-v2021.1-zynqmp-fpga                       : Linux Kernel Image       (use Git LFS)
      - devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-ultra96.dtb      : Linux Device Tree Blob   
      - devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-ultra96.dts      : Linux Device Tree Source
- * debian11-rootfs-vanilla.tgz                                     : Debian10 Root File System (use Git LFS)
- * linux-image-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb     : Linux Image Package      (use Git LFS)
- * linux-headers-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb   : Linux Headers Package    (use Git LFS)
+ * image-5.4.0-xlnx-v2020.2-zynqmp-fpga                            : Linux Kernel Image
+ * image-5.10.0-xlnx-v2021.1-zynqmp-fpga                           : Linux Kernel Image
+ * debian11-rootfs-vanilla.tgz.files/                              : Debian11 Root File System
+   + x00 .. x08                                                    : (splited files)
+ * linux-image-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb     : Linux Image Package
+ * linux-headers-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb   : Linux Headers Package
  * fclkcfg-5.4.0-xlnx-v2020.2-zynqmp-fpga_1.7.2-1_arm64.deb        : fclkcfg(1.7.2) Device Driver and Services Package
  * u-dma-buf-5.4.0-xlnx-v2020.2-zynqmp-fpga_3.2.4-0_arm64.deb      : u-dma-buf(3.2.4) Device Driver and Services Package
- * linux-image-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb   : Linux Image Package      (use Git LFS)
- * linux-headers-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb : Linux Headers Package    (use Git LFS)
+ * linux-image-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb   : Linux Image Package
+ * linux-headers-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb : Linux Headers Package
  * fclkcfg-5.10.0-xlnx-v2021.1-zynqmp-fpga_1.7.2-1_arm64.deb       : fclkcfg(1.7.2) Device Driver and Services Package
  * u-dma-buf-5.10.0-xlnx-v2021.1-zynqmp-fpga_3.2.4-0_arm64.deb     : u-dma-buf(3.2.4) Device Driver and Services Package
 
@@ -48,12 +49,14 @@ shell# mount /dev/sdc2 /mnt/usb2
 
 ```console
 shell# cp target/Ultra96/boot/*                                           /mnt/usb1
+shell# cp image-5.4.0-xlnx-v2020.2-zynqmp-fpga                            /mnt/usb1
+shell# cp image-5.10.0-xlnx-v2021.1-zynqmp-fpga                           /mnt/usb1
 ```
 
 #### Make RootFS Partition
 
 ```console
-shell# tar xfz debian11-rootfs-vanilla.tgz -C                             /mnt/usb2
+shell# cat debian11-rootfs-vanilla.tgz.files/* | tar xfz - -C             /mnt/usb2
 shell# mkdir                                                              /mnt/usb2/home/fpga/debian
 shell# cp linux-image-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb     /mnt/usb2/home/fpga/debian
 shell# cp linux-headers-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb   /mnt/usb2/home/fpga/debian

diff --git a/doc/install/ultra96v2.md b/doc/install/ultra96v2.md
@@ -5,9 +5,9 @@
 **Note: Downloading the entire repository takes time, so download the source code from https://github.com/ikwzm/ZynqMP-FPGA-Linux/releases.**
 
 ```console
-shell$ wget https://github.com/ikwzm/ZynqMP-FPGA-Linux/archive/refs/tags/v2021.1.1.tar.gz
-shell$ tar xfz v2021.1.1.tar.gz
-shell$ cd ZynqMP-FPGA-Linux-2021.1.1
+shell$ wget https://github.com/ikwzm/ZynqMP-FPGA-Linux/archive/refs/tags/v2021.1.2.tar.gz
+shell$ tar xfz v2021.1.2.tar.gz
+shell$ cd ZynqMP-FPGA-Linux-2021.1.2
 ```
 
 ### File Description
@@ -16,19 +16,20 @@ shell$ cd ZynqMP-FPGA-Linux-2021.1.1
    + boot/
      - boot.bin                                                    : Stage 1 Boot Loader
      - uEnv.txt                                                    : U-Boot environment variables for linux boot
-     - image-5.4.0-xlnx-v2020.2-zynqmp-fpga                        : Linux Kernel Image       (use Git LFS)
      - devicetree-5.4.0-xlnx-v2020.2-zynqmp-fpga-ultra96v2.dtb     : Linux Device Tree Blob   
      - devicetree-5.4.0-xlnx-v2020.2-zynqmp-fpga-ultra96v2.dts     : Linux Device Tree Blob   
-     - image-5.10.0-xlnx-v2021.1-zynqmp-fpga                       : Linux Kernel Image       (use Git LFS)
      - devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-ultra96v2.dtb    : Linux Device Tree Blob   
      - devicetree-5.10.0-xlnx-v2021.1-zynqmp-fpga-ultra96v2.dts    : Linux Device Tree Source
- * debian11-rootfs-vanilla.tgz                                     : Debian11 Root File System (use Git LFS)
- * linux-image-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb     : Linux Image Package      (use Git LFS)
- * linux-headers-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb   : Linux Headers Package    (use Git LFS)
+ * image-5.4.0-xlnx-v2020.2-zynqmp-fpga                            : Linux Kernel Image
+ * image-5.10.0-xlnx-v2021.1-zynqmp-fpga                           : Linux Kernel Image
+ * debian11-rootfs-vanilla.tgz.files/                              : Debian11 Root File System
+   + x00 .. x08                                                    : (splited files)
+ * linux-image-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb     : Linux Image Package
+ * linux-headers-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb   : Linux Headers Package
  * fclkcfg-5.4.0-xlnx-v2020.2-zynqmp-fpga_1.7.2-1_arm64.deb        : fclkcfg(1.7.2) Device Driver and Services Package
  * u-dma-buf-5.4.0-xlnx-v2020.2-zynqmp-fpga_3.2.4-0_arm64.deb      : u-dma-buf(3.2.4) Device Driver and Services Package
- * linux-image-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb   : Linux Image Package      (use Git LFS)
- * linux-headers-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb : Linux Headers Package    (use Git LFS)
+ * linux-image-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb   : Linux Image Package
+ * linux-headers-5.10.0-xlnx-v2021.1-zynqmp-fpga_5.10.0-xlnx-v2021.1-zynqmp-fpga-4_arm64.deb : Linux Headers Package
  * fclkcfg-5.10.0-xlnx-v2021.1-zynqmp-fpga_1.7.2-1_arm64.deb       : fclkcfg(1.7.2) Device Driver and Services Package
  * u-dma-buf-5.10.0-xlnx-v2021.1-zynqmp-fpga_3.2.4-0_arm64.deb     : u-dma-buf(3.2.4) Device Driver and Services Package
 
@@ -48,12 +49,14 @@ shell# mount /dev/sdc2 /mnt/usb2
 
 ```console
 shell# cp target/Ultra96-V2/boot/*                                        /mnt/usb1
+shell# cp image-5.4.0-xlnx-v2020.2-zynqmp-fpga                            /mnt/usb1
+shell# cp image-5.10.0-xlnx-v2021.1-zynqmp-fpga                           /mnt/usb1
 ```
 
 #### Make RootFS Partition
 
 ```console
-shell# tar xfz debian11-rootfs-vanilla.tgz -C                             /mnt/usb2
+shell# cat debian11-rootfs-vanilla.tgz.files/* | tar xfz - -C             /mnt/usb2
 shell# mkdir                                                              /mnt/usb2/home/fpga/debian
 shell# cp linux-image-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb     /mnt/usb2/home/fpga/debian
 shell# cp linux-headers-5.4.0-xlnx-v2020.2-zynqmp-fpga_5.4.0-xlnx-v2020.2-zynqmp-fpga-3_arm64.deb   /mnt/usb2/home/fpga/debian