build: make MkuImage more generic

Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38516

diff --git a/include/image.mk b/include/image.mk
index c7da0600c3376b82d0e8d6e985e23d22880e3dc0..71822de980d8a4a206dd0ecec8ef0fa2f659ff80 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -67,6 +67,10 @@ define add_jffs2_mark
        echo -ne '\xde\xad\xc0\xde' >> $(1)
 endef
 
+define toupper
+       $(shell echo $(1) | tr '[:lower:]' '[:upper:]')
+endef
+
 # pad to 4k, 8k, 64k, 128k 256k and add jffs2 end-of-filesystem mark
 define prepare_generic_squashfs
        $(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 64 128 256
@@ -82,9 +86,9 @@ else
   endef
 endif
 
-define Image/BuildKernel/MkuImageARM
-       mkimage -A arm -O linux -T kernel -a $(1) -C none -e $(1) \
-               -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(2) $(3)
+define Image/BuildKernel/MkuImage
+       mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
+               -n '$(call toupper,$(ARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $(4) $(5)
 endef
 
 define Image/BuildKernel/MkFIT

diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 1bc17c28763788e11afbe9a07d433e5e55cafb76..94e7bb90b1d8f53d43c418e9e6657d64e3ff46ab 100644 (file)
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -13,8 +13,8 @@ define Image/BuildKernel/Template
 
        $(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
        echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage
-       $(call Image/BuildKernel/MkuImageARM, \
-               0x00008000, \
+       $(call Image/BuildKernel/MkuImage, \
+               none, 0x00008000, 0x00008000, \
                $(BIN_DIR)/$(IMG_PREFIX)-zImage, \
                $(BIN_DIR)/$(IMG_PREFIX)-uImage \
        )
@@ -22,8 +22,8 @@ define Image/BuildKernel/Template
  ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
        $(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
        echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
-       $(call Image/BuildKernel/MkuImageARM, \
-               0x00008000, \
+       $(call Image/BuildKernel/MkuImage, \
+               none, 0x00008000, 0x00008000, \
                $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs, \
                $(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs \
        )
@@ -34,8 +34,8 @@ define Image/BuildKernel/Template
 
        $(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage
        cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >> $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage
-       $(call Image/BuildKernel/MkuImageARM, \
-               0x00008000, \
+       $(call Image/BuildKernel/MkuImage, \
+               none, 0x00008000, 0x00008000, \
                $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage, \
                $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-uImage \
        )
@@ -43,8 +43,8 @@ define Image/BuildKernel/Template
   ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
        $(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage-initramfs
        cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >> $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage-initramfs
-       $(call Image/BuildKernel/MkuImageARM, \
-               0x00008000, \
+       $(call Image/BuildKernel/MkuImage, \
+               none, 0x00008000, 0x00008000,
                $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage-initramfs, \
                $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-uImage-initramfs \
        )