Merge branch 'karo-tx-uboot' into kc-merge

[karo-tx-uboot.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 8620a4f94b0a8f57564f4869a7e350c4d4335e2e..f63cc5a7e9440416c351e612eb5c8615693aa037 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -7,6 +7,8 @@ config ARC
 
 config ARM
        bool "ARM architecture"
+       select HAVE_PRIVATE_LIBGCC
+       select SUPPORT_OF_CONTROL
 
 config AVR32
        bool "AVR32 architecture"
@@ -19,9 +21,11 @@ config M68K
 
 config MICROBLAZE
        bool "MicroBlaze architecture"
+       select SUPPORT_OF_CONTROL
 
 config MIPS
        bool "MIPS architecture"
+       select HAVE_PRIVATE_LIBGCC
 
 config NDS32
        bool "NDS32 architecture"
@@ -34,21 +38,82 @@ config OPENRISC
 
 config PPC
        bool "PowerPC architecture"
+       select HAVE_PRIVATE_LIBGCC
 
 config SANDBOX
        bool "Sandbox"
+       select SUPPORT_OF_CONTROL
 
 config SH
        bool "SuperH architecture"
+       select HAVE_PRIVATE_LIBGCC
 
 config SPARC
        bool "SPARC architecture"
 
 config X86
        bool "x86 architecture"
+       select HAVE_PRIVATE_LIBGCC
+       select SUPPORT_OF_CONTROL
 
 endchoice
 
+config SYS_ARCH
+       string
+       help
+         This option should contain the architecture name to build the
+         appropriate arch/<CONFIG_SYS_ARCH> directory.
+         All the architectures should specify this option correctly.
+
+config SYS_CPU
+       string
+       help
+         This option should contain the CPU name to build the correct
+         arch/<CONFIG_SYS_ARCH>/cpu/<CONFIG_SYS_CPU> directory.
+
+         This is optional.  For those targets without the CPU directory,
+         leave this option empty.
+
+config SYS_SOC
+       string
+       help
+         This option should contain the SoC name to build the directory
+         arch/<CONFIG_SYS_ARCH>/cpu/<CONFIG_SYS_CPU>/<CONFIG_SYS_SOC>.
+
+         This is optional.  For those targets without the SoC directory,
+         leave this option empty.
+
+config SYS_VENDOR
+       string
+       help
+         This option should contain the vendor name of the target board.
+         If it is set and
+         board/<CONFIG_SYS_VENDOR>/common/Makefile exists, the vendor common
+         directory is compiled.
+         If CONFIG_SYS_BOARD is also set, the sources under
+         board/<CONFIG_SYS_VENDOR>/<CONFIG_SYS_BOARD> directory are compiled.
+
+         This is optional.  For those targets without the vendor directory,
+         leave this option empty.
+
+config SYS_BOARD
+       string
+       help
+         This option should contain the name of the target board.
+         If it is set, either board/<CONFIG_SYS_VENDOR>/<CONFIG_SYS_BOARD>
+         or board/<CONFIG_SYS_BOARD> directory is compiled depending on
+         whether CONFIG_SYS_VENDOR is set or not.
+
+         This is optional.  For those targets without the board directory,
+         leave this option empty.
+
+config SYS_CONFIG_NAME
+       string
+       help
+         This option should contain the base name of board header file.
+         The header file include/configs/<CONFIG_SYS_CONFIG_NAME>.h
+         should be included from include/config.h.
+
 source "arch/arc/Kconfig"
 source "arch/arm/Kconfig"
 source "arch/avr32/Kconfig"