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

Conflicts:
	boards.cfg

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

10 files changed, 113 insertions, 0 deletions

diff --git a/board/matrix_vision/mergerbox/Kconfig b/board/matrix_vision/mergerbox/Kconfig
new file mode 100644
index 0000000..5b292dc
--- /dev/null
+++ b/board/matrix_vision/mergerbox/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_MERGERBOX
+
+config SYS_BOARD
+	string
+	default "mergerbox"
+
+config SYS_VENDOR
+	string
+	default "matrix_vision"
+
+config SYS_CONFIG_NAME
+	string
+	default "MERGERBOX"
+
+endif
diff --git a/board/matrix_vision/mergerbox/MAINTAINERS b/board/matrix_vision/mergerbox/MAINTAINERS
new file mode 100644
index 0000000..22be981
--- /dev/null
+++ b/board/matrix_vision/mergerbox/MAINTAINERS
@@ -0,0 +1,6 @@
+MERGERBOX BOARD
+M:	Andre Schwarz <andre.schwarz@matrix-vision.de>
+S:	Orphan (since 2014-03)
+F:	board/matrix_vision/mergerbox/
+F:	include/configs/MERGERBOX.h
+F:	configs/MERGERBOX_defconfig
diff --git a/board/matrix_vision/mvbc_p/Kconfig b/board/matrix_vision/mvbc_p/Kconfig
new file mode 100644
index 0000000..ab1fe65
--- /dev/null
+++ b/board/matrix_vision/mvbc_p/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_MVBC_P
+
+config SYS_BOARD
+	string
+	default "mvbc_p"
+
+config SYS_VENDOR
+	string
+	default "matrix_vision"
+
+config SYS_CONFIG_NAME
+	string
+	default "MVBC_P"
+
+endif
diff --git a/board/matrix_vision/mvbc_p/MAINTAINERS b/board/matrix_vision/mvbc_p/MAINTAINERS
new file mode 100644
index 0000000..9e76b57
--- /dev/null
+++ b/board/matrix_vision/mvbc_p/MAINTAINERS
@@ -0,0 +1,6 @@
+MVBC_P BOARD
+M:	Andre Schwarz <andre.schwarz@matrix-vision.de>
+S:	Orphan (since 2014-03)
+F:	board/matrix_vision/mvbc_p/
+F:	include/configs/MVBC_P.h
+F:	configs/MVBC_P_defconfig
diff --git a/board/matrix_vision/mvblm7/Kconfig b/board/matrix_vision/mvblm7/Kconfig
new file mode 100644
index 0000000..c5998b3
--- /dev/null
+++ b/board/matrix_vision/mvblm7/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_MVBLM7
+
+config SYS_BOARD
+	string
+	default "mvblm7"
+
+config SYS_VENDOR
+	string
+	default "matrix_vision"
+
+config SYS_CONFIG_NAME
+	string
+	default "MVBLM7"
+
+endif
diff --git a/board/matrix_vision/mvblm7/MAINTAINERS b/board/matrix_vision/mvblm7/MAINTAINERS
new file mode 100644
index 0000000..4f7ca50
--- /dev/null
+++ b/board/matrix_vision/mvblm7/MAINTAINERS
@@ -0,0 +1,6 @@
+MVBLM7 BOARD
+M:	Andre Schwarz <andre.schwarz@matrix-vision.de>
+S:	Orphan (since 2014-03)
+F:	board/matrix_vision/mvblm7/
+F:	include/configs/MVBLM7.h
+F:	configs/MVBLM7_defconfig
diff --git a/board/matrix_vision/mvblx/Kconfig b/board/matrix_vision/mvblx/Kconfig
new file mode 100644
index 0000000..d89c1e3
--- /dev/null
+++ b/board/matrix_vision/mvblx/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_OMAP3_MVBLX
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "mvblx"
+
+config SYS_VENDOR
+	string
+	default "matrix_vision"
+
+config SYS_SOC
+	string
+	default "omap3"
+
+config SYS_CONFIG_NAME
+	string
+	default "omap3_mvblx"
+
+endif
diff --git a/board/matrix_vision/mvblx/MAINTAINERS b/board/matrix_vision/mvblx/MAINTAINERS
new file mode 100644
index 0000000..2f9a153
--- /dev/null
+++ b/board/matrix_vision/mvblx/MAINTAINERS
@@ -0,0 +1,6 @@
+MVBLX BOARD
+M:	Michael Jones <michael.jones@matrix-vision.de>
+S:	Maintained
+F:	board/matrix_vision/mvblx/
+F:	include/configs/omap3_mvblx.h
+F:	configs/omap3_mvblx_defconfig
diff --git a/board/matrix_vision/mvsmr/Kconfig b/board/matrix_vision/mvsmr/Kconfig
new file mode 100644
index 0000000..1627a36
--- /dev/null
+++ b/board/matrix_vision/mvsmr/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_MVSMR
+
+config SYS_BOARD
+	string
+	default "mvsmr"
+
+config SYS_VENDOR
+	string
+	default "matrix_vision"
+
+config SYS_CONFIG_NAME
+	string
+	default "MVSMR"
+
+endif
diff --git a/board/matrix_vision/mvsmr/MAINTAINERS b/board/matrix_vision/mvsmr/MAINTAINERS
new file mode 100644
index 0000000..9659730
--- /dev/null
+++ b/board/matrix_vision/mvsmr/MAINTAINERS
@@ -0,0 +1,6 @@
+MVSMR BOARD
+M:	Andre Schwarz <andre.schwarz@matrix-vision.de>
+S:	Orphan (since 2014-03)
+F:	board/matrix_vision/mvsmr/
+F:	include/configs/MVSMR.h
+F:	configs/MVSMR_defconfig