- improve wording of BR2_PREFER_STATIC_LIB

1 files changed, 32 insertions, 6 deletions

diff --git a/Config.in b/Config.in
index e75ff23a8..e921eacb4 100644
--- a/Config.in
+++ b/Config.in
@@ -169,6 +169,27 @@ config BR2_x86_i586
 	bool "i586"
 config BR2_x86_i686
 	bool "i686"
+config BR2_x86_pentium4
+	bool "pentium4"
+config BR2_x86_nocona
+	bool "nocona"
+config BR2_x86_core2
+	bool "core2"
+endchoice
+
+choice
+	prompt "Target Architecture Variant"
+	depends BR2_x86_64
+	default BR2_x86_64_core2
+	help
+	  Specific CPU variant to use
+
+config BR2_x86_64_opteron
+	bool "opteron"
+config BR2_x86_64_nocona
+	bool "nocona"
+config BR2_x86_64_core2
+	bool "core2"
 endchoice
 
 config BR2_ARCH
@@ -182,6 +203,9 @@ config BR2_ARCH
 	default "i486"		if BR2_x86_i486
 	default "i586"		if BR2_x86_i586
 	default "i686"		if BR2_x86_i686
+	default "i686"		if BR2_x86_pentium4
+	default "i686"		if BR2_x86_nocona
+	default "i686"		if BR2_x86_core2
 	default "m68k"		if BR2_m68k
 	default "mips"		if BR2_mips
 	default "mipsel"	if BR2_mipsel
@@ -196,6 +220,9 @@ config BR2_ARCH
 	default "sh64"		if BR2_sh64
 	default "sparc"		if BR2_sparc
 	default "x86_64"	if BR2_x86_64
+	default "x86_64"	if BR2_x86_64_nocona
+	default "x86_64"	if BR2_x86_64_core2
+	default "x86_64"	if BR2_x86_64_opteron
 
 config BR2_ENDIAN
 	string
@@ -377,12 +404,11 @@ config BR2_PREFER_STATIC_LIB
 	bool "prefer static libraries"
 	default n
 	help
-	  Where possible, use static libraries.
-	  This increases your code size a lot and should only be
-	  used with a good reason why not use the default, which
-	  is dynamic libraries.
-
-	  If unsure, say No.
+	  Where possible, build and use static libraries for the target.
+	  This potentially increases your code size and should only be
+	  used if you know what you do.
+	  The default is to build dynamic libraries and use those on
+	  the target filesystem.
 
 	  WARNING: This is highly experimental at the moment.