From: John Crispin <john@openwrt.org>
Date: Thu, 10 Jul 2014 22:02:24 +0000 (+0000)
Subject: imx6: put kernel and dtb into rootfs by default
X-Git-Tag: reboot~6589
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f88fde968988a30b93dcba7f0e1aca171cd61da2;p=openwrt%2Fstaging%2Fchunkeey.git

imx6: put kernel and dtb into rootfs by default

this will make the rc1 images boot with the default config.

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41578
---

diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index 1c68cb0e40..b07dd4fc8c 100644
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx6/image/Makefile
@@ -42,9 +42,9 @@ endef
 
 define Image/InstallKernel/Template
 
- ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),)
+ ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL)$(CONFIG_TARGET_imx6_VENTANA),)
 	$(INSTALL_DIR) $(TARGET_DIR)/boot
-   ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE),)
+   ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE)$(CONFIG_TARGET_imx6_VENTANA),)
 	$(CP) $(BIN_DIR)/$(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/
 	ln -sf $(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/uImage
    endif
@@ -59,7 +59,7 @@ define Image/InstallKernel/Template
    endif
  endif
 
- ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
+ ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB)$(CONFIG_TARGET_imx6_VENTANA),)
 	$(INSTALL_DIR) $(TARGET_DIR)/boot
 	$(foreach dts,$(shell echo $(1)), \
 		$(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(dts).dtb $(TARGET_DIR)/boot/ ; \