diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-08 19:20:49 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-08 19:20:49 (GMT) |
commit | 4b19b7448e63bab8af17abbb30acff00d8f0dc99 (patch) | |
tree | 6ba89c10ebffb00cee92656da9a5aad8396390c0 /arch/arm/Kconfig | |
parent | c19a8bc5711ec63e905ef91f045a1489f0aa3cb0 (diff) | |
parent | 5e3a388cddce1685ccd9bc1b58ddb89a191ed88f (diff) | |
download | u-boot-4b19b7448e63bab8af17abbb30acff00d8f0dc99.tar.xz |
Merge remote-tracking branch 'u-boot-imx/master'
The single file conflict below is actually trivial.
Conflicts:
board/boundary/nitrogen6x/nitrogen6x.c
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 43ba33a..7365fca 100644 --- 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_OT1200 + bool "Bachmann OT1200" + 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/bachmann/ot1200/Kconfig" source "board/balloon3/Kconfig" source "board/barco/titanium/Kconfig" source "board/bluegiga/apx4devkit/Kconfig" |