mxs: re-work SD card image generation

[openwrt/openwrt.git] / target / linux / mxs / image / Makefile

diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
index 7e6a1a000cd30fbd9b405f3c54ea0236979cc55b..94fed8215c3ea9eb8cf01c909372c0154d58d2e7 100644 (file)
--- a/target/linux/mxs/image/Makefile
+++ b/target/linux/mxs/image/Makefile
@@ -7,13 +7,13 @@
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
-include $(INCLUDE_DIR)/host.mk
 
 BOARDS:= \
        imx23-olinuxino \
        imx28-duckbill
+
 FAT32_BLOCK_SIZE=1024
-FAT32_BLOCKS=$(shell echo $$(($(CONFIG_MXS_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
+FAT32_BLOCKS=$(shell echo $$(($(CONFIG_TARGET_BOOTFS_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
 
 define Image/BuildKernel
        mkimage -A arm -O linux -T kernel -C none \
@@ -44,37 +44,45 @@ define Image/InstallKernel
 
 endef
 
-define Image/Build/SDCard
+define Image/Build/SDCard-vfat-ext4
        rm -f $(KDIR)/boot.img
        mkdosfs $(KDIR)/boot.img -C $(FAT32_BLOCKS)
 
-       mcopy -i $(KDIR)/boot.img $(DTS_DIR)/$(2).dtb ::$(2).dtb
+       mcopy -i $(KDIR)/boot.img $(DTS_DIR)/$(3).dtb ::$(3).dtb
        mcopy -i $(KDIR)/boot.img $(BIN_DIR)/$(IMG_PREFIX)-uImage ::uImage
 
-       ./gen_mxs_sdcard_img.sh \
-               $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-sdcard-vfat-$(1).img \
+       ./gen_sdcard_vfat_ext4.sh \
+               $(BIN_DIR)/$(2) \
+               $(BIN_DIR)/uboot-mxs-$(4)/uboot-mxs-$(4).sb \
                $(KDIR)/boot.img \
                $(KDIR)/root.$(1) \
-               $(CONFIG_MXS_SD_BOOT_PARTSIZE) \
-               $(CONFIG_TARGET_ROOTFS_PARTSIZE) \
-               $(BIN_DIR)/uboot-mxs-$(3)/uboot-mxs-$(3).sb
+               $(CONFIG_TARGET_BOOTFS_PARTSIZE) \
+               $(CONFIG_TARGET_ROOTFS_PARTSIZE)
+endef
+
+define Image/Build/SDCard-ext4-ext4
+       ./gen_sdcard_ext4_ext4.sh \
+               $(BIN_DIR)/$(2) \
+               $(BIN_DIR)/uboot-mxs-$(4)/uboot-mxs-$(4).sb \
+               $(KDIR)/root.$(1) \
+               $(CONFIG_TARGET_ROOTFS_PARTSIZE)
 endef
 
 define Image/Build/Profile/olinuxino-maxi
-       $(call Image/Build/SDCard,$(1),imx23-olinuxino,mx23_olinuxino)
+       $(call Image/Build/SDCard-vfat-ext4,$(1),$(2),imx23-olinuxino,mx23_olinuxino)
 endef
 
 define Image/Build/Profile/olinuxino-micro
-       $(call Image/Build/SDCard,$(1),imx23-olinuxino,mx23_olinuxino)
+       $(call Image/Build/SDCard-vfat-ext4,$(1),$(2),imx23-olinuxino,mx23_olinuxino)
 endef
 
 define Image/Build/Profile/duckbill
-       $(call Image/Build/SDCard,$(1),imx28-duckbill,duckbill)
+       $(call Image/Build/SDCard-ext4-ext4,$(1),$(2),imx28-duckbill,duckbill)
 endef
 
 define Image/Build
        $(call Image/Build/$(1),$(1))
-       $(call Image/Build/Profile/$(PROFILE),$(1))
+       $(call Image/Build/Profile/$(PROFILE),$(1),$(IMG_PREFIX)-$(PROFILE)-sdcard.img)
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
 endef