mediatek: mt7622: change image generation

- set only one EFI system partition
- use shorter path for DEVICE_DTS file

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 8d7854d5d1bb1819cdb7a03790c6abbec4883ed5..11185ba52a1497b7244f5e4e62df5abd06f59331 100644 (file)
--- 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@512k \
+                       -t 0x83 -N bl2       -r -p 512k@512k \
                ) \
-                       -N fip          -r      -p 1M@2M \
-                       -N ubootenv     -r      -p 1M@4M \
-                       -N recovery     -r      -p 32M@6M \
+                       -t 0xef -N fip       -r -p 1M@2M \
+                       -t 0x83 -N ubootenv  -r -p 1M@4M \
+                               -N recovery  -r -p 32M@6M \
                $(if $(findstring sdmmc,$1), \
                        -t 0x2e -N production   -p 216M@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