diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 78f37e4..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -*.deb filter=lfs diff=lfs merge=lfs -text -*.tgz filter=lfs diff=lfs merge=lfs -text diff --git a/Readme.md b/Readme.md index 3402367..0dc3f3a 100644 --- a/Readme.md +++ b/Readme.md @@ -55,8 +55,7 @@ Install + [DE0-Nano-SoC](doc/install/de0-nano-soc.md) + [DE10-Nano](doc/install/de10-nano.md) * [Install Device Drivers and Services](doc/install/device-drivers.md) -* [Upgrade to v1.3.0 from v1.0.x/v1.1.x/v1.2.x](doc/install/upgrade-v1.3.0.md) -* [Upgrade to v2.1.0 from v2.0.x](doc/install/upgrade-v2.1.0.md) +* [Upgrade to v2.1.1 from v2.0.x](doc/install/upgrade-v2.1.1.md) Tutorial ------------------------------------------------------------------------------------ diff --git a/debian11-rootfs-vanilla.tgz b/debian11-rootfs-vanilla.tgz deleted file mode 100644 index d64ed15..0000000 --- a/debian11-rootfs-vanilla.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6bed9b54468611fc417561718d68b32b1a7e0b5db3151df4f41957bd46b80ed -size 334602320 diff --git a/debian11-rootfs-vanilla.tgz.files/x00 b/debian11-rootfs-vanilla.tgz.files/x00 new file mode 100644 index 0000000..1a66614 Binary files /dev/null and b/debian11-rootfs-vanilla.tgz.files/x00 differ diff --git a/debian11-rootfs-vanilla.tgz.files/x01 b/debian11-rootfs-vanilla.tgz.files/x01 new file mode 100644 index 0000000..12d85c7 Binary files /dev/null and b/debian11-rootfs-vanilla.tgz.files/x01 differ diff --git a/debian11-rootfs-vanilla.tgz.files/x02 b/debian11-rootfs-vanilla.tgz.files/x02 new file mode 100644 index 0000000..583948f Binary files /dev/null and b/debian11-rootfs-vanilla.tgz.files/x02 differ diff --git a/debian11-rootfs-vanilla.tgz.files/x03 b/debian11-rootfs-vanilla.tgz.files/x03 new file mode 100644 index 0000000..c42af71 Binary files /dev/null and b/debian11-rootfs-vanilla.tgz.files/x03 differ diff --git a/debian11-rootfs-vanilla.tgz.files/x04 b/debian11-rootfs-vanilla.tgz.files/x04 new file mode 100644 index 0000000..06504e0 Binary files /dev/null and b/debian11-rootfs-vanilla.tgz.files/x04 differ diff --git a/debian11-rootfs-vanilla.tgz.files/x05 b/debian11-rootfs-vanilla.tgz.files/x05 new file mode 100644 index 0000000..f52a6e9 Binary files /dev/null and b/debian11-rootfs-vanilla.tgz.files/x05 differ diff --git a/debian11-rootfs-vanilla.tgz.files/x06 b/debian11-rootfs-vanilla.tgz.files/x06 new file mode 100644 index 0000000..5b8dee9 Binary files /dev/null and b/debian11-rootfs-vanilla.tgz.files/x06 differ diff --git a/debian11-rootfs-vanilla.tgz.files/x07 b/debian11-rootfs-vanilla.tgz.files/x07 new file mode 100644 index 0000000..6f0d5e0 Binary files /dev/null and b/debian11-rootfs-vanilla.tgz.files/x07 differ diff --git a/doc/build/debian11-rootfs.md b/doc/build/debian11-rootfs.md index a74ae38..0e88c41 100644 --- a/doc/build/debian11-rootfs.md +++ b/doc/build/debian11-rootfs.md @@ -224,5 +224,14 @@ 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 + +```console +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-kernel-5.10.109.md b/doc/build/linux-kernel-5.10.109.md index 836c48c..3c5e0ad 100644 --- a/doc/build/linux-kernel-5.10.109.md +++ b/doc/build/linux-kernel-5.10.109.md @@ -75,43 +75,44 @@ shell$ make zynq-pynqz1.dtb shell$ make socfpga_cyclone5_de0_nano_soc.dtb ```` -#### Copy zImage and devicetree to target/zybo-zynq/boot/ +#### Copy zImage to vmlinuz-5.10.109-armv7-fpga + +```console +shell$ cp arch/arm/boot/zImage ../vmlinuz-5.10.109-armv7-fpga +``` + +#### Copy devicetree to target/zybo-zynq/boot/ ```console -shell$ cp arch/arm/boot/zImage ../target/zynq-zybo/boot/vmlinuz-5.10.109-armv7-fpga shell$ cp arch/arm/boot/dts/zynq-zybo.dtb ../target/zynq-zybo/boot/devicetree-5.10.109-zynq-zybo.dtb shell$ ./scripts/dtc/dtc -I dtb -O dts -o ../target/zynq-zybo/boot/devicetree-5.10.109-zynq-zybo.dts arch/arm/boot/dts/zynq-zybo.dtb ``` -#### Copy zImage and devicetree to tareget/zybo-zynq-z7/boot/ +#### Copy devicetree to tareget/zybo-zynq-z7/boot/ ```console -shell$ cp arch/arm/boot/zImage ../target/zynq-zybo-z7/boot/vmlinuz-5.10.109-armv7-fpga shell$ cp arch/arm/boot/dts/zynq-zybo-z7.dtb ../target/zynq-zybo-z7/boot/devicetree-5.10.109-zynq-zybo-z7.dtb shell$ ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/zynq-zybo-z7/boot/devicetree-5.10.109-zynq-zybo-z7.dts arch/arm/boot/dts/zynq-zybo-z7.dtb ``` -#### Copy zImage and devicetree to target/zybo-pynqz1/boot/ +#### Copy devicetree to target/zybo-pynqz1/boot/ ```console -shell$ cp arch/arm/boot/zImage ../target/zynq-pynqz1/boot/vmlinuz-5.10.109-armv7-fpga shell$ cp arch/arm/boot/dts/zynq-pynqz1.dtb ../target/zynq-pynqz1/boot/devicetree-5.10.109-zynq-pynqz1.dtb shell$ ./scripts/dtc/dtc -I dtb -O dts -o ../target/zynq-pynqz1/boot/devicetree-5.10.109-zynq-pynqz1.dts arch/arm/boot/dts/zynq-pynqz1.dtb ``` -#### Copy zImage and devicetree to target/de0-nano-soc/boot/ +#### Copy devicetree to target/de0-nano-soc/boot/ ```console -shell$ cp arch/arm/boot/zImage ../target/de0-nano-soc/boot/vmlinuz-5.10.109-armv7-fpga shell$ cp arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dtb ../target/de0-nano-soc/boot/devicetree-5.10.109-socfpga.dtb shell$ ./scripts/dtc/dtc -I dtb -O dts -o ../target/de0-nano-soc/boot/devicetree-5.10.109-socfpga.dts arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dtb ``` -#### Copy zImage and devicetree to tareget/de10-nano/boot/ +#### Copy devicetree to tareget/de10-nano/boot/ ```console -shell$ cp arch/arm/boot/zImage ../target/de10-nano/boot/vmlinuz-5.10.109-armv7-fpga shell$ cp arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dtb ../target/de10-nano/boot/devicetree-5.10.109-socfpga.dtb shell$ ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/de10-nano/boot/devicetree-5.10.109-socfpga.dts arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dtb ``` diff --git a/doc/install/de0-nano-soc.md b/doc/install/de0-nano-soc.md index 001603c..8b4df8d 100644 --- a/doc/install/de0-nano-soc.md +++ b/doc/install/de0-nano-soc.md @@ -5,9 +5,9 @@ **Note: Downloading the entire repository takes time, so download the source code from /~https://github.com/ikwzm/FPGA-SoC-Linux/releases.** ```console -shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.0.tar.gz -shell$ tar xfz v2.1.0.tar.gz -shell$ cd FPGA-SoC-Linux-v2.1.0 +shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.1.tar.gz +shell$ tar xfz v2.1.1.tar.gz +shell$ cd FPGA-SoC-Linux-v2.1.1 ``` #### File Description @@ -16,21 +16,22 @@ shell$ cd FPGA-SoC-Linux-v2.1.0 + boot/ - DE0_NANO_SOC.rbf : FPGA configuration file (Raw Binary Format) - uEnv.txt : U-Boot environment variables for linux boot - - vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image (use Git LFS) - devicetree-5.10.109-socfpga.dtb : Linux Device Tree Blob - devicetree-5.10.109-socfpga.dts : Linux Device Tree Source + u-boot/ - u-boot-spl.sfp : Stage 1 Boot Loader(U-boot-spl) - u-boot.img : Stage 2 Boot Loader(U-boot) + examples/ : Example Programs - * debian11-rootfs-vanilla.tgz : Debian11 Root File System (use Git LFS) - * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package (use Git LFS) - * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package (use Git LFS) - * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage (use Git LFS) - * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module (use Git LFS) - * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module (use Git LFS) - * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module (use Git LFS) - * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module (use Git LFS) + * vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image + * debian11-rootfs-vanilla.tgz.files/ : Debian11 Root File System + + x00 .. x07 : (splited files) + * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package + * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package + * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage + * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module + * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module + * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module + * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module #### Format SD-Card @@ -44,12 +45,13 @@ shell# mount /dev/sdc2 /mnt/usb2 shell# cp target/de0-nano-soc/boot/* /mnt/usb1 shell# dd if=target/de0-nano-soc/u-boot/u-boot-spl.sfp of=/dev/sdc3 bs=64k seek=0 shell# dd if=target/de0-nano-soc/u-boot/u-boot.img of=/dev/sdc3 bs=64k seek=4 -shell# tar xfz debian11-rootfs-vanilla.tgz -C /mnt/usb2 +shell# cp vmlinuz-5.10.109-armv7-fpga /mnt/usb1 +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.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp dtbocfg-ctrl_0.0.5-1_all.deb /mnt/usb2/home/fpga/debian -shell$ cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb /mnt/usb2/home/fpga/debian shell# cp zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb /mnt/usb2/home/fpga/debian diff --git a/doc/install/de10-nano.md b/doc/install/de10-nano.md index 3fdc18a..59610c9 100644 --- a/doc/install/de10-nano.md +++ b/doc/install/de10-nano.md @@ -5,9 +5,9 @@ **Note: Downloading the entire repository takes time, so download the source code from /~https://github.com/ikwzm/FPGA-SoC-Linux/releases.** ```console -shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.0.tar.gz -shell$ tar xfz v2.1.0.tar.gz -shell$ cd FPGA-SoC-Linux-v2.1.0 +shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.1.tar.gz +shell$ tar xfz v2.1.1.tar.gz +shell$ cd FPGA-SoC-Linux-v2.1.1 ``` #### File Description @@ -15,20 +15,21 @@ shell$ cd FPGA-SoC-Linux-v2.1.0 * target/de10-nano/ + boot/ - uEnv.txt : U-Boot environment variables for linux boot - - vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image (use Git LFS) - devicetree-5.10.109-socfpga.dtb : Linux Device Tree Blob - devicetree-5.10.109-socfpga.dts : Linux Device Tree Source + u-boot/ - u-boot-spl.sfp : Stage 1 Boot Loader(U-boot-spl) - u-boot.img : Stage 2 Boot Loader(U-boot) - * debian11-rootfs-vanilla.tgz : Debian11 Root File System (use Git LFS) - * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package (use Git LFS) - * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package (use Git LFS) - * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage (use Git LFS) - * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module (use Git LFS) - * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module (use Git LFS) - * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module (use Git LFS) - * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module (use Git LFS) + * vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image + * debian11-rootfs-vanilla.tgz.files/ : Debian11 Root File System + + x00 .. x07 : (splited files) + * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package + * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package + * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage + * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module + * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module + * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module + * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module #### Format SD-Card @@ -42,12 +43,13 @@ shell# mount /dev/sdc2 /mnt/usb2 shell# cp target/de10-nano/boot/* /mnt/usb1 shell# dd if=target/de10-nano/u-boot/u-boot-spl.sfp of=/dev/sdc3 bs=64k seek=0 shell# dd if=target/de10-nano/u-boot/u-boot.img of=/dev/sdc3 bs=64k seek=4 -shell# tar xfz debian11-rootfs-vanilla.tgz -C /mnt/usb2 +shell# cp vmlinuz-5.10.109-armv7-fpga /mnt/usb1 +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.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp dtbocfg-ctrl_0.0.5-1_all.deb /mnt/usb2/home/fpga/debian -shell$ cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb /mnt/usb2/home/fpga/debian shell# cp zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb /mnt/usb2/home/fpga/debian diff --git a/doc/install/upgrade-v2.1.0.md b/doc/install/upgrade-v2.1.0.md deleted file mode 100644 index 970f7f3..0000000 --- a/doc/install/upgrade-v2.1.0.md +++ /dev/null @@ -1,80 +0,0 @@ -Upgrade to v2.1.0 from v2.0.x ------------------------------------------------------------------------------------- - -### Boot and login root user - -root'password is "admin". - -```console -debian-fpga login: root -Password: -root@debian-fpga:~# -``` - -### Download FPGA-SoC-Linux v2.1.0 - -```console -root@debian-fpga:~# wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.0.tar.gz -root@debian-fpga:~# tar xfz v2.1.0.tar.gz -root@debian-fpga:~# cd FPGA-SoC-Linux-v2.1.0 -``` - -### Backup /mnt/boot/uEnv.txt - -```console -root@debian-fpga:~/FPGA-SoC-Linux-v2.1.0# cp /mnt/boot/uEnv.txt /mnt/boot/uEnv.txt.org -``` - -### Install files for Booting - -#### ZYBO - -```console -root@debian-fpga:~/FPGA-SoC-Linux-v2.1.0# cp target/zynq-zybo/boot/* /mnt/boot -``` - -#### PYNQ - -```console -root@debian-fpga:~/FPGA-SoC-Linux-v2.1.0# cp target/zynq-pynqzq/boot/* /mnt/boot -``` - -#### ZYBO-Z7 - -```console -root@debian-fpga:~/FPGA-SoC-Linux-v2.1.0# cp target/zynq-zybo-z7/boot/* /mnt/boot -``` - -#### DE0-Nano-SoC - -```console -root@debian-fpga:~/FPGA-SoC-Linux-v2.1.0# cp target/de0-nano-soc/boot/* /mnt/boot -``` - -#### DE10-Nano - -```console -root@debian-fpga:~/FPGA-SoC-Linux-v2.1.0# cp target/de10-nano/boot/* /mnt/boot -``` - -### Setup /mnt/boot/uEnv.txt - -If /mnt/boot/uEnv.txt.org has its own settings, please reflect it in the new /mnt/boot/uEnv.txt. - -### Copy Debian Packages to /home/fpga/debian - -```console -root@debian-fpga:~/FPGA-SoC-Linux-v2.1.0# cp *.deb /home/fpga/debian -``` - -### Install Kernel Image and Device Drivers - -[doc/install/device-drivers.md](device-drivers.md) - -### Upgrade to Debian 11.3 - -```console -root@debian-fpga:~# apt update -y -root@debian-fpga:~# apt upgrade -y -``` - diff --git a/doc/install/upgrade-v2.1.1.md b/doc/install/upgrade-v2.1.1.md new file mode 100644 index 0000000..e0a25cc --- /dev/null +++ b/doc/install/upgrade-v2.1.1.md @@ -0,0 +1,85 @@ +Upgrade to v2.1.1 from v2.0.x +------------------------------------------------------------------------------------ + +### Boot and login root user + +root'password is "admin". + +```console +debian-fpga login: root +Password: +root@debian-fpga:~# +``` + +### Download FPGA-SoC-Linux v2.1.1 + +```console +root@debian-fpga:~# wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.1.tar.gz +root@debian-fpga:~# tar xfz v2.1.1.tar.gz +root@debian-fpga:~# cd FPGA-SoC-Linux-v2.1.1 +``` + +### Backup /mnt/boot/uEnv.txt + +```console +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp /mnt/boot/uEnv.txt /mnt/boot/uEnv.txt.org +``` + +### Install files for Booting + +#### ZYBO + +```console +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp vmlinuz-5.10.109-armv7-fpga /mnt/boot +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp target/zynq-zybo/boot/* /mnt/boot +``` + +#### PYNQ + +```console +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp vmlinuz-5.10.109-armv7-fpga /mnt/boot +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp target/zynq-pynqzq/boot/* /mnt/boot +``` + +#### ZYBO-Z7 + +```console +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp vmlinuz-5.10.109-armv7-fpga /mnt/boot +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp target/zynq-zybo-z7/boot/* /mnt/boot +``` + +#### DE0-Nano-SoC + +```console +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp vmlinuz-5.10.109-armv7-fpga /mnt/boot +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp target/de0-nano-soc/boot/* /mnt/boot +``` + +#### DE10-Nano + +```console +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp vmlinuz-5.10.109-armv7-fpga /mnt/boot +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp target/de10-nano/boot/* /mnt/boot +``` + +### Setup /mnt/boot/uEnv.txt + +If /mnt/boot/uEnv.txt.org has its own settings, please reflect it in the new /mnt/boot/uEnv.txt. + +### Copy Debian Packages to /home/fpga/debian + +```console +root@debian-fpga:~/FPGA-SoC-Linux-v2.1.1# cp *.deb /home/fpga/debian +``` + +### Install Kernel Image and Device Drivers + +[doc/install/device-drivers.md](device-drivers.md) + +### Upgrade to Debian 11.3 + +```console +root@debian-fpga:~# apt update -y +root@debian-fpga:~# apt upgrade -y +``` + diff --git a/doc/install/zynq-pynqz1.md b/doc/install/zynq-pynqz1.md index dcfcbcf..eaa3f56 100644 --- a/doc/install/zynq-pynqz1.md +++ b/doc/install/zynq-pynqz1.md @@ -5,9 +5,9 @@ **Note: Downloading the entire repository takes time, so download the source code from /~https://github.com/ikwzm/FPGA-SoC-Linux/releases.** ```console -shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.0.tar.gz -shell$ tar xfz v2.1.0.tar.gz -shell$ cd FPGA-SoC-Linux-v2.1.0 +shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.1.tar.gz +shell$ tar xfz v2.1.1.tar.gz +shell$ cd FPGA-SoC-Linux-v2.1.1 ``` #### File Description @@ -17,19 +17,20 @@ shell$ cd FPGA-SoC-Linux-v2.1.0 - boot.bin : Stage 1 Boot Loader(U-boot-spl) - u-boot.img : Stage 2 Boot Loader(U-boot) - uEnv.txt : U-Boot environment variables for linux boot - - vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image (use Git LFS) - devicetree-5.10.109-zynq-pynqz1.dtb : Linux Device Tree Blob - devicetree-5.10.109-zynq-pynqz1.dts : Linux Device Tree Source + examples/ : Example Programs - * debian11-rootfs-vanilla.tgz : Debian11 Root File System (use Git LFS) - * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package (use Git LFS) - * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package (use Git LFS) - * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage (use Git LFS) - * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module (use Git LFS) - * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module (use Git LFS) - * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module (use Git LFS) - * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module (use Git LFS) - * zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb : Zynq AFI Kernel Module (use Git LFS) + * vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image + * debian11-rootfs-vanilla.tgz.files/ : Debian11 Root File System + + x00 .. x07 : (splited files) + * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package + * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package + * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage + * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module + * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module + * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module + * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module + * zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb : Zynq AFI Kernel Module #### Format SD-Card @@ -41,12 +42,13 @@ shell$ cd FPGA-SoC-Linux-v2.1.0 shell# mount /dev/sdc1 /mnt/usb1 shell# mount /dev/sdc2 /mnt/usb2 shell# cp target/zynq-pynqz1/boot/* /mnt/usb1 -shell# tar xfz debian11-rootfs-vanilla.tgz -C /mnt/usb2 +shell# cp vmlinuz-5.10.109-armv7-fpga /mnt/usb1 +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.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp dtbocfg-ctrl_0.0.5-1_all.deb /mnt/usb2/home/fpga/debian -shell$ cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb /mnt/usb2/home/fpga/debian shell# cp zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb /mnt/usb2/home/fpga/debian diff --git a/doc/install/zynq-zybo-de0-nano-soc.md b/doc/install/zynq-zybo-de0-nano-soc.md index 6e63ded..dbdc165 100644 --- a/doc/install/zynq-zybo-de0-nano-soc.md +++ b/doc/install/zynq-zybo-de0-nano-soc.md @@ -4,10 +4,12 @@ It corresponds to boot of both ZYBO and DE0-Nano-SoC in one SD-Card. #### Downlowd from github +**Note: Downloading the entire repository takes time, so download the source code from /~https://github.com/ikwzm/FPGA-SoC-Linux/releases.** + ```console -shell$ git clone --depth=1 --branch v1.0.1 git://github.com/ikwzm/FPGA-SoC-Linux -shell$ cd FPGA-SoC-Linux -shell$ git lfs pull +shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.1.tar.gz +shell$ tar xfz v2.1.1.tar.gz +shell$ cd FPGA-SoC-Linux-v2.1.1 ``` #### Build boot files @@ -23,14 +25,14 @@ Load Address: 00000000 Entry Point: 00000000 Contents: Image 0: 1870 Bytes = 1.83 kB = 0.00 MB -cp ../zynq-zybo/boot/vmlinuz-4.19.57-armv7-fpga boot/vmlinuz-4.19.57-armv7-fpga +cp ../../vmlinuz-5.10.109-armv7-fpga boot/ cp ../zynq-zybo/boot/boot.bin boot/boot.bin cp ../zynq-zybo/boot/design_1_wrapper.bit boot/design_1_wrapper.bit -cp ../zynq-zybo/boot/devicetree-4.19.57-zynq-zybo.dtb boot/devicetree-4.19.57-zynq-zybo.dtb -cp ../zynq-zybo/boot/devicetree-4.19.57-zynq-zybo.dts boot/devicetree-4.19.57-zynq-zybo.dts +cp ../zynq-zybo/boot/devicetree-5.10.109-zynq-zybo.dtb boot/devicetree-5.10.109-zynq-zybo.dtb +cp ../zynq-zybo/boot/devicetree-5.10.109-zynq-zybo.dts boot/devicetree-5.10.109-zynq-zybo.dts cp ../zynq-zybo/boot/u-boot.img boot/u-boot.img -cp ../de0-nano-soc/boot/devicetree-4.19.57-socfpga.dtb boot/devicetree-4.19.57-socfpga.dtb -cp ../de0-nano-soc/boot/devicetree-4.19.57-socfpga.dts boot/devicetree-4.19.57-socfpga.dts +cp ../de0-nano-soc/boot/devicetree-5.10.109-socfpga.dtb boot/devicetree-5.10.109-socfpga.dtb +cp ../de0-nano-soc/boot/devicetree-5.10.109-socfpga.dts boot/devicetree-5.10.109-socfpga.dts cp ../de0-nano-soc/boot/DE0_NANO_SOC.rbf boot/DE0_NANO_SOC.rbf cp ../de0-nano-soc/u-boot/u-boot-spl.sfp u-boot/u-boot-spl.sfp cp ../de0-nano-soc/u-boot/u-boot.img u-boot/u-boot.img @@ -40,29 +42,31 @@ cp ../de0-nano-soc/u-boot/u-boot.img u-boot/u-boot.img * tareget/zynq-zybo-de0-nano-soc/ + boot/ - - boot.bin : Stage 1 Boot Loader (for ZYBO U-boot-spl) - - u-boot.img : Stage 2 Boot Loader (for ZYBO U-boot image) - - uEnv.txt : U-Boot environment variables for set kernel version - - boot.script : U-Boot boot script (source) - - boot.scr : U-Boot boot script (binary) - - design_1_wrapper.bit : FPGA configuration file (for ZYBO) - - DE0_NANO_SOC.rbf : FPGA configuration file (for DE0-Nano-SoC) - - vmlinuz-4.14.21-armv7-fpga : Linux Kernel Image - - devicetree-4.14.21-zynq-zybo.dtb : Linux Device Tree Blob (for ZYBO) - - devicetree-4.14.21-zynq-zybo.dts : Linux Device Tree Source (for ZYBO) - - devicetree-4.14.21-socfpga.dtb : Linux Device Tree Blob (for DE0-Nano-SoC) - - devicetree-4.14.21-socfpga.dts : Linux Device Tree Source (for DE0-Nano-SoC) + - boot.bin : Stage 1 Boot Loader (for ZYBO U-boot-spl) + - u-boot.img : Stage 2 Boot Loader (for ZYBO U-boot image) + - uEnv.txt : U-Boot environment variables for set kernel version + - boot.script : U-Boot boot script (source) + - boot.scr : U-Boot boot script (binary) + - design_1_wrapper.bit : FPGA configuration file (for ZYBO) + - DE0_NANO_SOC.rbf : FPGA configuration file (for DE0-Nano-SoC) + - vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image + - devicetree-5.10.109-zynq-zybo.dtb : Linux Device Tree Blob (for ZYBO) + - devicetree-5.10.109-zynq-zybo.dts : Linux Device Tree Source (for ZYBO) + - devicetree-5.10.109-socfpga.dtb : Linux Device Tree Blob (for DE0-Nano-SoC) + - devicetree-5.10.109-socfpga.dts : Linux Device Tree Source (for DE0-Nano-SoC) + u-boot/ - - u-boot-spl.sfp : Stage 1 Boot Loader (for DE0-Nano-SoC U-boot-spl) - - u-boot.img : Stage 2 Boot Loader (for DE0-Nano-SoC U-boot image) - * debian9-rootfs-vanilla.tgz : Debian9 Root File System (use Git LFS) - * linux-image-4.19.57-armv7-fpga_4.19.57-armv7-fpga-0_armhf.deb : Linux Image Package (use Git LFS) - * linux-headers-4.19.57-armv7-fpga_4.19.57-armv7-fpga-0_armhf.deb : Linux Headers Package (use Git LFS) - * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage (use Git LFS) - * dtbocfg-4.19.57-armv7-fpga_0.0.8-1_armhf.deb : dtbocfg Kernel Module (use Git LFS) - * fclkcfg-4.19.57-armv7-fpga_1.2.0-1_armhf.deb : fclkcfg Kernel Module (use Git LFS) - * udmabuf-4.19.57-armv7-fpga_1.4.2-1_armhf.deb : udmabuf Kernel Module (use Git LFS) - * zptty-4.19.57-armv7-fpga_1.0.0-1_armhf.deb : zptty Kernel Module (use Git LFS) + - u-boot-spl.sfp : Stage 1 Boot Loader (for DE0-Nano-SoC U-boot-spl) + - u-boot.img : Stage 2 Boot Loader (for DE0-Nano-SoC U-boot image) + * debian11-rootfs-vanilla.tgz.files/ : Debian11 Root File System + + x00 .. x07 : (splited files) + * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package + * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package + * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage + * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module + * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module + * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module + * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module + * zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb : Zynq AFI Kernel Module #### Format SD-Card @@ -73,18 +77,20 @@ cp ../de0-nano-soc/u-boot/u-boot.img u-boot/u-boot.img ````console shell# mount /dev/sdc1 /mnt/usb1 shell# mount /dev/sdc2 /mnt/usb2 -shell# cp target/zynq-zybo-de0-nano-soc/boot/* /mnt/usb1 +shell# cp target/zynq-zybo-de0-nano-soc/boot/* /mnt/usb1 shell# dd if=target/zynq-zybo-de0-nano-soc/u-boot/u-boot-spl.sfp of=/dev/sdc3 bs=64k seek=0 shell# dd if=target/zynq-zybo-de0-nano-soc/u-boot/u-boot.img of=/dev/sdc3 bs=64k seek=4 -shell# tar xfz debian9-rootfs-vanilla.tgz -C /mnt/usb2 -shell# mkdir /mnt/usb2/home/fpga/debian -shell# cp linux-image-4.19.57-armv7-fpga_4.19.57-armv7-fpga-0_armhf.deb /mnt/usb2/home/fpga/debian -shell# cp linux-headers-4.19.57-armv7-fpga_4.19.57-armv7-fpga-0_armhf.deb /mnt/usb2/home/fpga/debian -shell# cp dtbocfg-ctrl_0.0.5-1_all.deb /mnt/usb2/home/fpga/debian -shell# cp dtbocfg-4.19.57-armv7-fpga_0.0.8-1_armhf.deb /mnt/usb2/home/fpga/debian -shell# cp fclkcfg-4.19.57-armv7-fpga_1.2.0-1_armhf.deb /mnt/usb2/home/fpga/debian -shell# cp udmabuf-4.19.57-armv7-fpga_1.4.2-1_armhf.deb /mnt/usb2/home/fpga/debian -shell# cp zptty-4.19.57-armv7-fpga_1.0.0-1_armhf.deb /mnt/usb2/home/fpga/debian +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.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp dtbocfg-ctrl_0.0.5-1_all.deb /mnt/usb2/home/fpga/debian +shell# cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp zptty-5.10.109-armv7-fpga_1.0.0-1_armhf.deb /mnt/usb2/home/fpga/debian shell# umount mnt/usb1 shell# umount mnt/usb2 ```` diff --git a/doc/install/zynq-zybo-z7.md b/doc/install/zynq-zybo-z7.md index 31f6b7c..858f705 100644 --- a/doc/install/zynq-zybo-z7.md +++ b/doc/install/zynq-zybo-z7.md @@ -5,9 +5,9 @@ **Note: Downloading the entire repository takes time, so download the source code from /~https://github.com/ikwzm/FPGA-SoC-Linux/releases.** ```console -shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.0.tar.gz -shell$ tar xfz v2.1.0.tar.gz -shell$ cd FPGA-SoC-Linux-v2.1.0 +shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.1.tar.gz +shell$ tar xfz v2.1.1.tar.gz +shell$ cd FPGA-SoC-Linux-v2.1.1 ``` #### File Description @@ -17,18 +17,19 @@ shell$ cd FPGA-SoC-Linux-v2.1.0 - boot.bin : Stage 1 Boot Loader(U-boot-spl) - u-boot.img : Stage 2 Boot Loader(U-boot) - uEnv.txt : U-Boot environment variables for linux boot - - vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image (use Git LFS) - devicetree-5.10.109-zynq-zybo-z7.dtb : Linux Device Tree Blob - devicetree-5.10.109-zynq-zybo-z7.dts : Linux Device Tree Source - * debian11-rootfs-vanilla.tgz : Debian11 Root File System (use Git LFS) - * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package (use Git LFS) - * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package (use Git LFS) - * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage (use Git LFS) - * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module (use Git LFS) - * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module (use Git LFS) - * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module (use Git LFS) - * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module (use Git LFS) - * zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb : Zynq AFI Kernel Module (use Git LFS) + * vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image + * debian11-rootfs-vanilla.tgz.files/ : Debian11 Root File System + + x00 .. x07 : (splited files) + * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package + * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package + * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage + * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module + * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module + * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module + * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module + * zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb : Zynq AFI Kernel Module #### Format SD-Card @@ -40,12 +41,13 @@ shell$ cd FPGA-SoC-Linux-v2.1.0 shell# mount /dev/sdc1 /mnt/usb1 shell# mount /dev/sdc2 /mnt/usb2 shell# cp target/zynq-zybo-z7/boot/* /mnt/usb1 -shell# tar xfz debian11-rootfs-vanilla.tgz -C /mnt/usb2 +shell# cp vmlinuz-5.10.109-armv7-fpga /mnt/usb1 +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.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp dtbocfg-ctrl_0.0.5-1_all.deb /mnt/usb2/home/fpga/debian -shell$ cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb /mnt/usb2/home/fpga/debian shell# cp zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb /mnt/usb2/home/fpga/debian diff --git a/doc/install/zynq-zybo.md b/doc/install/zynq-zybo.md index 03a4cdd..b10303c 100644 --- a/doc/install/zynq-zybo.md +++ b/doc/install/zynq-zybo.md @@ -5,9 +5,9 @@ **Note: Downloading the entire repository takes time, so download the source code from /~https://github.com/ikwzm/FPGA-SoC-Linux/releases.** ```console -shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.0.tar.gz -shell$ tar xfz v2.1.0.tar.gz -shell$ cd FPGA-SoC-Linux-v2.1.0 +shell$ wget /~https://github.com/ikwzm/FPGA-SoC-Linux/archive/refs/tags/v2.1.1.tar.gz +shell$ tar xfz v2.1.1.tar.gz +shell$ cd FPGA-SoC-Linux-v2.1.1 ``` #### File Description @@ -18,19 +18,20 @@ shell$ cd FPGA-SoC-Linux-v2.1.0 - design_1_wrapper.bit : FPGA configuration file (Xilinx Bitstream Format) - u-boot.img : Stage 2 Boot Loader(U-boot) - uEnv.txt : U-Boot environment variables for linux boot - - vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image (use Git LFS) - devicetree-5.10.109-zynq-zybo.dtb : Linux Device Tree Blob - devicetree-5.10.109-zynq-zybo.dts : Linux Device Tree Source + examples/ : Example Programs - * debian11-rootfs-vanilla.tgz : Debian11 Root File System (use Git LFS) - * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package (use Git LFS) - * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package (use Git LFS) - * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage (use Git LFS) - * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module (use Git LFS) - * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module (use Git LFS) - * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module (use Git LFS) - * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module (use Git LFS) - * zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb : Zynq AFI Kernel Module (use Git LFS) + * vmlinuz-5.10.109-armv7-fpga : Linux Kernel Image + * debian11-rootfs-vanilla.tgz.files/ : Debian11 Root File System + + x00 .. x07 : (splited files) + * linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Image Package + * linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb : Linux Headers Package + * dtbocfg-ctrl_0.0.5-1_all.deb : dtbocfg Control Pakcage + * dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb : dtbocfg Kernel Module + * fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb : fclkcfg Kernel Module + * u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb : u-dma-buf Kernel Module + * zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb : zptty Kernel Module + * zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb : Zynq AFI Kernel Module #### Format SD-Card @@ -42,12 +43,13 @@ shell$ cd FPGA-SoC-Linux-v2.1.0 shell# mount /dev/sdc1 /mnt/usb1 shell# mount /dev/sdc2 /mnt/usb2 shell# cp target/zynq-zybo/boot/* /mnt/usb1 -shell# tar xfz debian11-rootfs-vanilla.tgz -C /mnt/usb2 +shell# cp vmlinuz-5.10.109-armv7-fpga /mnt/usb1 +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.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp dtbocfg-ctrl_0.0.5-1_all.deb /mnt/usb2/home/fpga/debian -shell$ cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian +shell# cp dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb /mnt/usb2/home/fpga/debian shell# cp u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb /mnt/usb2/home/fpga/debian shell# cp zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb /mnt/usb2/home/fpga/debian diff --git a/dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb b/dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb index 0dcfcb3..4b52b10 100644 Binary files a/dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb and b/dtbocfg-5.10.109-armv7-fpga_0.0.9-1_armhf.deb differ diff --git a/dtbocfg-ctrl_0.0.5-1_all.deb b/dtbocfg-ctrl_0.0.5-1_all.deb index cdf8cf5..f070cbf 100644 Binary files a/dtbocfg-ctrl_0.0.5-1_all.deb and b/dtbocfg-ctrl_0.0.5-1_all.deb differ diff --git a/fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb b/fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb index 9db7815..81d2ec3 100644 Binary files a/fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb and b/fclkcfg-5.10.109-armv7-fpga_1.7.2-1_armhf.deb differ diff --git a/linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb b/linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb index 9616a0e..99e146e 100644 Binary files a/linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb and b/linux-headers-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb differ diff --git a/linux-image-5.10.109-armv7-fpga-dbg_5.10.109-armv7-fpga-1_armhf.deb b/linux-image-5.10.109-armv7-fpga-dbg_5.10.109-armv7-fpga-1_armhf.deb index ee534d5..040827a 100644 Binary files a/linux-image-5.10.109-armv7-fpga-dbg_5.10.109-armv7-fpga-1_armhf.deb and b/linux-image-5.10.109-armv7-fpga-dbg_5.10.109-armv7-fpga-1_armhf.deb differ diff --git a/linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb b/linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb index 78dc2f5..8c519d8 100644 Binary files a/linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb and b/linux-image-5.10.109-armv7-fpga_5.10.109-armv7-fpga-1_armhf.deb differ diff --git a/scripts/build-linux-kernel-5.10.109.sh b/scripts/build-linux-kernel-5.10.109.sh index c1b969b..aaca2bd 100644 --- a/scripts/build-linux-kernel-5.10.109.sh +++ b/scripts/build-linux-kernel-5.10.109.sh @@ -42,28 +42,27 @@ make zynq-zybo-z7.dtb make zynq-pynqz1.dtb make socfpga_cyclone5_de0_nano_soc.dtb -### Copy zImage and devicetree to tareget/zybo-zynq/boot/ -cp arch/arm/boot/zImage ../target/zynq-zybo/boot/vmlinuz-5.10.109-armv7-fpga +### Copy zImage to vmlinuz-5.10.109-armv7-fpga + +cp arch/arm/boot/zImage ../vmlinuz-5.10.109-armv7-fpga + +### Copy devicetree to tareget/zybo-zynq/boot/ cp arch/arm/boot/dts/zynq-zybo.dtb ../target/zynq-zybo/boot/devicetree-5.10.109-zynq-zybo.dtb ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/zynq-zybo/boot/devicetree-5.10.109-zynq-zybo.dts arch/arm/boot/dts/zynq-zybo.dtb -### Copy zImage and devicetree to tareget/zybo-zynq-z7/boot/ -cp arch/arm/boot/zImage ../target/zynq-zybo-z7/boot/vmlinuz-5.10.109-armv7-fpga +### Copy devicetree to tareget/zybo-zynq-z7/boot/ cp arch/arm/boot/dts/zynq-zybo-z7.dtb ../target/zynq-zybo-z7/boot/devicetree-5.10.109-zynq-zybo-z7.dtb ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/zynq-zybo-z7/boot/devicetree-5.10.109-zynq-zybo-z7.dts arch/arm/boot/dts/zynq-zybo-z7.dtb -### Copy zImage and devicetree to tareget/zybo-pynqz1/boot/ -cp arch/arm/boot/zImage ../target/zynq-pynqz1/boot/vmlinuz-5.10.109-armv7-fpga +### Copy devicetree to tareget/zybo-pynqz1/boot/ cp arch/arm/boot/dts/zynq-pynqz1.dtb ../target/zynq-pynqz1/boot/devicetree-5.10.109-zynq-pynqz1.dtb ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/zynq-pynqz1/boot/devicetree-5.10.109-zynq-pynqz1.dts arch/arm/boot/dts/zynq-pynqz1.dtb -### Copy zImage and devicetree to tareget/de0-nano-soc/boot/ -cp arch/arm/boot/zImage ../target/de0-nano-soc/boot/vmlinuz-5.10.109-armv7-fpga +### Copy devicetree to tareget/de0-nano-soc/boot/ cp arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dtb ../target/de0-nano-soc/boot/devicetree-5.10.109-socfpga.dtb ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/de0-nano-soc/boot/devicetree-5.10.109-socfpga.dts arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dtb -### Copy zImage and devicetree to tareget/de10-nano/boot/ -cp arch/arm/boot/zImage ../target/de10-nano/boot/vmlinuz-5.10.109-armv7-fpga +### Copy devicetree to tareget/de10-nano/boot/ cp arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dtb ../target/de10-nano/boot/devicetree-5.10.109-socfpga.dtb ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/de10-nano/boot/devicetree-5.10.109-socfpga.dts arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dtb diff --git a/target/de0-nano-soc/boot/.gitattributes b/target/de0-nano-soc/boot/.gitattributes deleted file mode 100644 index fc91484..0000000 --- a/target/de0-nano-soc/boot/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -vmlinuz-* filter=lfs diff=lfs merge=lfs -text -zImage-* filter=lfs diff=lfs merge=lfs -text -*.rbf filter=lfs diff=lfs merge=lfs -text diff --git a/target/de0-nano-soc/boot/DE0_NANO_SOC.rbf b/target/de0-nano-soc/boot/DE0_NANO_SOC.rbf index 6535cee..5c3eaeb 100755 Binary files a/target/de0-nano-soc/boot/DE0_NANO_SOC.rbf and b/target/de0-nano-soc/boot/DE0_NANO_SOC.rbf differ diff --git a/target/de0-nano-soc/boot/vmlinuz-5.10.109-armv7-fpga b/target/de0-nano-soc/boot/vmlinuz-5.10.109-armv7-fpga deleted file mode 100755 index af43e40..0000000 --- a/target/de0-nano-soc/boot/vmlinuz-5.10.109-armv7-fpga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d840462c64e05fbae3597f6a9d5a165252a347d37b578a9191cb9355b545100a -size 5097584 diff --git a/target/de10-nano/boot/.gitattributes b/target/de10-nano/boot/.gitattributes deleted file mode 100644 index 48a77f4..0000000 --- a/target/de10-nano/boot/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -vmlinuz-* filter=lfs diff=lfs merge=lfs -text -zImage-* filter=lfs diff=lfs merge=lfs -text diff --git a/target/de10-nano/boot/vmlinuz-5.10.109-armv7-fpga b/target/de10-nano/boot/vmlinuz-5.10.109-armv7-fpga deleted file mode 100755 index af43e40..0000000 --- a/target/de10-nano/boot/vmlinuz-5.10.109-armv7-fpga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d840462c64e05fbae3597f6a9d5a165252a347d37b578a9191cb9355b545100a -size 5097584 diff --git a/target/zynq-pynqz1/boot/.gitattributes b/target/zynq-pynqz1/boot/.gitattributes deleted file mode 100644 index 48a77f4..0000000 --- a/target/zynq-pynqz1/boot/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -vmlinuz-* filter=lfs diff=lfs merge=lfs -text -zImage-* filter=lfs diff=lfs merge=lfs -text diff --git a/target/zynq-pynqz1/boot/vmlinuz-5.10.109-armv7-fpga b/target/zynq-pynqz1/boot/vmlinuz-5.10.109-armv7-fpga deleted file mode 100755 index af43e40..0000000 --- a/target/zynq-pynqz1/boot/vmlinuz-5.10.109-armv7-fpga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d840462c64e05fbae3597f6a9d5a165252a347d37b578a9191cb9355b545100a -size 5097584 diff --git a/target/zynq-zybo-de0-nano-soc/Makefile b/target/zynq-zybo-de0-nano-soc/Makefile index 7e3a468..2dc5724 100644 --- a/target/zynq-zybo-de0-nano-soc/Makefile +++ b/target/zynq-zybo-de0-nano-soc/Makefile @@ -1,4 +1,5 @@ -VERSION=4.19.57 +VERSION=5.10.109 +ROOT_PATH=../.. XILINX_TARGET_PATH=../zynq-zybo ALTERA_TARGET_PATH=../de0-nano-soc @@ -28,7 +29,7 @@ clean : boot/boot.scr : boot/boot.script mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "linux boot script" -d boot/boot.script boot/boot.scr -boot/vmlinuz-$(VERSION)-armv7-fpga : $(XILINX_TARGET_PATH)/boot/vmlinuz-$(VERSION)-armv7-fpga +boot/vmlinuz-$(VERSION)-armv7-fpga : $(ROOT_PATH)/vmlinuz-$(VERSION)-armv7-fpga $(COPY) $< $@ boot/boot.bin : $(XILINX_TARGET_PATH)/boot/boot.bin diff --git a/target/zynq-zybo-de0-nano-soc/boot/uEnv.txt b/target/zynq-zybo-de0-nano-soc/boot/uEnv.txt index 7edb6ee..e233083 100644 --- a/target/zynq-zybo-de0-nano-soc/boot/uEnv.txt +++ b/target/zynq-zybo-de0-nano-soc/boot/uEnv.txt @@ -1,3 +1,3 @@ -bootmenu_0=Boot 4.14.34=env set kernel_version 4.14.34 && boot +bootmenu_0=Boot 5.10.109=env set kernel_version 5.10.109 && boot diff --git a/target/zynq-zybo-z7/boot/.gitattributes b/target/zynq-zybo-z7/boot/.gitattributes deleted file mode 100644 index 48a77f4..0000000 --- a/target/zynq-zybo-z7/boot/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -vmlinuz-* filter=lfs diff=lfs merge=lfs -text -zImage-* filter=lfs diff=lfs merge=lfs -text diff --git a/target/zynq-zybo-z7/boot/vmlinuz-5.10.109-armv7-fpga b/target/zynq-zybo-z7/boot/vmlinuz-5.10.109-armv7-fpga deleted file mode 100755 index af43e40..0000000 --- a/target/zynq-zybo-z7/boot/vmlinuz-5.10.109-armv7-fpga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d840462c64e05fbae3597f6a9d5a165252a347d37b578a9191cb9355b545100a -size 5097584 diff --git a/target/zynq-zybo/boot/.gitattributes b/target/zynq-zybo/boot/.gitattributes deleted file mode 100644 index 1838c66..0000000 --- a/target/zynq-zybo/boot/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -vmlinuz-* filter=lfs diff=lfs merge=lfs -text -zImage-* filter=lfs diff=lfs merge=lfs -text -*.bit filter=lfs diff=lfs merge=lfs -text diff --git a/target/zynq-zybo/boot/design_1_wrapper.bit b/target/zynq-zybo/boot/design_1_wrapper.bit index b2b82e4..ca61f42 100755 Binary files a/target/zynq-zybo/boot/design_1_wrapper.bit and b/target/zynq-zybo/boot/design_1_wrapper.bit differ diff --git a/target/zynq-zybo/boot/vmlinuz-5.10.109-armv7-fpga b/target/zynq-zybo/boot/vmlinuz-5.10.109-armv7-fpga deleted file mode 100755 index af43e40..0000000 --- a/target/zynq-zybo/boot/vmlinuz-5.10.109-armv7-fpga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d840462c64e05fbae3597f6a9d5a165252a347d37b578a9191cb9355b545100a -size 5097584 diff --git a/u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb b/u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb index 55aa28b..3a4448d 100644 Binary files a/u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb and b/u-dma-buf-5.10.109-armv7-fpga_3.2.5-0_armhf.deb differ diff --git a/vmlinuz-5.10.109-armv7-fpga b/vmlinuz-5.10.109-armv7-fpga new file mode 100755 index 0000000..b6ea9bc Binary files /dev/null and b/vmlinuz-5.10.109-armv7-fpga differ diff --git a/zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb b/zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb index 10345ff..8ba9e60 100644 Binary files a/zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb and b/zptty-5.10.109-armv7-fpga_1.1.0-1_armhf.deb differ diff --git a/zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb b/zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb index b95bad0..6dc023a 100644 Binary files a/zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb and b/zynq-afi-5.10.109-armv7-fpga_0.0.1-0_armhf.deb differ