Stop halting ARM build to configure uClibc

diff --git a/Config.in b/Config.in
index a6186025c7771f0f0246a0e84b66124110d0781f..3c090e58c671f48bdc1d63d482f5d6e53b043631 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -65,6 +65,8 @@ choice
 
 config BR2_generic_arm
        bool "generic_arm"
+config BR2_arm7tdmi
+       bool "arm7tdmi"
 config BR2_arm610
        bool "arm610"
 config BR2_arm710
@@ -77,6 +79,8 @@ config BR2_arm922t
        bool "arm922t"
 config BR2_arm926t
        bool "arm926t"
+config BR2_arm10t
+       bool "arm10t"
 config BR2_arm1136jf_s
        bool "arm1136jf_s"
 config BR2_arm1176jz_s
@@ -95,12 +99,15 @@ endchoice
 
 config BR2_ARM_TYPE
        string
+       default GENERIC_ARM     if BR2_generic_arm
        default ARM610          if BR2_arm610
        default ARM710          if BR2_arm710
+       default ARM7TDMI        if BR2_arm7tdmi
        default ARM720T         if BR2_arm720t
        default ARM920T         if BR2_arm920t
        default ARM922T         if BR2_arm922t
        default ARM926T         if BR2_arm926t
+       default ARM10T          if BR2_arm10t
        default ARM1136JF_S     if BR2_arm1136jf_s
        default ARM1176JZ_S     if BR2_arm1176jz_s
        default ARM1176JZF_S    if BR2_arm1176jzf_s
@@ -108,7 +115,6 @@ config BR2_ARM_TYPE
        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"

diff --git a/toolchain/uClibc/uClibc-0.9.29.config b/toolchain/uClibc/uClibc-0.9.29.config
index 5e53d51bbefbdf3b2fefca4fc4e83cf725b9560a..17a157d6d00b8171dd453fdc5b63ca7baa646e17 100644 (file)
--- a/toolchain/uClibc/uClibc-0.9.29.config
+++ b/toolchain/uClibc/uClibc-0.9.29.config
@@ -210,6 +210,8 @@ WARNINGS="-Wall"
 # CONFIG_ARM926T is not set
 # CONFIG_ARM10T is not set
 # CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
 # CONFIG_ARM_SA110 is not set
 # CONFIG_ARM_SA1100 is not set
 # CONFIG_ARM_XSCALE is not set