aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Thomson <git@johnthomson.fastmail.com.au>2020-10-15 19:27:55 +1000
committerChuanhong Guo <gch981213@gmail.com>2020-10-29 21:35:03 +0800
commite91344776b9ba7c864be88d915c9c0df0eb790dd (patch)
tree0bfee5376d49f2a87f7cf389cbcd456fc7ae0fed
parent254f51443ddaee873267d41993b5bbc4b5ef7959 (diff)
downloadupstream-e91344776b9ba7c864be88d915c9c0df0eb790dd.tar.gz
upstream-e91344776b9ba7c864be88d915c9c0df0eb790dd.tar.bz2
upstream-e91344776b9ba7c864be88d915c9c0df0eb790dd.zip
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>
-rw-r--r--target/linux/ath79/image/common-mikrotik.mk6
-rw-r--r--target/linux/ath79/mikrotik/target.mk2
2 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/ath79/image/common-mikrotik.mk b/target/linux/ath79/image/common-mikrotik.mk
index 9ac89fdcb1..b0c3feda20 100644
--- 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 0394f4427d..fb5171fea7 100644
--- 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