diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-08 21:20:49 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-08 21:20:49 +0200 |
| commit | 4b19b7448e63bab8af17abbb30acff00d8f0dc99 (patch) | |
| tree | 6ba89c10ebffb00cee92656da9a5aad8396390c0 /board/bachmann/ot1200/Kconfig | |
| parent | c19a8bc5711ec63e905ef91f045a1489f0aa3cb0 (diff) | |
| parent | 5e3a388cddce1685ccd9bc1b58ddb89a191ed88f (diff) | |
| download | u-boot-imx-4b19b7448e63bab8af17abbb30acff00d8f0dc99.zip u-boot-imx-4b19b7448e63bab8af17abbb30acff00d8f0dc99.tar.gz u-boot-imx-4b19b7448e63bab8af17abbb30acff00d8f0dc99.tar.bz2 | |
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 'board/bachmann/ot1200/Kconfig')
| -rw-r--r-- | board/bachmann/ot1200/Kconfig | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/board/bachmann/ot1200/Kconfig b/board/bachmann/ot1200/Kconfig new file mode 100644 index 0000000..55a825d --- /dev/null +++ b/board/bachmann/ot1200/Kconfig @@ -0,0 +1,23 @@ +if TARGET_OT1200 + +config SYS_CPU + string + default "armv7" + +config SYS_BOARD + string + default "ot1200" + +config SYS_VENDOR + string + default "bachmann" + +config SYS_SOC + string + default "mx6" + +config SYS_CONFIG_NAME + string + default "ot1200" + +endif |