From 4c1dabb81e4b2d9299aa535b3df198c483285777 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Thu, 13 Feb 2014 10:43:32 +0000 Subject: [PATCH] change image generation logic Signed-off-by: Imre Kaloz SVN-Revision: 39580 --- target/linux/omap/image/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/linux/omap/image/Makefile b/target/linux/omap/image/Makefile index 1f6f28aded..c2f6f7cd94 100644 --- a/target/linux/omap/image/Makefile +++ b/target/linux/omap/image/Makefile @@ -15,17 +15,10 @@ define Image/BuildKernel ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) $(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/openwrt-$(BOARD)-zImage-initramfs endif - -mkdir $(BIN_DIR)/dtbs - -$(CP) $(LINUX_DIR)/arch/arm/boot/dts/am335x*.dtb $(BIN_DIR)/dtbs/ - -$(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap3*.dtb $(BIN_DIR)/dtbs/ - -$(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap4*.dtb $(BIN_DIR)/dtbs/ -endef - -define Image/Build ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),) $(INSTALL_DIR) $(TARGET_DIR)/boot - $(CP) $(KDIR)/zImage $(TARGET_DIR)/boot/ + $(CP) $(BIN_DIR)/openwrt-$(BOARD)-zImage $(TARGET_DIR)/boot/zImage endif ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),) $(INSTALL_DIR) $(TARGET_DIR)/boot @@ -33,6 +26,13 @@ define Image/Build $(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap3*.dtb $(TARGET_DIR)/boot/ $(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap4*.dtb $(TARGET_DIR)/boot/ endif + -mkdir $(BIN_DIR)/dtbs + -$(CP) $(LINUX_DIR)/arch/arm/boot/dts/am335x*.dtb $(BIN_DIR)/dtbs/ + -$(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap3*.dtb $(BIN_DIR)/dtbs/ + -$(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap4*.dtb $(BIN_DIR)/dtbs/ +endef + +define Image/Build $(call Image/Build/$(1),$(1)) endef -- 2.30.2