ath79: mikrotik: use vmlinuz (zBoot ELF)

- minimal built initramfs: 10MB vmlinux ELF -> 6MB vmlinuz
- ~5 seconds for kernel decompression, which was equivalent to the
  additional time to load the uncompressed ELF from SPI NOR.
- Removes requirement for lzma-loader, which may have been causing some
  image builds to fail to boot on Mikrotik mt7621.

Suggested-by: Thibaut VARÈNE <hacks@slashdirt.org>
Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au>

diff --git a/target/linux/ath79/image/common-mikrotik.mk b/target/linux/ath79/image/common-mikrotik.mk
index 9ac89fdcb11980e7b0b3d401d922c764e782d389..b0c3feda20ccc5cc2db2b25016d5dad0a7363772 100644 (file)
--- a/target/linux/ath79/image/common-mikrotik.mk
+++ b/target/linux/ath79/image/common-mikrotik.mk
@@ -1,8 +1,8 @@
 define Device/mikrotik
        DEVICE_VENDOR := MikroTik
-       LOADER_TYPE := elf
-       KERNEL := kernel-bin | append-dtb | lzma | loader-kernel
-       KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-kernel
+       KERNEL_NAME := vmlinuz
+       KERNEL := kernel-bin | append-dtb-elf
+       KERNEL_INITRAMFS := kernel-bin | append-dtb-elf
 endef
 
 define Device/mikrotik_nor

diff --git a/target/linux/ath79/mikrotik/target.mk b/target/linux/ath79/mikrotik/target.mk
index 0394f4427ddda6200560a4f3e7e5cf27566056b1..fb5171fea7936e4f13e370d35112e8578d3b6e97 100644 (file)
--- a/target/linux/ath79/mikrotik/target.mk
+++ b/target/linux/ath79/mikrotik/target.mk
@@ -1,5 +1,7 @@
 BOARDNAME := MikroTik devices
 FEATURES += minor nand squashfs
+KERNELNAME := vmlinux vmlinuz
+IMAGES_DIR := ../../..
 
 DEFAULT_PACKAGES += wpad-basic-wolfssl