From 7938d1645165192abaaf4e4cdbe0bbb880ec3a9c Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Wed, 23 Oct 2013 22:16:09 +0000
Subject: [PATCH] build: make MkuImage more generic

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

SVN-Revision: 38516
---
 include/image.mk                     | 10 +++++++---
 target/linux/kirkwood/image/Makefile | 16 ++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/image.mk b/include/image.mk
index c7da0600c3..71822de980 100644
--- 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 1bc17c2876..94e7bb90b1 100644
--- 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 \
 	)