mxs: fix imagebuilder

[openwrt/svn-archive/archive.git] / target / linux / mxs / image / Makefile

diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
index 59a89e9d50da9cfc85a4e1392d7f4f690ecfca17..256d4e663dab34ad394846159300b5f7f0a82e8e 100644 (file)
--- a/target/linux/mxs/image/Makefile
+++ b/target/linux/mxs/image/Makefile
@@ -7,21 +7,15 @@
 
 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))))
 
-define Image/BuildKernel/olinuxino-bootlet
-       cat $(LINUX_DIR)/arch/arm/boot/zImage $(LINUX_DIR)/arch/arm/boot/dts/imx23-olinuxino.dtb > $(STAGING_DIR)/zImage_dtb
-       (cd $(STAGING_DIR); \
-       $(STAGING_DIR)/../host/bin/elftosb -z -c ./linux_prebuilt.db -o linux.sb; \
-       dd if=/dev/zero of=sd_mmc_bootstream.raw bs=512 count=4; \
-       dd if=linux.sb of=$(BIN_DIR)/openwrt-imx23-sbImage ibs=512 seek=4; \
-       )
-endef
-
-define Image/BuildKernel/mxs-uboot
+define Image/BuildKernel
        mkimage -A arm -O linux -T kernel -C none \
                -a 0x40008000 -e 0x40008000 \
                -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' \
@@ -29,40 +23,58 @@ define Image/BuildKernel/mxs-uboot
        cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
 endef
 
-define Image/BuildKernel
-
-  ifeq ($(CONFIG_PACKAGE_imx-bootlets),y)
-       $(call Image/BuildKernel/olinuxino-bootlet)
-  endif
+define Image/InstallKernel
 
-  ifeq ($(CONFIG_PACKAGE_uboot-mxs-mx23_olinuxino),y)
-       $(call Image/BuildKernel/mxs-uboot)
+  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_ZIMAGE),)
+       mkdir -p $(TARGET_DIR)/boot
+       cp $(KDIR)/zImage $(TARGET_DIR)/boot/
   endif
-  
-       $(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage
-       $(foreach board,$(BOARDS),
-               $(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(BIN_DIR)/
-       )
-endef
 
-define Image/InstallKernel
-
-  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),)
+  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE),)
        mkdir -p $(TARGET_DIR)/boot
-       $(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(TARGET_DIR)/boot/
+       cp $(KDIR)/uImage $(TARGET_DIR)/boot/
   endif
   
   ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
        mkdir -p $(TARGET_DIR)/boot
        $(foreach board,$(BOARDS),
-               $(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(TARGET_DIR)/boot/
+               $(CP) $(DTS_DIR)/$(board).dtb $(TARGET_DIR)/boot/
        )
   endif
 
 endef
 
+define Image/Build/SDCard
+       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 $(BIN_DIR)/$(IMG_PREFIX)-uImage ::uImage
+
+       ./gen_mxs_sdcard_img.sh \
+               $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-sdcard-vfat-$(1).img \
+               $(KDIR)/boot.img \
+               $(KDIR)/root.$(1) \
+               $(CONFIG_MXS_SD_BOOT_PARTSIZE) \
+               $(CONFIG_TARGET_ROOTFS_PARTSIZE) \
+               $(BIN_DIR)/uboot-mxs-$(3).sb
+endef
+
+define Image/Build/Profile/olinuxino-maxi
+       $(call Image/Build/SDCard,$(1),imx23-olinuxino,mx23_olinuxino)
+endef
+
+define Image/Build/Profile/olinuxino-micro
+       $(call Image/Build/SDCard,$(1),imx23-olinuxino,mx23_olinuxino)
+endef
+
+define Image/Build/Profile/duckbill
+       $(call Image/Build/SDCard,$(1),imx28-duckbill,duckbill)
+endef
+
 define Image/Build
-       $(call Image/Build/$(1))
+       $(call Image/Build/$(1),$(1))
+       $(call Image/Build/Profile/$(PROFILE),$(1))
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
 endef