[Cbe-oss-dev] [PATCH 1/9] don't replace powerpc arch with ppc

[Jeremy Kerr]

'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 at ozlabs.org>

---

 include/kernel.mk              |   15 ++++++++-------
 target/linux/amcc/Makefile     |    1 +
 target/linux/magicbox/Makefile |    1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

Index: kamikaze/include/kernel.mk
===================================================================
--- kamikaze.orig/include/kernel.mk
+++ kamikaze/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
 
 
Index: kamikaze/target/linux/amcc/Makefile
===================================================================
--- kamikaze.orig/target/linux/amcc/Makefile
+++ kamikaze/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
 
Index: kamikaze/target/linux/magicbox/Makefile
===================================================================
--- kamikaze.orig/target/linux/magicbox/Makefile
+++ kamikaze/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