[openwrt/openwrt] mediatek: mt7623: simplify partition generation

LEDE Commits lede-commits at lists.infradead.org
Mon Jan 31 07:04:50 PST 2022


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/9ba7a834254de33a3578a1a5884a39dc88ef7caf

commit 9ba7a834254de33a3578a1a5884a39dc88ef7caf
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Mon Jan 31 00:45:10 2022 +0000

    mediatek: mt7623: simplify partition generation
    
    The two options 'emmc' and 'sdmmc' now became identical lines after
    introducing CONFIG_TARGET_ROOTFS_PARTSIZE.
    Remove the now useless if-clauses.
    
    Fixes: a40b4d335a ("mediatek: use CONFIG_TARGET_ROOTFS_PARTSIZE")
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 target/linux/mediatek/image/mt7623.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk
index 16f59790b0..4ef0aabe4d 100644
--- a/target/linux/mediatek/image/mt7623.mk
+++ b/target/linux/mediatek/image/mt7623.mk
@@ -57,12 +57,7 @@ define Build/mt7623-mbr
 	ptgen -o $@.tmp -h 4 -s 63 -a 0 -l 1024 \
 			-t 0x41	-N uboot	-p 1M@$(UBOOT_OFFSET) \
 			-t 0xea	-N recovery	-p 40M at 4M \
-		$(if $(findstring sdmmc,$1), \
-			-t 0x2e -N production	-p $(CONFIG_TARGET_ROOTFS_PARTSIZE)M at 48M \
-		) \
-		$(if $(findstring emmc,$1), \
-			-t 0x2e -N production	-p $(CONFIG_TARGET_ROOTFS_PARTSIZE)M at 48M \
-		)
+			-t 0x2e -N production	-p $(CONFIG_TARGET_ROOTFS_PARTSIZE)M at 48M
 
 	echo -en \
 		$(if $(findstring sdmmc,$1),"SDMMC_BOOT\x00\x00\x01\x00\x00\x00\x00\x02\x00\x00") \



More information about the lede-commits mailing list