From: Mateusz Krzak Date: Thu, 22 May 2025 16:36:38 +0000 (+0200) Subject: mediatek: filogic: D-Link M30/M60: include initramfs in recovery X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6615c8cfc85f1373cf93a9fc08cb1cb3bbefc964;p=thirdparty%2Fopenwrt.git mediatek: filogic: D-Link M30/M60: include initramfs in recovery Currently, if OEM recovery flashes OpenWrt to second ubi1, OpenWrt cannot boot. With this commit, recovery image is built with initramfs kernel, so that it can boot from either ubi or ubi1. This adds an extra step to OpenWrt installation from OEM: user needs to sysupgrade from initramfs to full system. Signed-off-by: Mateusz Krzak Link: https://github.com/openwrt/openwrt/pull/18878 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index d3e94592793..78d7e2d249c 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -902,7 +902,10 @@ define Device/dlink_aquila-pro-ai-m30-a1 IMAGES += recovery.bin IMAGE_SIZE := 51200k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata - IMAGE/recovery.bin := sysupgrade-tar | pad-to $$(IMAGE_SIZE) | dlink-ai-recovery-header DLK6E6110001 \x6A\x28\xEE\x0B \x00\x00\x2C\x00 \x00\x00\x20\x03 \x61\x6E +ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) + IMAGE/recovery.bin := append-image-stage initramfs-kernel.bin | sysupgrade-tar kernel=$$$$@ |\ + pad-to $$(IMAGE_SIZE) | dlink-ai-recovery-header DLK6E6110001 \x6A\x28\xEE\x0B \x00\x00\x2C\x00 \x00\x00\x20\x03 \x61\x6E +endif endef TARGET_DEVICES += dlink_aquila-pro-ai-m30-a1 @@ -916,7 +919,10 @@ define Device/dlink_aquila-pro-ai-m60-a1 IMAGES += recovery.bin IMAGE_SIZE := 51200k IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata - IMAGE/recovery.bin := sysupgrade-tar | pad-to $$(IMAGE_SIZE) | dlink-ai-recovery-header DLK6E8202001 \x30\x6C\x19\x0C \x00\x00\x2C\x00 \x00\x00\x20\x03 \x82\x6E +ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) + IMAGE/recovery.bin := append-image-stage initramfs-kernel.bin | sysupgrade-tar kernel=$$$$@ |\ + pad-to $$(IMAGE_SIZE) | dlink-ai-recovery-header DLK6E8202001 \x30\x6C\x19\x0C \x00\x00\x2C\x00 \x00\x00\x20\x03 \x82\x6E +endif endef TARGET_DEVICES += dlink_aquila-pro-ai-m60-a1