[openwrt/openwrt] at91: fix sdcard create image

[LEDE Commits]

blogic pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/130224cc4754bd4c1cbcd989b6cc1c9aac3246cc

commit 130224cc4754bd4c1cbcd989b6cc1c9aac3246cc
Author: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun at microchip.com>
AuthorDate: Fri May 4 10:27:44 2018 -0700

    at91: fix sdcard create image
    
    copying at91bootstrap and uboot binaries to sdcard image is done
    based on device name instead of dts name and this avoids creating
    multiple u-boot and at91bootstrap binaries.
    
    Signed-off-by: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun at microchip.com>
---
 target/linux/at91/image/sama5.mk | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk
index 5b518c9..b875888 100644
--- a/target/linux/at91/image/sama5.mk
+++ b/target/linux/at91/image/sama5.mk
@@ -11,13 +11,15 @@ define Build/at91-sdcard
 
   $(foreach dts,$(DEVICE_DTS), \
      mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb \
-        ::$(dts).dtb; \
-     mcopy -i $@.boot \
-        $(BIN_DIR)/u-boot-$(dts:at91-%=%)_mmc/u-boot.bin \
-            ::u-boot.bin; \
-     $(CP) $(BIN_DIR)/at91bootstrap-$(dts:at91-%=%)sd_uboot*/*.bin \
-         $@.BOOT.bin; \
-     mcopy -i $@.boot $@.BOOT.bin ::BOOT.bin;)
+        ::$(dts).dtb;)
+
+  mcopy -i $@.boot \
+    $(BIN_DIR)/u-boot-$(DEVICE_NAME:at91-%=%)_mmc/u-boot.bin \
+    ::u-boot.bin
+
+  $(CP) $(BIN_DIR)/at91bootstrap-$(DEVICE_NAME:at91-%=%)sd*/at91bootstrap.bin \
+    $@.BOOT.bin; \
+    mcopy -i $@.boot $@.BOOT.bin ::BOOT.bin
 
   ./gen_at91_sdcard_img.sh \
       $@.img \