hostapd: fix some whitespaces

[openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index 71971e2..b3211e7 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -14,6 +14,7 @@ include $(INCLUDE_DIR)/host.mk
 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 +77,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) \
@@ -142,15 +138,14 @@ ifneq ($(CONFIG_NAND_SUPPORT),)
                "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1))
    endef
 # $(1) board name
-# $(2) ubinize-image options (e.g. --no-kernel and/or --uboot-env)
+# $(2) ubinize-image options (e.g. --uboot-env and/or --kernel kernelimage)
 # $(3) rootfstype (e.g. squashfs or ubifs)
-# $(4) kernel image file
-# $(5) options to pass-through to ubinize (i.e. $($(PROFILE)_UBI_OPTS)))
+# $(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)" "$(4)" \
+               "$(KDIR)/root.$(3)" \
                "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \
-               $(5)
+               $(4)
    endef
 
 endif
@@ -269,7 +264,7 @@ define BuildImage
                $(call Image/Prepare)
                $(call Image/mkfs/prepare)
                $(call Image/BuildKernel)
-               $(call Image/BuildKernel/Initramfs)
+               $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs))
                $(call Image/InstallKernel)
                $(call Image/mkfs/cpiogz)
                $(call Image/mkfs/targz)
@@ -283,7 +278,7 @@ define BuildImage
   else
     install: compile install-targets
                $(call Image/BuildKernel)
-               $(call Image/BuildKernel/Initramfs)
+               $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs))
                $(call Image/InstallKernel)
                $(call Image/mkfs/cpiogz)
                $(call Image/mkfs/targz)