patch by David Anders to add arm variants

diff --git a/Config.in b/Config.in
index 0f26294cdfef3a1a0d04b70d247ffdd9f45e7a51..41761f5e79ff53476c722222207195f71cb5bfd0 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -46,6 +46,48 @@ endchoice
 # things kept down to a _sensible_ number of target variants. No such
 # luck for sh..
 #
+choice
+       prompt "Target Architecture Variant"
+       depends BR2_arm || BR2_armeb
+       default BR2_generic_arm
+config BR2_generic_arm
+       bool "generic_arm"
+config BR2_arm610
+       bool "arm610"
+config BR2_arm710
+       bool "arm710"
+config BR2_arm720t
+       bool "arm720t"
+config BR2_arm920t
+       bool "arm920t"
+config BR2_arm922t
+       bool "arm922t"
+config BR2_arm926t
+       bool "arm926t"
+config BR2_arm1136jf_s
+       bool "arm1136jf_s"
+config BR2_sa110
+       bool "sa110"
+config BR2_sa1100
+       bool "sa1100"
+config BR2_xscale
+       bool "xscale"
+endchoice
+
+config BR2_ARM_TYPE
+       string
+       default ARM610          if BR2_arm610
+       default ARM710          if BR2_arm710
+       default ARM720T         if BR2_arm720t
+       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 GENERIC_ARM     if BR2_generic_arm
+
 choice
        prompt "Target Architecture Variant"
        depends BR2_sh

diff --git a/toolchain/uClibc/uClibc.config b/toolchain/uClibc/uClibc.config
index 0a2ba841c8f83a6fb21b56d70f697614d70acdb2..4b1b8e83fc531f81e0dc0988f33b255663c88c96 100644 (file)
--- a/toolchain/uClibc/uClibc.config
+++ b/toolchain/uClibc/uClibc.config
@@ -37,6 +37,17 @@ DO_C99_MATH=y
 WARNINGS="-Wall"
 KERNEL_SOURCE="/usr/src/linux"
 HAVE_DOT_CONFIG=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
 
 #
 # General Library Settings