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
This commit is contained in:
John Crispin 2014-07-10 22:02:24 +00:00
parent a17a58e310
commit f88fde9689

View file

@ -42,9 +42,9 @@ endef
define Image/InstallKernel/Template 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 $(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/ $(CP) $(BIN_DIR)/$(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/
ln -sf $(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/uImage ln -sf $(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/uImage
endif endif
@ -59,7 +59,7 @@ define Image/InstallKernel/Template
endif endif
endif endif
ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),) ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB)$(CONFIG_TARGET_imx6_VENTANA),)
$(INSTALL_DIR) $(TARGET_DIR)/boot $(INSTALL_DIR) $(TARGET_DIR)/boot
$(foreach dts,$(shell echo $(1)), \ $(foreach dts,$(shell echo $(1)), \
$(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(dts).dtb $(TARGET_DIR)/boot/ ; \ $(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(dts).dtb $(TARGET_DIR)/boot/ ; \