[openwrt/openwrt] ath79: mikrotik: use vmlinuz (zBoot ELF)
LEDE Commits
lede-commits at lists.infradead.org
Thu Oct 29 11:08:08 EDT 2020
981213 pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/e91344776b9ba7c864be88d915c9c0df0eb790dd
commit e91344776b9ba7c864be88d915c9c0df0eb790dd
Author: John Thomson <git at johnthomson.fastmail.com.au>
AuthorDate: Thu Oct 15 19:27:55 2020 +1000
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 at slashdirt.org>
Signed-off-by: John Thomson <git at johnthomson.fastmail.com.au>
---
target/linux/ath79/image/common-mikrotik.mk | 6 +++---
target/linux/ath79/mikrotik/target.mk | 2 ++
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
More information about the lede-commits
mailing list