From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 21 Jul 2021 09:26:44 +0000 (+0100)
Subject: mediatek: mt7623: add back needed build steps for U7623 board
X-Git-Tag: v22.03.0-rc1~2127
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c5b3c13b6030ef2d7e6e40df2b3e778077e15811;p=openwrt%2Fstaging%2Fhauke.git

mediatek: mt7623: add back needed build steps for U7623 board

When reworking the BPi-R2 the mtk-mmc-img build step was removed
despite it was still needed to build the image for the UniElec U7623
board. Add it back for now until U7623 gets its facelift.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk
index 166086b88e..00c1ac4443 100644
--- a/target/linux/mediatek/image/mt7623.mk
+++ b/target/linux/mediatek/image/mt7623.mk
@@ -113,6 +113,27 @@ endef
 TARGET_DEVICES += bananapi_bpi-r2
 
 
+define Build/mtk-mmc-img
+	rm -f $@.boot
+	mkfs.fat -C $@.boot $(BOOTFS_BLOCKS)
+
+	if [ -r $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin ]; then \
+		./gen_mtk_mmc_img.sh emmc $@.emmc \
+			$(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin; \
+		mcopy -i $@.boot $@.emmc ::eMMCboot.bin; \
+	fi
+	mkenvimage -s $(UBOOT_ENVSIZE) -o $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-uboot.env $(UBOOT_TARGET)-uEnv.txt
+	mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-uboot.env ::uboot.env
+	mcopy -i $@.boot $(IMAGE_KERNEL) ::uImage
+	./gen_mtk_mmc_img.sh sd $@ \
+		$(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin \
+		$(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-u-boot*.bin \
+		$(UBOOT_OFFSET) \
+		$@.boot \
+		$(IMAGE_ROOTFS) \
+		$(CONFIG_MTK_BOOT_PARTSIZE) \
+		$(CONFIG_TARGET_ROOTFS_PARTSIZE)
+endef
 
 define Build/scatterfile
 	./gen_scatterfile.sh $(subst mt,MT,$(SUBTARGET)) "$1" \