From 5cb62f74783a6633275b5453ac4b0920c5680b1c Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 27 May 2015 15:34:30 +0000 Subject: [PATCH] omap: use common image prefix Signed-off-by: Jo-Philipp Wich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45786 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/omap/image/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/omap/image/Makefile b/target/linux/omap/image/Makefile index ed3d90d222..3fa2848e03 100644 --- a/target/linux/omap/image/Makefile +++ b/target/linux/omap/image/Makefile @@ -11,14 +11,14 @@ UBIFS_OPTS = -F -m 2048 -e 124KiB -c 4096 -U UBI_OPTS = -m 2048 -p 128KiB -s 512 -O 2048 define Image/BuildKernel - $(CP) $(KDIR)/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage + $(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) - $(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/openwrt-$(BOARD)-zImage-initramfs + $(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs endif ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),) $(INSTALL_DIR) $(TARGET_DIR)/boot - $(CP) $(BIN_DIR)/openwrt-$(BOARD)-zImage $(TARGET_DIR)/boot/zImage + $(CP) $(BIN_DIR)/$(IMG_PREFIX)-zImage $(TARGET_DIR)/boot/zImage endif ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),) $(INSTALL_DIR) $(TARGET_DIR)/boot @@ -37,16 +37,16 @@ define Image/Build endef define Image/Build/jffs2-64k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=65536 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=65536 conv=sync endef define Image/Build/jffs2-128k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=131072 conv=sync endef define Image/Build/squashfs $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img bs=131072 conv=sync endef $(eval $(call BuildImage)) -- 2.11.0