aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-02-13 10:43:32 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-02-13 10:43:32 +0000
commit4c1dabb81e4b2d9299aa535b3df198c483285777 (patch)
tree7cb0fcced32cb45bc63863f89fb10996987c065a /target
parent157f56c461d64e51823f2c12049300987bc3ba8b (diff)
downloadupstream-4c1dabb81e4b2d9299aa535b3df198c483285777.tar.gz
upstream-4c1dabb81e4b2d9299aa535b3df198c483285777.tar.bz2
upstream-4c1dabb81e4b2d9299aa535b3df198c483285777.zip
change image generation logic
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 39580
Diffstat (limited to 'target')
-rw-r--r--target/linux/omap/image/Makefile16
1 files 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