[openwrt/openwrt] mediatek: mt7622: change image generation

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/60d2623cc547dbad1df12c08ac2853003b75b83d

commit 60d2623cc547dbad1df12c08ac2853003b75b83d
Author: Oskari Lemmela <oskari at lemmela.net>
AuthorDate: Tue Mar 2 21:42:11 2021 +0200

    mediatek: mt7622: change image generation
    
    - set only one EFI system partition
    - use shorter path for DEVICE_DTS file
    
    Signed-off-by: Oskari Lemmela <oskari at lemmela.net>
---
 target/linux/mediatek/image/mt7622.mk | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk
index 8d7854d5d1..11185ba52a 100644
--- a/target/linux/mediatek/image/mt7622.mk
+++ b/target/linux/mediatek/image/mt7622.mk
@@ -17,14 +17,13 @@ endef
 define Build/mt7622-gpt
 	cp $@ $@.tmp || true
 	ptgen -g -o $@.tmp -a 1 -l 1024 \
-		-t 0xef \
 		$(if $(findstring sdmmc,$1), \
 			-H \
-			-N bl2		-r	-p 512k at 512k \
+			-t 0x83	-N bl2       -r	-p 512k at 512k \
 		) \
-			-N fip		-r	-p 1M at 2M \
-			-N ubootenv	-r	-p 1M at 4M \
-			-N recovery	-r	-p 32M at 6M \
+			-t 0xef	-N fip	     -r	-p 1M at 2M \
+			-t 0x83	-N ubootenv  -r	-p 1M at 4M \
+				-N recovery  -r	-p 32M at 6M \
 		$(if $(findstring sdmmc,$1), \
 			-t 0x2e -N production	-p 216M at 40M \
 		) \
@@ -52,8 +51,8 @@ define Device/bananapi_bpi-r64
 				   bl2 emmc-2ddr | pad-to 512k | bl2 sdmmc-2ddr | pad-to 1M | bl31-uboot bananapi_bpi-r64-emmc | pad-to 2M |\
 				   bl31-uboot bananapi_bpi-r64-sdmmc | pad-to 6M
   KERNEL			:= kernel-bin | gzip
-  KERNEL_INITRAMFS		:= kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 128k
-  IMAGE/sysupgrade.itb		:= append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata
+  KERNEL_INITRAMFS		:= kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb with-initrd | pad-to 128k
+  IMAGE/sysupgrade.itb		:= append-kernel | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb external-static-with-rootfs | append-metadata
 endef
 TARGET_DEVICES += bananapi_bpi-r64