From 8814aedf0458db01d51d48720f4ffffb29149265 Mon Sep 17 00:00:00 2001 From: Ichiro Kawazome Date: Thu, 7 Apr 2022 07:14:05 +0900 Subject: [PATCH] [update] doc/install/zynq-zybo-de0-nano-soc.md and target/zynq-zybo-de0-nano-soc --- doc/install/zynq-zybo-de0-nano-soc.md | 86 +++++++++++---------- target/zynq-zybo-de0-nano-soc/Makefile | 5 +- target/zynq-zybo-de0-nano-soc/boot/uEnv.txt | 2 +- 3 files changed, 50 insertions(+), 43 deletions(-) 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/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