[openwrt/openwrt] mediatek: bpi-r3: make initramfs/recovery optional

LEDE Commits lede-commits at lists.infradead.org
Wed Sep 7 19:14:50 PDT 2022


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/1a6f6a1e8cbc29042f63771d5f05bdbe622d9078

commit 1a6f6a1e8cbc29042f63771d5f05bdbe622d9078
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Thu Sep 8 02:34:28 2022 +0100

    mediatek: bpi-r3: make initramfs/recovery optional
    
    Only include recovery image in SD card image generated for the
    BananaPi BPi-R3 if building with CONFIG_TARGET_ROOTFS_INITRAMFS.
    This allows to build images larger than 32 MB (the limit for
    initramfs/recovery image) by deselecting initramfs.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 target/linux/mediatek/image/filogic.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index dfc71bbb14..e366661240 100644
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -62,7 +62,9 @@ define Device/bananapi_bpi-r3
   ARTIFACT/sdcard.img.gz	:= mt7986-gpt sdmmc |\
 				   pad-to 17k | bl2 sdmmc-ddr4 |\
 				   pad-to 6656k | bl31-uboot bananapi_bpi-r3-sdmmc |\
-				   pad-to 12M | append-image-stage initramfs-recovery.itb |\
+				$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),\
+				   pad-to 12M | append-image-stage initramfs-recovery.itb | check-size 44m |\
+				) \
 				   pad-to 44M | bl2 spim-nand-ddr4 |\
 				   pad-to 45M | bl31-uboot bananapi_bpi-r3-snand |\
 				   pad-to 49M | bl2 nor-ddr4 |\
@@ -70,7 +72,10 @@ define Device/bananapi_bpi-r3
 				   pad-to 51M | bl2 emmc-ddr4 |\
 				   pad-to 52M | bl31-uboot bananapi_bpi-r3-emmc |\
 				   pad-to 56M | mt7986-gpt emmc |\
-				   pad-to 64M | append-image squashfs-sysupgrade.itb | gzip
+				$(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),\
+				   pad-to 64M | append-image squashfs-sysupgrade.itb | check-size | gzip \
+				)
+  IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m
   KERNEL			:= kernel-bin | gzip
   KERNEL_INITRAMFS := kernel-bin | lzma | \
 	fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k




More information about the lede-commits mailing list