From: Oskari Lemmela <oskari@lemmela.net>
Date: Tue, 2 Mar 2021 19:42:10 +0000 (+0200)
Subject: mediatek: mt7622: use ptgen generated MBR header
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0234881f31e627e2e4cca266a9e5b943c6bf5148;p=openwrt%2Fstaging%2Fblocktrron.git

mediatek: mt7622: use ptgen generated MBR header

mt7622 uses MBR partition for booting from SD card.
Add hybrid MBR entry with boot flag after PMBR entry.

Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
---

diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk
index d2c1fb5b13..8d7854d5d1 100644
--- a/target/linux/mediatek/image/mt7622.mk
+++ b/target/linux/mediatek/image/mt7622.mk
@@ -16,9 +16,10 @@ endef
 
 define Build/mt7622-gpt
 	cp $@ $@.tmp || true
-	ptgen -g -o $@.tmp -h 4 -s 31 -a 1 -l 1024 -g \
+	ptgen -g -o $@.tmp -a 1 -l 1024 \
 		-t 0xef \
 		$(if $(findstring sdmmc,$1), \
+			-H \
 			-N bl2		-r	-p 512k@512k \
 		) \
 			-N fip		-r	-p 1M@2M \
@@ -30,7 +31,6 @@ define Build/mt7622-gpt
 		$(if $(findstring emmc,$1), \
 			-t 0x2e -N production	-p 980M@40M \
 		)
-	dd if=$(STAGING_DIR_IMAGE)/mt7622-header_$1.bin bs=512 count=1 of=$@.tmp conv=notrunc
 	cat $@.tmp >> $@
 	rm $@.tmp
 endef