X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fimage.mk;h=e29bb001d58e7fddaa72be9abf2bd362d528f9ef;hb=71617f21a58de15af82e460d5034ad16eaf314ef;hp=5e4dfb28e965925659b4f4f199388f5377b4a028;hpb=dc9ebfc9e6543bc9d757e41584015d6e5c7a6a70;p=openwrt%2Fopenwrt.git

diff --git a/include/image.mk b/include/image.mk
index 5e4dfb28e9..e29bb001d5 100644
--- 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) \
@@ -255,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: