aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mxs/image/Makefile
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2015-09-21 21:10:43 +0000
committerZoltan Herpai <wigyori@uid0.hu>2015-09-21 21:10:43 +0000
commitce59fe6b3d7ec186a12cf784038cc192a8eb9d4f (patch)
treed92a729e86a5f0d5b47dc8492ef721319e70bdaa /target/linux/mxs/image/Makefile
parentac65377bf7089fa2844ba71722b8999e8e1e0ac7 (diff)
downloadupstream-ce59fe6b3d7ec186a12cf784038cc192a8eb9d4f.tar.gz
upstream-ce59fe6b3d7ec186a12cf784038cc192a8eb9d4f.tar.bz2
upstream-ce59fe6b3d7ec186a12cf784038cc192a8eb9d4f.zip
mxs: re-work SD card image generation
- Duckbill uses a different partitioning approach than standard FSL and Olimex - use new sdimage to integrate U-Boot into the SD card images Signed-off-by: Michael Heimpold <mhei@heimpold.de> SVN-Revision: 47021
Diffstat (limited to 'target/linux/mxs/image/Makefile')
-rw-r--r--target/linux/mxs/image/Makefile34
1 files changed, 21 insertions, 13 deletions
diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
index 7e6a1a000c..94fed8215c 100644
--- 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