Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
	boards.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>

board/boundary/nitrogen6x/Kconfig

@@ -0,0 +1,23 @@
+if TARGET_NITROGEN6X
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "nitrogen6x"
+
+config SYS_VENDOR
+	string
+	default "boundary"
+
+config SYS_SOC
+	string
+	default "mx6"
+
+config SYS_CONFIG_NAME
+	string
+	default "nitrogen6x"
+
+endif

board/boundary/nitrogen6x/MAINTAINERS

@@ -0,0 +1,12 @@
+NITROGEN6X BOARD
+M:	Eric Nelson <eric.nelson@boundarydevices.com>
+S:	Maintained
+F:	board/boundary/nitrogen6x/
+F:	include/configs/nitrogen6x.h
+F:	configs/mx6qsabrelite_defconfig
+F:	configs/nitrogen6dl_defconfig
+F:	configs/nitrogen6dl2g_defconfig
+F:	configs/nitrogen6q_defconfig
+F:	configs/nitrogen6q2g_defconfig
+F:	configs/nitrogen6s_defconfig
+F:	configs/nitrogen6s1g_defconfig