target.mk: rework arm architecture level detection

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

diff --git a/include/image.mk b/include/image.mk
index 7b579855bc3d4b1997fa628c2b6e96c7c4f352b1..b257eae121e42f153e886b8873928989ed04a720 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -322,15 +322,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 +368,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)
@@ -463,11 +480,10 @@ define LegacyDevice/Build
   .PHONY: legacy-image-prepare-$(1) legacy-image-$(1)
 
   legacy-image-prepare-$(1):
-       $(foreach fs,$(TARGET_FILESYSTEMS),
-               $$(call Image/Prepare/Profile,$(1),$(fs))
-       )
+       $$(call Image/Prepare/Profile,$(1))
 
   legacy-image-$(1):
+       $$(call Image/BuildKernel/Profile,$(1))
        $(foreach fs,$(TARGET_FILESYSTEMS),
                $$(call Image/Build/Profile,$(1),$(fs))
        )