Merge remote-tracking branch 'u-boot-imx/master'

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 43ba33a2af5e08ca51d4c07153deda961a085196..7365fca52635dbb9165dc3b6c982df50816aaafb 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -414,6 +414,9 @@ config TARGET_HUMMINGBOARD
 config TARGET_TQMA6
        bool "TQ Systems TQMa6 board"
 
 config TARGET_TQMA6
        bool "TQ Systems TQMa6 board"
 

+config TARGET_OT1200
+       bool "Bachmann OT1200"
+

 config OMAP34XX
        bool "OMAP34XX SoC"
 
 config OMAP34XX
        bool "OMAP34XX SoC"
 


@@ -583,6 +586,7 @@ source "board/atmel/at91sam9rlek/Kconfig"
 source "board/atmel/at91sam9x5ek/Kconfig"
 source "board/atmel/sama5d3_xplained/Kconfig"
 source "board/atmel/sama5d3xek/Kconfig"
 source "board/atmel/at91sam9x5ek/Kconfig"
 source "board/atmel/sama5d3_xplained/Kconfig"
 source "board/atmel/sama5d3xek/Kconfig"

+source "board/bachmann/ot1200/Kconfig"

 source "board/balloon3/Kconfig"
 source "board/barco/titanium/Kconfig"
 source "board/bluegiga/apx4devkit/Kconfig"
 source "board/balloon3/Kconfig"
 source "board/barco/titanium/Kconfig"
 source "board/bluegiga/apx4devkit/Kconfig"