From dc62bf6a58f4f37c6d6573b5fbfb5591d78bb1ff Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 23 Apr 2009 23:13:59 +0000
Subject: Remove unused settings

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1723 42af7a65-404d-4744-a932-0658087f49c3
---
 misc/buildroot/Config.in                       | 43 +++++++++-----------------
 misc/buildroot/configs/arm-defconfig           |  1 -
 misc/buildroot/configs/arm920t-defconfig-4.2.4 |  1 -
 misc/buildroot/configs/arm926t-defconfig-4.2.4 |  1 -
 4 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/misc/buildroot/Config.in b/misc/buildroot/Config.in
index 153b7a8ac..46a3c62a5 100644
--- a/misc/buildroot/Config.in
+++ b/misc/buildroot/Config.in
@@ -68,49 +68,35 @@ choice
 	  Specific CPU variant to use
 
 config BR2_generic_arm
-	bool "generic_arm"
+	bool "generic ARM"
 config BR2_arm610
-	bool "arm610"
+	bool "ARM610"
 config BR2_arm710
-	bool "arm710"
+	bool "ARM710"
 config BR2_arm720t
-	bool "arm720t"
+	bool "ARM720T"
 config BR2_arm740t
-	bool "arm740t"
+	bool "ARM740T"
 config BR2_arm920t
-	bool "arm920t"
+	bool "ARM920T"
 config BR2_arm922t
-	bool "arm922t"
+	bool "ARM922T"
 config BR2_arm926t
-	bool "arm926t"
+	bool "ARM926T"
 config BR2_arm1136jf_s
-	bool "arm1136jf_s"
+	bool "ARM1136JF-S"
+config BR2_cortex_m3
+	bool "Cortex-M3"
 config BR2_sa110
-	bool "sa110"
+	bool "SA110"
 config BR2_sa1100
-	bool "sa1100"
+	bool "SA1100"
 config BR2_xscale
-	bool "xscale"
+	bool "X-Scale"
 config BR2_iwmmxt
 	bool "iwmmxt"
 endchoice
 
-config BR2_ARM_TYPE
-	string
-	default ARM610		if BR2_arm610
-	default ARM710		if BR2_arm710
-	default ARM720T		if BR2_arm720t
-	default ARM740T		if BR2_arm740t
-	default ARM920T		if BR2_arm920t
-	default ARM922T		if BR2_arm922t
-	default ARM926T		if BR2_arm926t
-	default ARM1136JF_S 	if BR2_arm1136jf_s
-	default ARM_SA110	if BR2_sa110
-	default ARM_SA1100	if BR2_sa1100
-	default ARM_XSCALE	if BR2_xscale
-	default ARM_IWMMXT	if BR2_iwmmxt
-	default GENERIC_ARM	if BR2_generic_arm
-
 choice
 	prompt "Target ABI"
 	depends BR2_arm || BR2_armeb
@@ -238,6 +224,7 @@ config BR2_GCC_TARGET_ARCH
 	default armv4		if BR2_sa110 || BR2_sa1100
 	default armv4t		if BR2_arm7tdmi
 	default armv4t		if BR2_arm720t || BR2_arm920t || BR2_arm922t
+	default armv5t		if BR2_cortex_m3 # Use armv7-m if available
 	default armv5te		if BR2_arm926t || BR2_arm10t || BR2_xscale
 	default armv6j		if BR2_arm1136jf_s
 	default iwmmxt		if BR2_iwmmxt
diff --git a/misc/buildroot/configs/arm-defconfig b/misc/buildroot/configs/arm-defconfig
index 47f13b509..61b487660 100644
--- a/misc/buildroot/configs/arm-defconfig
+++ b/misc/buildroot/configs/arm-defconfig
@@ -32,7 +32,6 @@ BR2_generic_arm=y
 # BR2_sa1100 is not set
 # BR2_xscale is not set
 # BR2_iwmmxt is not set
-BR2_ARM_TYPE="GENERIC_ARM"
 BR2_ARM_OABI=y
 # BR2_ARM_EABI is not set
 BR2_ARCH="arm"
diff --git a/misc/buildroot/configs/arm920t-defconfig-4.2.4 b/misc/buildroot/configs/arm920t-defconfig-4.2.4
index 9d7a2e6c6..e9f783eae 100644
--- a/misc/buildroot/configs/arm920t-defconfig-4.2.4
+++ b/misc/buildroot/configs/arm920t-defconfig-4.2.4
@@ -35,7 +35,6 @@ BR2_arm920t=y
 # BR2_sa1100 is not set
 # BR2_xscale is not set
 # BR2_iwmmxt is not set
-BR2_ARM_TYPE="ARM920T"
 BR2_ARM_OABI=y
 # BR2_ARM_EABI is not set
 BR2_ARCH="arm"
diff --git a/misc/buildroot/configs/arm926t-defconfig-4.2.4 b/misc/buildroot/configs/arm926t-defconfig-4.2.4
index f247eab5e..9041e955c 100644
--- a/misc/buildroot/configs/arm926t-defconfig-4.2.4
+++ b/misc/buildroot/configs/arm926t-defconfig-4.2.4
@@ -35,7 +35,6 @@ BR2_arm926t=y
 # BR2_sa1100 is not set
 # BR2_xscale is not set
 # BR2_iwmmxt is not set
-BR2_ARM_TYPE="ARM926T"
 BR2_ARM_OABI=y
 # BR2_ARM_EABI is not set
 BR2_ARCH="arm"
-- 
cgit v1.2.3