aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-06-17 23:48:32 +0200
committerPetr Štetiar <ynezz@true.cz>2020-06-22 12:51:22 +0200
commitceeece9ffaa5a3a336505332c39794d76c08b2ca (patch)
tree8fdc6e1cef58a16b4a3550378d0344db6d9fe9b4
parent29e170dbaac0091d09ae52157cd2f1f26a9c8ca4 (diff)
downloadupstream-ceeece9ffaa5a3a336505332c39794d76c08b2ca.tar.gz
upstream-ceeece9ffaa5a3a336505332c39794d76c08b2ca.tar.bz2
upstream-ceeece9ffaa5a3a336505332c39794d76c08b2ca.zip
ath79: image: fix initramfs for safeloader devices
Currently it's not possible to tftpboot initramfs image on archer-c7-v5 as the image contains tplink-v1-header which leads to: ath> bootm ## Booting image at 81000000 ... Bad Magic Number as U-Boot expects uImage wrapped image. This is caused by following inheritance issue: define Device/Init KERNEL_INITRAMFS = $$(KERNEL) define Device/tplink-v1 KERNEL := kernel-bin | append-dtb | lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | tplink-v1-header define Device/tplink-safeloader $(Device/tplink-v1) define Device/tplink-safeloader-uimage $(Device/tplink-safeloader) KERNEL := kernel-bin | append-dtb | lzma | uImageArcher lzma define Device/tplink_archer-c7-v5 $(Device/tplink-safeloader-uimage) where tplink-v1 defines KERNEL_INITRAMFS with tplink-v1-header and it's then used by all devices inheriting from tplink-safeloader. Fix this by overriding KERNEL_INITRAMFS to KERNEL variable again. Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rw-r--r--target/linux/ath79/image/common-tp-link.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk
index 328eaaed30..81a557df48 100644
--- a/target/linux/ath79/image/common-tp-link.mk
+++ b/target/linux/ath79/image/common-tp-link.mk
@@ -78,6 +78,7 @@ define Device/tplink-safeloader
$(Device/tplink-v1)
TPLINK_HWREV := 0x0
KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O
+ KERNEL_INITRAMFS := $$(KERNEL)
IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
append-metadata | check-size
IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
@@ -86,6 +87,7 @@ endef
define Device/tplink-safeloader-uimage
$(Device/tplink-safeloader)
KERNEL := kernel-bin | append-dtb | lzma | uImageArcher lzma
+ KERNEL_INITRAMFS := $$(KERNEL)
endef
define Device/tplink-safeloader-okli
@@ -96,4 +98,5 @@ define Device/tplink-safeloader-okli
COMPILE/loader-$(1).elf := loader-okli-compile
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | \
loader-okli $(1) 12288
+ KERNEL_INITRAMFS := $$(KERNEL)
endef