config: fix recursive deps

The latest kconfig stuff is more stringent when it comes to validating
the dependency of the symbols. It is no longer possible to have a symbol
depend on itself (such as our construct for arch/cc/libc/... was doing).

Fix our generated-file infrastructure to avoid these situations when the
new kconfig stuff will be merged (in a following changeset).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

11 files changed, 109 insertions, 118 deletions

diff --git a/config/arch/alpha.in b/config/arch/alpha.in
index 387d355e..f0c6b95b 100644
--- a/config/arch/alpha.in
+++ b/config/arch/alpha.in
@@ -1,10 +1,9 @@
 # Alpha specific configuration file
 
-config ARCH_alpha
-    select ARCH_SUPPORTS_32
-    select ARCH_DEFAULT_32
-    select ARCH_USE_MMU
-    select ARCH_SUPPORT_CPU
-    select ARCH_SUPPORT_TUNE
-    help
-      The Alpha architecture.
+## select ARCH_SUPPORTS_32
+## select ARCH_DEFAULT_32
+## select ARCH_USE_MMU
+## select ARCH_SUPPORT_CPU
+## select ARCH_SUPPORT_TUNE
+##
+## help The Alpha architecture.
diff --git a/config/arch/arm.in b/config/arch/arm.in
index 08bf89ee..4b96335f 100644
--- a/config/arch/arm.in
+++ b/config/arch/arm.in
@@ -1,16 +1,15 @@
 # ARM specific configuration file
 
-config ARCH_arm
-    select ARCH_SUPPORTS_32
-    select ARCH_DEFAULT_32
-    select ARCH_SUPPORTS_BOTH_MMU
-    select ARCH_DEFAULT_HAS_MMU
-    select ARCH_SUPPORTS_BOTH_ENDIAN
-    select ARCH_DEFAULT_LE
-    select ARCH_SUPPORT_ARCH
-    select ARCH_SUPPORT_CPU
-    select ARCH_SUPPORT_TUNE
-    select ARCH_SUPPORT_FPU
-    help
-      The ARM architecture, as defined by:
-        http://www.arm.com/
+## select ARCH_SUPPORTS_32
+## select ARCH_DEFAULT_32
+## select ARCH_SUPPORTS_BOTH_MMU
+## select ARCH_DEFAULT_HAS_MMU
+## select ARCH_SUPPORTS_BOTH_ENDIAN
+## select ARCH_DEFAULT_LE
+## select ARCH_SUPPORT_ARCH
+## select ARCH_SUPPORT_CPU
+## select ARCH_SUPPORT_TUNE
+## select ARCH_SUPPORT_FPU
+##
+## help The ARM architecture, as defined by:
+## help     http://www.arm.com/
diff --git a/config/arch/avr32.in b/config/arch/avr32.in
index f416a092..9a765610 100644
--- a/config/arch/avr32.in
+++ b/config/arch/avr32.in
@@ -1,14 +1,13 @@
 # AVR32 specific configuration file
 
-config ARCH_avr32
-    select ARCH_SUPPORTS_32
-    select ARCH_DEFAULT_32
-    select ARCH_USE_MMU
-    select ARCH_DEFAULT_BE
-    select ARCH_SUPPORT_ARCH
-    select ARCH_SUPPORT_CPU
-    select ARCH_SUPPORT_TUNE
-    select ARCH_SUPPORT_FPU
-     help
-      The AVR32 architecture, as defined by:
-        http://www.atmel.com/products/avr32
+## select ARCH_SUPPORTS_32
+## select ARCH_DEFAULT_32
+## select ARCH_USE_MMU
+## select ARCH_DEFAULT_BE
+## select ARCH_SUPPORT_ARCH
+## select ARCH_SUPPORT_CPU
+## select ARCH_SUPPORT_TUNE
+## select ARCH_SUPPORT_FPU
+##
+## help The AVR32 architecture, as defined by:
+## help     http://www.atmel.com/products/avr32
diff --git a/config/arch/blackfin.in b/config/arch/blackfin.in
index f4515e5c..7cc8226b 100644
--- a/config/arch/blackfin.in
+++ b/config/arch/blackfin.in
@@ -1,12 +1,11 @@
 # Blackfin specific configuration file
 
