From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 26 Jun 2011 14:22:55 +0000 (+0000)
Subject: uclibc: make powerpc e500 support independent of the target name, always use it if... 
X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/755e8b203de686d6d5db7fe4c2a3d69118b21880?hp=99d1ebb93008c8df2e5c4da494f54fbde446ce6c

uclibc: make powerpc e500 support independent of the target name, always use it if the spe_fpu feature flag is set

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27289 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 21a180c22..d74d1ecfc 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -59,7 +59,9 @@ endef
 GEN_CONFIG=$(SCRIPT_DIR)/kconfig.pl -n \
 	$(if $(wildcard $(CONFIG_DIR)/common),'+' $(CONFIG_DIR)/common) \
 	$(if $(CONFIG_UCLIBC_ENABLE_DEBUG),$(if $(wildcard $(CONFIG_DIR)/debug),'+' $(CONFIG_DIR)/debug)) \
-	$(CONFIG_DIR)/$(ARCH)$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD))
+	$(CONFIG_DIR)/$(ARCH)$(strip \
+		$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD), \
+			$(if $(CONFIG_HAS_SPE_FPU),$(if $(wildcard $(CONFIG_DIR)/$(ARCH).e500),.e500))))
 
 define Host/Prepare
 	$(call Host/Prepare/Default)
diff --git a/toolchain/uClibc/config-0.9.32/powerpc.e500 b/toolchain/uClibc/config-0.9.32/powerpc.e500
new file mode 100644
index 000000000..a835c3d5e
--- /dev/null
+++ b/toolchain/uClibc/config-0.9.32/powerpc.e500
@@ -0,0 +1,6 @@
+ARCH_BIG_ENDIAN=y
+# CONFIG_CLASSIC is not set
+CONFIG_E500=y
+TARGET_ARCH="powerpc"
+TARGET_SUBARCH="classic"
+TARGET_powerpc=y
diff --git a/toolchain/uClibc/config-0.9.32/powerpc.mpc85xx b/toolchain/uClibc/config-0.9.32/powerpc.mpc85xx
deleted file mode 100644
index a835c3d5e..000000000
--- a/toolchain/uClibc/config-0.9.32/powerpc.mpc85xx
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH_BIG_ENDIAN=y
-# CONFIG_CLASSIC is not set
-CONFIG_E500=y
-TARGET_ARCH="powerpc"
-TARGET_SUBARCH="classic"
-TARGET_powerpc=y