From 130224cc4754bd4c1cbcd989b6cc1c9aac3246cc Mon Sep 17 00:00:00 2001 From: Sandeep Sheriker Mallikarjun Date: Fri, 4 May 2018 10:27:44 -0700 Subject: [PATCH] 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 --- 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 5b518c9767..b87588877d 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 \ -- 2.25.1