From 64a520ce75f2edb9ddd31a59d7f1a6388fd10abe Mon Sep 17 00:00:00 2001 From: ikwzm Date: Wed, 8 Nov 2017 23:06:01 +0900 Subject: [PATCH] [rename] kernel image file to 'vmlinuz-*' from 'zImage-*' --- doc/build/linux-kernel-4.12.14.md | 8 ++++---- doc/install/de0-nano-soc.md | 4 ++-- doc/install/zynq-pynqz1.md | 4 ++-- doc/install/zynq-zybo-de0-nano-soc.md | 6 +++--- doc/install/zynq-zybo-z7.md | 4 ++-- doc/install/zynq-zybo.md | 4 ++-- scripts/build-linux-kernel.sh | 8 ++++---- target/de0-nano-soc/boot/uEnv.txt | 2 +- ...mage-4.12.14-armv7-fpga => vmlinuz-4.12.14-armv7-fpga} | 0 target/zynq-pynqz1/boot/uEnv.txt | 2 +- ...mage-4.12.14-armv7-fpga => vmlinuz-4.12.14-armv7-fpga} | 0 target/zynq-zybo-de0-nano-soc/Makefile | 4 ++-- target/zynq-zybo-de0-nano-soc/boot/boot.script | 4 ++-- target/zynq-zybo-z7/boot/uEnv.txt | 2 +- ...mage-4.12.14-armv7-fpga => vmlinuz-4.12.14-armv7-fpga} | 0 target/zynq-zybo/boot/uEnv.txt | 2 +- ...mage-4.12.14-armv7-fpga => vmlinuz-4.12.14-armv7-fpga} | 0 17 files changed, 27 insertions(+), 27 deletions(-) rename target/de0-nano-soc/boot/{zImage-4.12.14-armv7-fpga => vmlinuz-4.12.14-armv7-fpga} (100%) rename target/zynq-pynqz1/boot/{zImage-4.12.14-armv7-fpga => vmlinuz-4.12.14-armv7-fpga} (100%) rename target/zynq-zybo-z7/boot/{zImage-4.12.14-armv7-fpga => vmlinuz-4.12.14-armv7-fpga} (100%) rename target/zynq-zybo/boot/{zImage-4.12.14-armv7-fpga => vmlinuz-4.12.14-armv7-fpga} (100%) diff --git a/doc/build/linux-kernel-4.12.14.md b/doc/build/linux-kernel-4.12.14.md index 2d86925..c7f5c66 100644 --- a/doc/build/linux-kernel-4.12.14.md +++ b/doc/build/linux-kernel-4.12.14.md @@ -78,7 +78,7 @@ shell$ make socfpga_cyclone5_de0_sockit.dtb #### Copy zImage and devicetree to target/zybo-zynq/boot/ ``` -shell$ cp arch/arm/boot/zImage ../target/zynq-zybo/boot/zImage-4.12.14-armv7-fpga +shell$ cp arch/arm/boot/zImage ../target/zynq-zybo/boot/vmlinuz-4.12.14-armv7-fpga shell$ cp arch/arm/boot/dts/zynq-zybo.dtb ../target/zynq-zybo/boot/devicetree-4.12.14-zynq-zybo.dtb shell$ dtc -I dtb -O dts -o ../target/zynq-zybo/boot/devicetree-4.12.14-zynq-zybo.dts arch/arm/boot/dts/zynq-zybo.dtb ``` @@ -86,7 +86,7 @@ shell$ dtc -I dtb -O dts -o ../target/zynq-zybo/boot/devicetree-4.12.14-zynq-zyb #### Copy zImage and devicetree to tareget/zybo-zynq-z7/boot/ ``` -shell$ cp arch/arm/boot/zImage ../target/zynq-zybo-z7/boot/zImage-4.12.14-armv7-fpga +shell$ cp arch/arm/boot/zImage ../target/zynq-zybo-z7/boot/vmlinuz-4.12.14-armv7-fpga shell$ cp arch/arm/boot/dts/zynq-zybo-z7.dtb ../target/zynq-zybo-z7/boot/devicetree-4.12.14-zynq-zybo-z7.dtb shell$ dtc -I dtb -O dts --symbols -o ../target/zynq-zybo-z7/boot/devicetree-4.12.14-zynq-zybo-z7.dts arch/arm/boot/dts/zynq-zybo-z7.dtb ``` @@ -95,7 +95,7 @@ shell$ dtc -I dtb -O dts --symbols -o ../target/zynq-zybo-z7/boot/devicetree-4.1 #### Copy zImage and devicetree to target/zybo-pynqz1/boot/ ``` -shell$ cp arch/arm/boot/zImage ../target/zynq-pynqz1/boot/zImage-4.12.14-armv7-fpga +shell$ cp arch/arm/boot/zImage ../target/zynq-pynqz1/boot/vmlinuz-4.12.14-armv7-fpga shell$ cp arch/arm/boot/dts/zynq-pynqz1.dtb ../target/zynq-pynqz1/boot/devicetree-4.12.14-zynq-pynqz1.dtb shell$ dtc -I dtb -O dts -o ../target/zynq-pynqz1/boot/devicetree-4.12.14-zynq-pynqz1.dts arch/arm/boot/dts/zynq-pynqz1.dtb ``` @@ -103,7 +103,7 @@ shell$ dtc -I dtb -O dts -o ../target/zynq-pynqz1/boot/devicetree-4.12.14-zynq-p #### Copy zImage and devicetree to target/de0-nano-soc/boot/ ``` -shell$ cp arch/arm/boot/zImage ../target/de0-nano-soc/boot/zImage-4.12.14-armv7-fpga +shell$ cp arch/arm/boot/zImage ../target/de0-nano-soc/boot/vmlinuz-4.12.14-armv7-fpga shell$ cp arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dtb ../target/de0-nano-soc/boot/devicetree-4.12.14-socfpga.dtb shell$ dtc -I dtb -O dts -o ../target/de0-nano-soc/boot/devicetree-4.12.14-socfpga.dts arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dtb ``` diff --git a/doc/install/de0-nano-soc.md b/doc/install/de0-nano-soc.md index a4067f5..fa334c6 100644 --- a/doc/install/de0-nano-soc.md +++ b/doc/install/de0-nano-soc.md @@ -5,7 +5,7 @@ ``` shell$ git clone git://github.com/ikwzm/FPGA-SoC-Linux shell$ cd FPGA-SoC-Linux -shell$ git checkout v0.5.1 +shell$ git checkout v0.5.2 shell$ git lfs pull ``` @@ -15,7 +15,7 @@ shell$ git lfs pull + boot/ - DE0_NANO_SOC.rbf : FPGA configuration file (Raw Binary Format) - uEnv.txt : U-Boot environment variables for linux boot - - zImage-4.12.14-armv7-fpga : Linux Kernel Image (use Git LFS) + - vmlinuz-4.12.14-armv7-fpga : Linux Kernel Image (use Git LFS) - devicetree-4.12.14-socfpga.dtb : Linux Device Tree Blob - devicetree-4.12.14-socfpga.dts : Linux Device Tree Source + u-boot/ diff --git a/doc/install/zynq-pynqz1.md b/doc/install/zynq-pynqz1.md index 06ce8f5..7dc540f 100644 --- a/doc/install/zynq-pynqz1.md +++ b/doc/install/zynq-pynqz1.md @@ -5,7 +5,7 @@ ``` shell$ git clone git://github.com/ikwzm/FPGA-SoC-Linux shell$ cd FPGA-SoC-Linux -shell$ git checkout v0.5.1 +shell$ git checkout v0.5.2 shell$ git lfs pull ``` @@ -16,7 +16,7 @@ shell$ git lfs pull - 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 - - zImage-4.12.14-armv7-fpga : Linux Kernel Image (use Git LFS) + - vmlinuz-4.12.14-armv7-fpga : Linux Kernel Image (use Git LFS) - devicetree-4.12.14-zynq-pynqz1.dtb : Linux Device Tree Blob - devicetree-4.12.14-zynq-pynqz1.dts : Linux Device Tree Source + examples/ : Example Programs diff --git a/doc/install/zynq-zybo-de0-nano-soc.md b/doc/install/zynq-zybo-de0-nano-soc.md index 997b95e..5144e5c 100644 --- a/doc/install/zynq-zybo-de0-nano-soc.md +++ b/doc/install/zynq-zybo-de0-nano-soc.md @@ -7,7 +7,7 @@ It corresponds to boot of both ZYBO and DE0-Nano-SoC in one SD-Card. ``` shell$ git clone git://github.com/ikwzm/FPGA-SoC-Linux shell$ cd FPGA-SoC-Linux -shell$ git checkout v0.5.1 +shell$ git checkout v0.5.2 shell$ git lfs pull ``` #### Build boot files @@ -24,7 +24,7 @@ Load Address: 00000000 Entry Point: 00000000 Contents: Image 0: 1316 Bytes = 1.29 kB = 0.00 MB -cp ../zynq-zybo/boot/zImage-4.12.14-armv7-fpga boot/zImage-4.12.14-armv7-fpga +cp ../zynq-zybo/boot/vmlinuz-4.12.14-armv7-fpga boot/vmlinuz-4.12.14-armv7-fpga 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.12.14-zynq-zybo.dtb boot/devicetree-4.12.14-zynq-zybo.dtb @@ -48,7 +48,7 @@ cp ../de0-nano-soc//u-boot/u-boot.img u-boot/u-boot.img - 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) - - zImage-4.12.14-armv7-fpga : Linux Kernel Image + - vmlinuz-4.12.14-armv7-fpga : Linux Kernel Image - devicetree-4.12.14-zynq-zybo.dtb : Linux Device Tree Blob (for ZYBO) - devicetree-4.12.14-zynq-zybo.dts : Linux Device Tree Source (for ZYBO) - devicetree-4.12.14-socfpga.dtb : Linux Device Tree Blob (for DE0-Nano-SoC) diff --git a/doc/install/zynq-zybo-z7.md b/doc/install/zynq-zybo-z7.md index 798530e..65fe8ee 100644 --- a/doc/install/zynq-zybo-z7.md +++ b/doc/install/zynq-zybo-z7.md @@ -5,7 +5,7 @@ ``` shell$ git clone git://github.com/ikwzm/FPGA-SoC-Linux shell$ cd FPGA-SoC-Linux -shell$ git checkout v0.5.1 +shell$ git checkout v0.5.2 shell$ git lfs pull ``` @@ -16,7 +16,7 @@ shell$ git lfs pull - 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 - - zImage-4.12.13-armv7-fpga : Linux Kernel Image (use Git LFS) + - vmlinuz-4.12.13-armv7-fpga : Linux Kernel Image (use Git LFS) - devicetree-4.12.13-zynq-zybo-z7.dtb : Linux Device Tree Blob - devicetree-4.12.13-zynq-zybo-z7.dts : Linux Device Tree Source * debian9-rootfs-vanilla.tgz : Debian9 Root File System (use Git LFS) diff --git a/doc/install/zynq-zybo.md b/doc/install/zynq-zybo.md index c7cfc8e..ac5bc4b 100644 --- a/doc/install/zynq-zybo.md +++ b/doc/install/zynq-zybo.md @@ -5,7 +5,7 @@ ``` shell$ git clone git://github.com/ikwzm/FPGA-SoC-Linux shell$ cd FPGA-SoC-Linux -shell$ git checkout v0.5.1 +shell$ git checkout v0.5.2 shell$ git lfs pull ``` @@ -17,7 +17,7 @@ shell$ git lfs pull - 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 - - zImage-4.12.14-armv7-fpga : Linux Kernel Image (use Git LFS) + - vmlinuz-4.12.14-armv7-fpga : Linux Kernel Image (use Git LFS) - devicetree-4.12.14-zynq-zybo.dtb : Linux Device Tree Blob - devicetree-4.12.14-zynq-zybo.dts : Linux Device Tree Source + examples/ : Example Programs diff --git a/scripts/build-linux-kernel.sh b/scripts/build-linux-kernel.sh index 70b759b..d786105 100755 --- a/scripts/build-linux-kernel.sh +++ b/scripts/build-linux-kernel.sh @@ -43,22 +43,22 @@ make zynq-pynqz1.dtb make socfpga_cyclone5_de0_sockit.dtb ### Copy zImage and devicetree to tareget/zybo-zynq/boot/ -cp arch/arm/boot/zImage ../target/zynq-zybo/boot/zImage-4.12.14-armv7-fpga +cp arch/arm/boot/zImage ../target/zynq-zybo/boot/vmlinuz-4.12.14-armv7-fpga cp arch/arm/boot/dts/zynq-zybo.dtb ../target/zynq-zybo/boot/devicetree-4.12.14-zynq-zybo.dtb ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/zynq-zybo/boot/devicetree-4.12.14-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/zImage-4.12.14-armv7-fpga +cp arch/arm/boot/zImage ../target/zynq-zybo-z7/boot/vmlinuz-4.12.14-armv7-fpga cp arch/arm/boot/dts/zynq-zybo-z7.dtb ../target/zynq-zybo-z7/boot/devicetree-4.12.14-zynq-zybo-z7.dtb ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/zynq-zybo-z7/boot/devicetree-4.12.14-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/zImage-4.12.14-armv7-fpga +cp arch/arm/boot/zImage ../target/zynq-pynqz1/boot/vmlinuz-4.12.14-armv7-fpga cp arch/arm/boot/dts/zynq-pynqz1.dtb ../target/zynq-pynqz1/boot/devicetree-4.12.14-zynq-pynqz1.dtb ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/zynq-pynqz1/boot/devicetree-4.12.14-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/zImage-4.12.14-armv7-fpga +cp arch/arm/boot/zImage ../target/de0-nano-soc/boot/vmlinuz-4.12.14-armv7-fpga cp arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dtb ../target/de0-nano-soc/boot/devicetree-4.12.14-socfpga.dtb ./scripts/dtc/dtc -I dtb -O dts --symbols -o ../target/de0-nano-soc/boot/devicetree-4.12.14-socfpga.dts arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dtb diff --git a/target/de0-nano-soc/boot/uEnv.txt b/target/de0-nano-soc/boot/uEnv.txt index 7a81acd..fab598b 100755 --- a/target/de0-nano-soc/boot/uEnv.txt +++ b/target/de0-nano-soc/boot/uEnv.txt @@ -1,6 +1,6 @@ fpga_load_cmd=fatload mmc 0 $fpgadata DE0_NANO_SOC.rbf && fpga load 0 $fpgadata $filesize fpga_set_cmd=bridge enable -boot_image=zImage-4.12.14-armv7-fpga +boot_image=vmlinuz-4.12.14-armv7-fpga fdt_image=devicetree-4.12.14-socfpga.dtb linux_load_cmd=fatload mmc 0 $loadaddr $boot_image && fatload mmc 0 $fdt_addr $fdt_image linux_boot_cmd=setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait && bootz $loadaddr - $fdt_addr diff --git a/target/de0-nano-soc/boot/zImage-4.12.14-armv7-fpga b/target/de0-nano-soc/boot/vmlinuz-4.12.14-armv7-fpga similarity index 100% rename from target/de0-nano-soc/boot/zImage-4.12.14-armv7-fpga rename to target/de0-nano-soc/boot/vmlinuz-4.12.14-armv7-fpga diff --git a/target/zynq-pynqz1/boot/uEnv.txt b/target/zynq-pynqz1/boot/uEnv.txt index 2171e08..2d0947c 100755 --- a/target/zynq-pynqz1/boot/uEnv.txt +++ b/target/zynq-pynqz1/boot/uEnv.txt @@ -2,7 +2,7 @@ fpga_load_cmd=fatload mmc 0 0x03000000 design_1_wrapper.bit && fpga loadb 0 0x03 slcr_unlock_cmd=mw.l 0xF8000008 0xDF0D slcr_lock_cmd=mw.l 0xF8000004 0x767B fpga_set_cmd=run slcr_unlock_cmd && mw.l 0xF8000170 0x00100A00 && run slcr_lock_cmd -boot_image=zImage-4.12.14-armv7-fpga +boot_image=vmlinuz-4.12.14-armv7-fpga fdt_image=devicetree-4.12.14-zynq-pynqz1.dtb linux_load_cmd=fatload mmc 0 0x03000000 $boot_image && fatload mmc 0 0x02A00000 $fdt_image linux_boot_cmd=setenv bootargs console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait uio_pdrv_genirq.of_id=generic-uio && bootz 0x03000000 - 0x02A00000 diff --git a/target/zynq-pynqz1/boot/zImage-4.12.14-armv7-fpga b/target/zynq-pynqz1/boot/vmlinuz-4.12.14-armv7-fpga similarity index 100% rename from target/zynq-pynqz1/boot/zImage-4.12.14-armv7-fpga rename to target/zynq-pynqz1/boot/vmlinuz-4.12.14-armv7-fpga diff --git a/target/zynq-zybo-de0-nano-soc/Makefile b/target/zynq-zybo-de0-nano-soc/Makefile index eeba3e9..bee60e6 100644 --- a/target/zynq-zybo-de0-nano-soc/Makefile +++ b/target/zynq-zybo-de0-nano-soc/Makefile @@ -3,7 +3,7 @@ XILINX_TARGET_PATH=../zynq-zybo ALTERA_TARGET_PATH=../de0-nano-soc TARGET = boot/boot.scr \ - boot/zImage-$(VERSION)-armv7-fpga \ + boot/vmlinuz-$(VERSION)-armv7-fpga \ boot/boot.bin \ boot/design_1_wrapper.bit \ boot/devicetree-$(VERSION)-zynq-zybo.dtb \ @@ -28,7 +28,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/zImage-$(VERSION)-armv7-fpga : $(XILINX_TARGET_PATH)/boot/zImage-$(VERSION)-armv7-fpga +boot/vmlinuz-$(VERSION)-armv7-fpga : $(XILINX_TARGET_PATH)/boot/vmlinuz-$(VERSION)-armv7-fpga $(COPY) $< $@ boot/boot.bin : $(XILINX_TARGET_PATH)/boot/boot.bin diff --git a/target/zynq-zybo-de0-nano-soc/boot/boot.script b/target/zynq-zybo-de0-nano-soc/boot/boot.script index 27f37e2..ef7ef8c 100755 --- a/target/zynq-zybo-de0-nano-soc/boot/boot.script +++ b/target/zynq-zybo-de0-nano-soc/boot/boot.script @@ -1,6 +1,6 @@ if test $config = "zynq-zybo"; then echo "Configuration for " $config - boot_image=zImage-$kernel_version-armv7-fpga + boot_image=vmlinuz-$kernel_version-armv7-fpga fdt_image=devicetree-$kernel_version-zynq-zybo.dtb fpga_image=design_1_wrapper.bit if fatload mmc 0 0x03000000 $fpga_image; then @@ -16,7 +16,7 @@ if test $config = "zynq-zybo"; then fi if test $config = "socfpga_cyclone5_de0_nano_soc"; then echo "Configuration for " $config - boot_image=zImage-$kernel_version-armv7-fpga + boot_image=vmlinuz-$kernel_version-armv7-fpga fdt_image=devicetree-$kernel_version-socfpga.dtb fpga_image=DE0_NANO_SOC.rbf if fatload mmc 0 $fpgadata $fpga_image; then diff --git a/target/zynq-zybo-z7/boot/uEnv.txt b/target/zynq-zybo-z7/boot/uEnv.txt index 00684f6..9608759 100755 --- a/target/zynq-zybo-z7/boot/uEnv.txt +++ b/target/zynq-zybo-z7/boot/uEnv.txt @@ -2,7 +2,7 @@ fpga_load_cmd=fatload mmc 0 0x03000000 design_1_wrapper.bit && fpga loadb 0 0x03 slcr_unlock_cmd=mw.l 0xF8000008 0xDF0D slcr_lock_cmd=mw.l 0xF8000004 0x767B fpga_set_cmd=run slcr_unlock_cmd && mw.l 0xF8000170 0x00100A00 && run slcr_lock_cmd -boot_image=zImage-4.12.14-armv7-fpga +boot_image=vmlinuz-4.12.14-armv7-fpga fdt_image=devicetree-4.12.14-zynq-zybo-z7.dtb linux_load_cmd=fatload mmc 0 0x03000000 $boot_image && fatload mmc 0 0x02A00000 $fdt_image linux_boot_cmd=setenv bootargs console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait uio_pdrv_genirq.of_id=generic-uio && bootz 0x03000000 - 0x02A00000 diff --git a/target/zynq-zybo-z7/boot/zImage-4.12.14-armv7-fpga b/target/zynq-zybo-z7/boot/vmlinuz-4.12.14-armv7-fpga similarity index 100% rename from target/zynq-zybo-z7/boot/zImage-4.12.14-armv7-fpga rename to target/zynq-zybo-z7/boot/vmlinuz-4.12.14-armv7-fpga diff --git a/target/zynq-zybo/boot/uEnv.txt b/target/zynq-zybo/boot/uEnv.txt index d20e22e..1a9b69d 100755 --- a/target/zynq-zybo/boot/uEnv.txt +++ b/target/zynq-zybo/boot/uEnv.txt @@ -2,7 +2,7 @@ fpga_load_cmd=fatload mmc 0 0x03000000 design_1_wrapper.bit && fpga loadb 0 0x03 slcr_unlock_cmd=mw.l 0xF8000008 0xDF0D slcr_lock_cmd=mw.l 0xF8000004 0x767B fpga_set_cmd=run slcr_unlock_cmd && mw.l 0xF8000170 0x00100A00 && run slcr_lock_cmd -boot_image=zImage-4.12.14-armv7-fpga +boot_image=vmlinuz-4.12.14-armv7-fpga fdt_image=devicetree-4.12.14-zynq-zybo.dtb linux_load_cmd=fatload mmc 0 0x03000000 $boot_image && fatload mmc 0 0x02A00000 $fdt_image linux_boot_cmd=setenv bootargs console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait uio_pdrv_genirq.of_id=generic-uio && bootz 0x03000000 - 0x02A00000 diff --git a/target/zynq-zybo/boot/zImage-4.12.14-armv7-fpga b/target/zynq-zybo/boot/vmlinuz-4.12.14-armv7-fpga similarity index 100% rename from target/zynq-zybo/boot/zImage-4.12.14-armv7-fpga rename to target/zynq-zybo/boot/vmlinuz-4.12.14-armv7-fpga