image.mk: reduce code duplication, move prepare to a separate make target

[openwrt/openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index ddf19dd4b90fa7ae580c787ff10b173f481e2dba..e29bb001d58e7fddaa72be9abf2bd362d528f9ef 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 
-.NOTPARALLEL:
 override MAKEFLAGS=
 override MAKE:=$(SUBMAKE)
 KDIR=$(KERNEL_BUILD_DIR)
+DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/
 
 IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
 
@@ -76,15 +76,10 @@ define prepare_generic_squashfs
        $(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 16 64 128 256
 endef
 
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-  define Image/BuildKernel/Initramfs
+define Image/BuildKernel/Initramfs
        cp $(KDIR)/vmlinux-initramfs.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs.elf
        $(call Image/Build/Initramfs)
-  endef
-else
-  define Image/BuildKernel/Initramfs
-  endef
-endif
+endef
 
 define Image/BuildKernel/MkuImage
        mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
@@ -129,18 +124,29 @@ ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
     endef
 endif
 
-# $(1): Board name (small caps)
-# $(2): kernel image
-# $(3): rootfs image
+# $(1): board name
+# $(2): rootfs type
+# $(3): kernel image
 ifneq ($(CONFIG_NAND_SUPPORT),)
    define Image/Build/SysupgradeNAND
-       mkdir -p $(KDIR_TMP)/sysupgrade-$(1)/
-       echo "BOARD=$(1)" > $(KDIR_TMP)/sysupgrade-$(1)/CONTROL
-       $(CP) $(2) $(KDIR_TMP)/sysupgrade-$(1)/kernel
-       $(CP) $(3) $(KDIR_TMP)/sysupgrade-$(1)/root
-       (cd $(KDIR_TMP); $(TAR) cvzf \
-               $(call imgname,ubi,$(1))-sysupgrade.tgz sysupgrade-$(1))
+       mkdir -p "$(KDIR_TMP)/sysupgrade-$(1)/"
+       echo "BOARD=$(1)" > "$(KDIR_TMP)/sysupgrade-$(1)/CONTROL"
+       [ -z "$(2)" ] || $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(1)/root"
+       [ -z "$(3)" ] || $(CP) "$(3)" "$(KDIR_TMP)/sysupgrade-$(1)/kernel"
+       (cd "$(KDIR_TMP)"; $(TAR) cvf \
+               "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1))
+   endef
+# $(1) board name
+# $(2) ubinize-image options (e.g. --uboot-env and/or --kernel kernelimage)
+# $(3) rootfstype (e.g. squashfs or ubifs)
+# $(4) options to pass-through to ubinize (i.e. $($(PROFILE)_UBI_OPTS)))
+   define Image/Build/UbinizeImage
+       sh $(TOPDIR)/scripts/ubinize-image.sh $(2) \
+               "$(KDIR)/root.$(3)" \
+               "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \
+               $(4)
    endef
+
 endif
 
 ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
@@ -244,52 +250,35 @@ define BuildImage
 
   download:
   prepare:
+  compile:
+  clean:
+  image_prepare:
 
   ifeq ($(IB),)
     compile: compile-targets FORCE
                $(call Build/Compile)
-  else
-    compile:
-  endif
 
-  ifeq ($(IB),)
-    install: compile install-targets FORCE
+    clean: clean-targets
+               $(call Build/Clean)
+
+    image_prepare: compile FORCE
                $(call Image/Prepare)
                $(call Image/mkfs/prepare)
-               $(call Image/BuildKernel)
-               $(call Image/BuildKernel/Initramfs)
-               $(call Image/InstallKernel)
-               $(call Image/mkfs/cpiogz)
-               $(call Image/mkfs/targz)
-               $(call Image/mkfs/ext4)
-               $(call Image/mkfs/iso)
-               $(call Image/mkfs/jffs2)
-               $(call Image/mkfs/jffs2_nand)
-               $(call Image/mkfs/squashfs)
-               $(call Image/mkfs/ubifs)
-               $(call Image/Checksum)
-  else
-    install: compile install-targets
-               $(call Image/BuildKernel)
-               $(call Image/BuildKernel/Initramfs)
-               $(call Image/InstallKernel)
-               $(call Image/mkfs/cpiogz)
-               $(call Image/mkfs/targz)
-               $(call Image/mkfs/ext4)
-               $(call Image/mkfs/iso)
-               $(call Image/mkfs/jffs2)
-               $(call Image/mkfs/jffs2_nand)
-               $(call Image/mkfs/squashfs)
-               $(call Image/mkfs/ubifs)
-               $(call Image/Checksum)
   endif
 
-  ifeq ($(IB),)
-    clean: clean-targets
-               $(call Build/Clean)
-  else
-    clean:
-  endif
+  install: image_prepare install-targets FORCE
+       $(call Image/BuildKernel)
+       $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs))
+       $(call Image/InstallKernel)
+       $(call Image/mkfs/cpiogz)
+       $(call Image/mkfs/targz)
+       $(call Image/mkfs/ext4)
+       $(call Image/mkfs/iso)
+       $(call Image/mkfs/jffs2)
+       $(call Image/mkfs/jffs2_nand)
+       $(call Image/mkfs/squashfs)
+       $(call Image/mkfs/ubifs)
+       $(call Image/Checksum)
 
   compile-targets:
   install-targets: