[PATCH 2/4] MIPS: remove sub-arch/variants selection from menuconfig

Yann E. MORIN yann.morin.1998 at anciens.enib.fr
Mon Jan 25 20:49:27 UTC 2010


Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at anciens.enib.fr>
---
 Rules.mak                 |    7 -------
 extra/Configs/Config.mips |   42 ------------------------------------------
 2 files changed, 0 insertions(+), 49 deletions(-)

diff --git a/Rules.mak b/Rules.mak
index c0c6c6b..859377f 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -327,13 +327,6 @@ endif
 
 ifeq ($(TARGET_ARCH),mips)
 	OPTIMIZATIONS+=-mno-split-addresses
-	CPU_CFLAGS-$(CONFIG_MIPS_ISA_1)+=-mips1
-	CPU_CFLAGS-$(CONFIG_MIPS_ISA_2)+=-mips2 -mtune=mips2
-	CPU_CFLAGS-$(CONFIG_MIPS_ISA_3)+=-mips3 -mtune=mips3
-	CPU_CFLAGS-$(CONFIG_MIPS_ISA_4)+=-mips4 -mtune=mips4
-	CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32)+=-mips32 -mtune=mips32
-	CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32R2)+=-march=mips32r2 -mtune=mips32r2
-	CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32
 	ifeq ($(strip $(ARCH_BIG_ENDIAN)),y)
 		CPU_LDFLAGS-$(CONFIG_MIPS_N64_ABI)+=-Wl,-melf64btsmip
 		CPU_LDFLAGS-$(CONFIG_MIPS_O32_ABI)+=-Wl,-melf32btsmip
diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index 063b07c..8e580c6 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -29,45 +29,3 @@ config CONFIG_MIPS_N64_ABI
 	bool "N64 ABI"
 
 endchoice
-
-choice
-	prompt "Target Processor Architecture"
-	default CONFIG_MIPS_ISA_1 if CONFIG_MIPS_O32_ABI
-	default CONFIG_MIPS_ISA_3 if CONFIG_MIPS_N32_ABI
-	default CONFIG_MIPS_ISA_3 if CONFIG_MIPS_N64_ABI
-	help
-	  This selects the instruction set architecture of your MIPS CPU. This
-	  information is used for optimizing purposes. To build a library that
-	  will run on any MIPS CPU, you can specify "Generic (MIPS I)" here.
-	  If you pick anything other than "Generic (MIPS I)," there is no
-	  guarantee that uClibc will even run on anything other than the
-	  selected processor type.
-
-	  You should probably select the MIPS ISA that best matches the
-	  CPU you will be using on your device. uClibc will be tuned
-	  for that architecture.
-
-	  If you don't know what to do, choose "Generic (MIPS I)"
-
-config CONFIG_MIPS_ISA_1
-	bool "Generic (MIPS I)"
-
-config CONFIG_MIPS_ISA_2
-	bool "MIPS II"
-
-config CONFIG_MIPS_ISA_3
-	bool "MIPS III"
-
-config CONFIG_MIPS_ISA_4
-	bool "MIPS IV"
-
-config CONFIG_MIPS_ISA_MIPS32
-	bool "MIPS32"
-
-config CONFIG_MIPS_ISA_MIPS32R2
-	bool "MIPS32r2"
-
-config CONFIG_MIPS_ISA_MIPS64
-	bool "MIPS64"
-
-endchoice
-- 
1.6.5





More information about the uClibc mailing list