From: Petr Štetiar <ynezz@true.cz>
Date: Fri, 23 Nov 2018 08:25:13 +0000 (+0100)
Subject: imx6: image: Split imx6-sdcard image for reusability
X-Git-Tag: v19.07.0-rc1~824
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dc1a73984e640ded21c7fe1abc8de2d5585ae0bd;p=openwrt%2Fstaging%2Fchunkeey.git

imx6: image: Split imx6-sdcard image for reusability

I'm going to reuse the imx6-sdcard image commands for building of Apalis
eMMC images.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index 9dd5b520a1..fa10b756a1 100644
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx6/image/Makefile
@@ -58,11 +58,16 @@ define Build/boot-scr
 	$(BIN_DIR)/boot.scr
 endef
 
-define Build/imx6-sdcard
+define Build/imx6-combined-image-prepare
 	rm -rf $@.boot
 	mkdir -p $@.boot
+endef
 
-	$(CP) $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.img $@.boot/u-boot.img
+define Build/imx6-combined-image-clean
+	rm -rf $@.boot $@.fs
+endef
+
+define Build/imx6-combined-image
 	$(CP) $(IMAGE_KERNEL) $@.boot/uImage
 
 	$(foreach dts,$(DEVICE_DTS), \
@@ -84,10 +89,18 @@ define Build/imx6-sdcard
 		$(CONFIG_TARGET_ROOTFS_PARTSIZE) \
 		$@.fs \
 		1024
+endef
 
+define Build/imx6-sdcard
+	$(Build/imx6-combined-image-prepare)
+
+	$(CP) $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.img $@.boot/u-boot.img
+	$(Build/imx6-combined-image)
 	dd if=$(STAGING_DIR_IMAGE)/$(UBOOT)-SPL of=$@ bs=1024 seek=1 conv=notrunc
 
-	rm -rf $@.boot $@.fs
+	$(Build/imx6-combined-image-clean)
+endef
+
 endef
 
 #################################################