Skip to content

Commit

Permalink
Merge branch 'build-v2.1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
ikwzm committed Apr 6, 2022
2 parents fd74c45 + 8814aed commit e100b34
Show file tree
Hide file tree
Showing 46 changed files with 248 additions and 250 deletions.
2 changes: 0 additions & 2 deletions .gitattributes

This file was deleted.

3 changes: 1 addition & 2 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------------------------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions debian11-rootfs-vanilla.tgz

This file was deleted.

Binary file added debian11-rootfs-vanilla.tgz.files/x00
Binary file not shown.
Binary file added debian11-rootfs-vanilla.tgz.files/x01
Binary file not shown.
Binary file added debian11-rootfs-vanilla.tgz.files/x02
Binary file not shown.
Binary file added debian11-rootfs-vanilla.tgz.files/x03
Binary file not shown.
Binary file added debian11-rootfs-vanilla.tgz.files/x04
Binary file not shown.
Binary file added debian11-rootfs-vanilla.tgz.files/x05
Binary file not shown.
Binary file added debian11-rootfs-vanilla.tgz.files/x06
Binary file not shown.
Binary file added debian11-rootfs-vanilla.tgz.files/x07
Binary file not shown.
9 changes: 9 additions & 0 deletions doc/build/debian11-rootfs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
```
21 changes: 11 additions & 10 deletions doc/build/linux-kernel-5.10.109.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
30 changes: 16 additions & 14 deletions doc/install/de0-nano-soc.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down
30 changes: 16 additions & 14 deletions doc/install/de10-nano.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,31 @@
**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

* 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

Expand All @@ -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
Expand Down
80 changes: 0 additions & 80 deletions doc/install/upgrade-v2.1.0.md

This file was deleted.

85 changes: 85 additions & 0 deletions doc/install/upgrade-v2.1.1.md
Original file line number Diff line number Diff line change
@@ -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
```

Loading

0 comments on commit e100b34

Please sign in to comment.