From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 23 Oct 2007 06:23:12 +0000 (+0000)
Subject: don't replace powerpc arch with ppc
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;ds=sidebyside;h=d8e032edef2fb9d1f7aa3b1f96a444f0a1db9696;p=librecmc%2Flibrecmc.git

don't replace powerpc arch with ppc

'powerpc' is a valid arch for the LINUX_KARCH variable, but the build
system unconditionally replaces LIUNUX_KARCH=powerpc with
LINUX_KARCH=ppc.

This change only does the replacement if LINUX_KARCH isn't set. This
allows us to use the powerpc architecture.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

SVN-Revision: 9405
---

diff --git a/include/kernel.mk b/include/kernel.mk
index 7486057052..f9baeef0ac 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -51,13 +51,14 @@ endif
 ifneq (,$(findstring uml,$(BOARD)))
   LINUX_KARCH:=um
 else
-  LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-	-e 's/mipsel/mips/' \
-	-e 's/mipseb/mips/' \
-	-e 's/powerpc/ppc/' \
-	-e 's/sh[234]/sh/' \
-	-e 's/armeb/arm/' \
-  )
+  ifeq (,$(LINUX_KARCH))
+    LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
+	  -e 's/mipsel/mips/' \
+	  -e 's/mipseb/mips/' \
+	  -e 's/sh[234]/sh/' \
+	  -e 's/armeb/arm/' \
+    )
+  endif
 endif
 
 
diff --git a/target/linux/amcc/Makefile b/target/linux/amcc/Makefile
index d582d81915..5e52d38c77 100644
--- a/target/linux/amcc/Makefile
+++ b/target/linux/amcc/Makefile
@@ -12,6 +12,7 @@ BOARDNAME:=AMCC Taishan
 FEATURES:=jffs2
 
 LINUX_VERSION:=2.6.21.5
+LINUX_KARCH:=ppc
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/magicbox/Makefile b/target/linux/magicbox/Makefile
index b130095624..15f035a82e 100644
--- a/target/linux/magicbox/Makefile
+++ b/target/linux/magicbox/Makefile
@@ -12,6 +12,7 @@ BOARDNAME:=Magicbox
 FEATURES:=squashfs jffs2
 
 LINUX_VERSION:=2.6.22.4
+LINUX_KARCH:=ppc
 
 include $(INCLUDE_DIR)/target.mk