-config ARCH_blackfin
-    select ARCH_SUPPORTS_32
-    select ARCH_DEFAULT_32
-    select ARCH_DEFAULT_LE
-    select ARCH_SUPPORT_ARCH
-    select ARCH_SUPPORT_CPU
-    select ARCH_SUPPORT_TUNE
-    select ARCH_SUPPORT_FPU
-     help
-      The Blackfin architecture
+## select ARCH_SUPPORTS_32
+## select ARCH_DEFAULT_32
+## select ARCH_DEFAULT_LE
+## select ARCH_SUPPORT_ARCH
+## select ARCH_SUPPORT_CPU
+## select ARCH_SUPPORT_TUNE
+## select ARCH_SUPPORT_FPU
+##
+## help The Blackfin architecture
diff --git a/config/arch/m68k.in b/config/arch/m68k.in
index df455013..8745e751 100644
--- a/config/arch/m68k.in
+++ b/config/arch/m68k.in
@@ -1,10 +1,10 @@
 # m68k specific configuration file
-# depends on EXPERIMENTAL
 
-config ARCH_m68k
-    select ARCH_SUPPORTS_32
-    select ARCH_DEFAULT_32
-    select ARCH_DEFAULT_BE
-    select ARCH_SUPPORT_CPU
-     help
-      The m68k architecture
+## depends on EXPERIMENTAL
+##
+## select ARCH_SUPPORTS_32
+## select ARCH_DEFAULT_32
+## select ARCH_DEFAULT_BE
+## select ARCH_SUPPORT_CPU
+##
+## help The m68k architecture
diff --git a/config/arch/mips.in b/config/arch/mips.in
index 52d6de3a..94b99480 100644
--- a/config/arch/mips.in
+++ b/config/arch/mips.in
@@ -1,14 +1,13 @@
 # MIPS specific config options
 
-config ARCH_mips
-    select ARCH_SUPPORTS_32
-    select ARCH_SUPPORTS_64 if EXPERIMENTAL
-    select ARCH_DEFAULT_32
-    select ARCH_USE_MMU
-    select ARCH_SUPPORTS_BOTH_ENDIAN
-    select ARCH_DEFAULT_BE
-    select ARCH_SUPPORT_ARCH
-    select ARCH_SUPPORT_TUNE
-    help
-      The MIPS architecture, as defined by:
-        http://www.mips.com/
+## select ARCH_SUPPORTS_32
+## select ARCH_SUPPORTS_64 if EXPERIMENTAL
+## select ARCH_DEFAULT_32
+## select ARCH_USE_MMU
+## select ARCH_SUPPORTS_BOTH_ENDIAN
+## select ARCH_DEFAULT_BE
+## select ARCH_SUPPORT_ARCH
+## select ARCH_SUPPORT_TUNE
+##
+## help The MIPS architecture, as defined by:
+## help     http://www.mips.com/
diff --git a/config/arch/powerpc.in b/config/arch/powerpc.in
index 836df10e..513ce383 100644
--- a/config/arch/powerpc.in
+++ b/config/arch/powerpc.in
@@ -1,13 +1,12 @@
 # powerpc specific configuration file
 
-config ARCH_powerpc
-    select ARCH_SUPPORTS_32
-    select ARCH_SUPPORTS_64 if EXPERIMENTAL
-    select ARCH_DEFAULT_32
-    select ARCH_USE_MMU
-    select ARCH_SUPPORT_ABI
-    select ARCH_SUPPORT_CPU
-    select ARCH_SUPPORT_TUNE
-    help
-      The PowerPC architecture, as defined by:
-        http://www.ibm.com/developerworks/eserver/articles/archguide.html
+## select ARCH_SUPPORTS_32
+## select ARCH_SUPPORTS_64 if EXPERIMENTAL
+## select ARCH_DEFAULT_32
+## select ARCH_USE_MMU
+## select ARCH_SUPPORT_ABI
+## select ARCH_SUPPORT_CPU
+## select ARCH_SUPPORT_TUNE
+##
+## help The PowerPC architecture, as defined by:
+## help     http://www.ibm.com/developerworks/eserver/articles/archguide.html
diff --git a/config/arch/s390.in b/config/arch/s390.in
index 519be80b..bdcdf2f5 100644
--- a/config/arch/s390.in
+++ b/config/arch/s390.in
@@ -1,13 +1,13 @@
 # s390 specific config options
-# depends on EXPERIMENTAL
 
