From f88fde968988a30b93dcba7f0e1aca171cd61da2 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 10 Jul 2014 22:02:24 +0000 Subject: [PATCH] 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 SVN-Revision: 41578 --- target/linux/imx6/image/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile index 1c68cb0e40b..b07dd4fc8ca 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/ ; \ -- 2.30.2