mediatek: mt7622: bpi-r64: simplify eMMC install procedure

[openwrt/openwrt.git] / target / linux / mediatek / image / mt7622.mk

diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk
index ec1e15d5e510db9c43b6f13df1845c74176f4087..afda48043f885ddedf4f04c051d9955c1484aea8 100644 (file)
--- a/target/linux/mediatek/image/mt7622.mk
+++ b/target/linux/mediatek/image/mt7622.mk
@@ -45,14 +45,13 @@ define Device/bananapi_bpi-r64
                     uboot-mt7622_bananapi_bpi-r64-sdmmc \
                     e2fsprogs mkf2fs f2fsck \
                     kmod-nls-cp437 kmod-nls-iso8859-1 kmod-vfat blockd
-  ARTIFACTS := boot-sdcard.img boot-emmc.img bl2-emmc.bin bl31-emmc.bin header-emmc.bin
+  ARTIFACTS := header-emmc.bin sdcard.img
   IMAGES := sysupgrade.itb
   KERNEL_INITRAMFS_SUFFIX := -recovery.itb
-  ARTIFACT/boot-sdcard.img     := mt7622-gpt sdmmc | mmc-header sdmmc | pad-to 512k | bl2 sdmmc-2ddr | pad-to 2M | bl31-uboot bananapi_bpi-r64-sdmmc | pad-to 6M
-  ARTIFACT/boot-emmc.img       := mt7622-gpt  emmc | mmc-header  emmc |                                pad-to 2M | bl31-uboot bananapi_bpi-r64-emmc  | pad-to 6M
   ARTIFACT/header-emmc.bin     := mt7622-gpt  emmc | mmc-header  emmc
-  ARTIFACT/bl31-emmc.bin       := bl31-uboot bananapi_bpi-r64-emmc
-  ARTIFACT/bl2-emmc.bin                := bl2 emmc-2ddr
+  ARTIFACT/sdcard.img          := mt7622-gpt sdmmc | mmc-header sdmmc | pad-to 128k | append-image header-emmc.bin | pad-to 256k |\
+                                  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