-config ARCH_s390
-    select ARCH_SUPPORTS_32
-    select ARCH_SUPPORTS_64
-    select ARCH_DEFAULT_32
-    select ARCH_USE_MMU
-    select ARCH_SUPPORT_FPU
-    help
-      Defined by IBM in:
-        32-bit ESA/390       : http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9ar008/CCONTENTS
-        64-bit z/Architecure : http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9zr002/CCONTENTS
+## depends on EXPERIMENTAL
+##
+## select ARCH_SUPPORTS_32
+## select ARCH_SUPPORTS_64
+## select ARCH_DEFAULT_32
+## select ARCH_USE_MMU
+## select ARCH_SUPPORT_FPU
+##
+## help Defined by IBM in:
+## help     32-bit ESA/390       : http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9ar008/CCONTENTS
+## help     64-bit z/Architecure : http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9zr002/CCONTENTS
diff --git a/config/arch/sh.in b/config/arch/sh.in
index d9264499..68d31200 100644
--- a/config/arch/sh.in
+++ b/config/arch/sh.in
@@ -1,11 +1,10 @@
 # Super-H specific configuration file
 
-config ARCH_sh
-    select ARCH_SUPPORTS_32
-    select ARCH_DEFAULT_32
-    select ARCH_USE_MMU
-    select ARCH_SUPPORTS_BOTH_ENDIAN
-    select ARCH_DEFAULT_LE
-    help
-      The Super-H architecture, as defined by:
-        http://www.renesas.com/fmwk.jsp?cnt=superh_family_landing.jsp&fp=/products/mpumcu/superh_family/
+## select ARCH_SUPPORTS_32
+## select ARCH_DEFAULT_32
+## select ARCH_USE_MMU
+## select ARCH_SUPPORTS_BOTH_ENDIAN
+## select ARCH_DEFAULT_LE
+##
+## help The Super-H architecture, as defined by:
+## help     http://www.renesas.com/fmwk.jsp?cnt=superh_family_landing.jsp&fp=/products/mpumcu/superh_family/
diff --git a/config/arch/sparc.in b/config/arch/sparc.in
index a7d3205b..c9bf4f42 100644
--- a/config/arch/sparc.in
+++ b/config/arch/sparc.in
@@ -1,13 +1,12 @@
 # SPARC specific config options
 
-config ARCH_sparc
-    select ARCH_SUPPORTS_32
-    select ARCH_SUPPORTS_64
-    select ARCH_DEFAULT_32
-    select ARCH_USE_MMU
-    select ARCH_SUPPORT_CPU
-    select ARCH_SUPPORT_TUNE
-    help
-      The SUN SPARC architecture, as defined by:
-        32 bit: http://www.sparc.org/standards/V8.pdf
-        64 bit: http://www.sparc.org/standards/SPARCV9.pdf
+## select ARCH_SUPPORTS_32
+## select ARCH_SUPPORTS_64
+## select ARCH_DEFAULT_32
+## select ARCH_USE_MMU
+## select ARCH_SUPPORT_CPU
+## select ARCH_SUPPORT_TUNE
+##
+## help The SUN SPARC architecture, as defined by:
+## help     32 bit: http://www.sparc.org/standards/V8.pdf
+## help     64 bit: http://www.sparc.org/standards/SPARCV9.pdf
diff --git a/config/arch/x86.in b/config/arch/x86.in
index 7657aaf9..c8da2fea 100644
--- a/config/arch/x86.in
+++ b/config/arch/x86.in
@@ -1,14 +1,13 @@
 # x86 specific options
 
-config ARCH_x86
-    select ARCH_SUPPORTS_32
-    select ARCH_SUPPORTS_64
-    select ARCH_DEFAULT_32
-    select ARCH_USE_MMU
-    select ARCH_SUPPORT_ARCH
-    select ARCH_SUPPORT_CPU
-    select ARCH_SUPPORT_TUNE
-    help
-      The x86 architecture, as defined by:
-        32-bit (ia32) : http://www.intel.com/
-        64-bit (amd64): http://www.amd.com/us-en/Processors/DevelopWithAMD/0,,30_2252_875_7044,00.html
+## select ARCH_SUPPORTS_32
+## select ARCH_SUPPORTS_64
+## select ARCH_DEFAULT_32
+## select ARCH_USE_MMU
+## select ARCH_SUPPORT_ARCH
+## select ARCH_SUPPORT_CPU
+## select ARCH_SUPPORT_TUNE
+##
+## help The x86 architecture, as defined by:
+## help     32-bit (ia32) : http://www.intel.com/
+## help     64-bit (amd64): http://www.amd.com/us-en/Processors/DevelopWithAMD/0,,30_2252_875_7044,00.html