Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6c5ecd2b2cb4d66a3ad5c27dd80323a5c8801018..72558b85620a638c2945a58ccb3ebbc1faea06b6 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -417,6 +417,9 @@ config TARGET_HUMMINGBOARD
 config TARGET_TQMA6
        bool "TQ Systems TQMa6 board"
 
+config TARGET_OT1200
+       bool "Bachmann OT1200"
+
 config OMAP34XX
        bool "OMAP34XX SoC"
 
@@ -582,6 +585,7 @@ source "board/atmel/at91sam9rlek/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"