diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-23 06:23:12 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-23 06:23:12 +0000 |
| commit | 42ef307c66cda7b7e0cb34f931633e6aee15ac5b (patch) | |
| tree | d1c9db843dfb9857ac78c5b6ee08e31ea15ef4e1 | |
| parent | 76b405fc143e5e5926bbced682f798a22486fab8 (diff) | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9405 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/kernel.mk | 15 | ||||
| -rw-r--r-- | target/linux/amcc/Makefile | 1 | ||||
| -rw-r--r-- | target/linux/magicbox/Makefile | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/kernel.mk b/include/kernel.mk index 748605705..f9baeef0a 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 d582d8191..5e52d38c7 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 b13009562..15f035a82 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 |