X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fimage.mk;h=a8d4bcffd9628d93cf38a559ba9a9887bee9cdcd;hb=efdf7f6499de015f6443d5347b1aa771c189bbd1;hp=669ff0431335a3692decb930d4ab05e995c21ef6;hpb=425e2c1d960da42e74de7575e7b61ce7fa72e23f;p=openwrt%2Fopenwrt.git

diff --git a/include/image.mk b/include/image.mk
index 669ff04313..a8d4bcffd9 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -288,8 +288,6 @@ define BuildImage/mkfs
   .PHONY: mkfs-$(1)
   mkfs-$(1): kernel_prepare
 	$(Image/mkfs/$(1))
-	$(call Build/mkfs/default,$(1))
-	$(call Build/mkfs/$(1),$(1))
   $(KDIR)/root.$(1): mkfs-$(1)
 
 endef
@@ -322,15 +320,32 @@ define Device/Init
   KERNEL_DEPENDS :=
   KERNEL_SIZE :=
 
+  UBOOTENV_IN_UBI :=
+  KERNEL_IN_UBI :=
+  BLOCKSIZE :=
+  PAGESIZE :=
+  SUBPAGESIZE :=
+  UBINIZE_OPTS := -E 5
+
+  DEVICE_DTS :=
+  DEVICE_DTS_DIR :=
+
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
 endef
 
+DEFAULT_DEVICE_VARS := \
+  DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \
+  DEVICE_DTS DEVICE_DTS_DIR \
+  UBOOTENV_IN_UBI KERNEL_IN_UBI \
+  BLOCKSIZE PAGESIZE SUBPAGESIZE \
+  UBINIZE_OPTS
+
 define Device/ExportVar
   $(1) : $(2):=$$($(2))
 
 endef
 define Device/Export
-  $(foreach var,$(DEVICE_VARS) DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE,$(call Device/ExportVar,$(1),$(var)))
+  $(foreach var,$(DEVICE_VARS) $(DEFAULT_DEVICE_VARS),$(call Device/ExportVar,$(1),$(var)))
   $(1) : FILESYSTEM:=$(2)
 endef
 
@@ -351,7 +366,7 @@ endef
 ifndef IB
 define Device/Build/initramfs
   $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
-  $$(_TARGET): $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)
+  $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE))
 
   $(KDIR)/$$(KERNEL_INITRAMFS_NAME):: image_prepare
   $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
@@ -466,6 +481,7 @@ define LegacyDevice/Build
 	$$(call Image/Prepare/Profile,$(1))
 
   legacy-image-$(1):
+	$$(call Image/BuildKernel/Profile,$(1))
 	$(foreach fs,$(TARGET_FILESYSTEMS),
 		$$(call Image/Build/Profile,$(1),$(fs))
 	)