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

Conflicts:
	boards.cfg

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

22 files changed, 309 insertions, 0 deletions

diff --git a/board/Marvell/aspenite/Kconfig b/board/Marvell/aspenite/Kconfig
new file mode 100644
index 0000000..7edcd81
--- /dev/null
+++ b/board/Marvell/aspenite/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_ASPENITE
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "aspenite"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_SOC
+	string
+	default "armada100"
+
+config SYS_CONFIG_NAME
+	string
+	default "aspenite"
+
+endif
diff --git a/board/Marvell/aspenite/MAINTAINERS b/board/Marvell/aspenite/MAINTAINERS
new file mode 100644
index 0000000..a77d30e
--- /dev/null
+++ b/board/Marvell/aspenite/MAINTAINERS
@@ -0,0 +1,6 @@
+ASPENITE BOARD
+M:	Prafulla Wadaskar <prafulla@marvell.com>
+S:	Maintained
+F:	board/Marvell/aspenite/
+F:	include/configs/aspenite.h
+F:	configs/aspenite_defconfig
diff --git a/board/Marvell/db64360/Kconfig b/board/Marvell/db64360/Kconfig
new file mode 100644
index 0000000..c08fd05
--- /dev/null
+++ b/board/Marvell/db64360/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_DB64360
+
+config SYS_BOARD
+	string
+	default "db64360"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_CONFIG_NAME
+	string
+	default "DB64360"
+
+endif
diff --git a/board/Marvell/db64360/MAINTAINERS b/board/Marvell/db64360/MAINTAINERS
new file mode 100644
index 0000000..7383207
--- /dev/null
+++ b/board/Marvell/db64360/MAINTAINERS
@@ -0,0 +1,6 @@
+DB64360 BOARD
+M:	-
+S:	Maintained
+F:	board/Marvell/db64360/
+F:	include/configs/DB64360.h
+F:	configs/DB64360_defconfig
diff --git a/board/Marvell/db64460/Kconfig b/board/Marvell/db64460/Kconfig
new file mode 100644
index 0000000..3cd2eb4
--- /dev/null
+++ b/board/Marvell/db64460/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_DB64460
+
+config SYS_BOARD
+	string
+	default "db64460"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_CONFIG_NAME
+	string
+	default "DB64460"
+
+endif
diff --git a/board/Marvell/db64460/MAINTAINERS b/board/Marvell/db64460/MAINTAINERS
new file mode 100644
index 0000000..751aac2
--- /dev/null
+++ b/board/Marvell/db64460/MAINTAINERS
@@ -0,0 +1,6 @@
+DB64460 BOARD
+M:	-
+S:	Maintained
+F:	board/Marvell/db64460/
+F:	include/configs/DB64460.h
+F:	configs/DB64460_defconfig
diff --git a/board/Marvell/dkb/Kconfig b/board/Marvell/dkb/Kconfig
new file mode 100644
index 0000000..7ce761b
--- /dev/null
+++ b/board/Marvell/dkb/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_DKB
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "dkb"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_SOC
+	string
+	default "pantheon"
+
+config SYS_CONFIG_NAME
+	string
+	default "dkb"
+
+endif
diff --git a/board/Marvell/dkb/MAINTAINERS b/board/Marvell/dkb/MAINTAINERS
new file mode 100644
index 0000000..c272b7a
--- /dev/null
+++ b/board/Marvell/dkb/MAINTAINERS
@@ -0,0 +1,6 @@
+DKB BOARD
+M:	Lei Wen <leiwen@marvell.com>
+S:	Maintained
+F:	board/Marvell/dkb/
+F:	include/configs/dkb.h
+F:	configs/dkb_defconfig
diff --git a/board/Marvell/dreamplug/Kconfig b/board/Marvell/dreamplug/Kconfig
new file mode 100644
index 0000000..e067318
--- /dev/null
+++ b/board/Marvell/dreamplug/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_DREAMPLUG
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "dreamplug"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_SOC
+	string
+	default "kirkwood"
+
+config SYS_CONFIG_NAME
+	string
+	default "dreamplug"
+
+endif
diff --git a/board/Marvell/dreamplug/MAINTAINERS b/board/Marvell/dreamplug/MAINTAINERS
new file mode 100644
index 0000000..2561ba8
--- /dev/null
+++ b/board/Marvell/dreamplug/MAINTAINERS
@@ -0,0 +1,6 @@
+DREAMPLUG BOARD
+M:	Jason Cooper <u-boot@lakedaemon.net>
+S:	Maintained
+F:	board/Marvell/dreamplug/
+F:	include/configs/dreamplug.h
+F:	configs/dreamplug_defconfig
diff --git a/board/Marvell/gplugd/Kconfig b/board/Marvell/gplugd/Kconfig
new file mode 100644
index 0000000..94cdd48
--- /dev/null
+++ b/board/Marvell/gplugd/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_GPLUGD
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "gplugd"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_SOC
+	string
+	default "armada100"
+
+config SYS_CONFIG_NAME
+	string
+	default "gplugd"
+
+endif
diff --git a/board/Marvell/gplugd/MAINTAINERS b/board/Marvell/gplugd/MAINTAINERS
new file mode 100644
index 0000000..320bc09
--- /dev/null
+++ b/board/Marvell/gplugd/MAINTAINERS
@@ -0,0 +1,6 @@
+GPLUGD BOARD
+M:	Ajay Bhargav <ajay.bhargav@einfochips.com>
+S:	Maintained
+F:	board/Marvell/gplugd/
+F:	include/configs/gplugd.h
+F:	configs/gplugd_defconfig
diff --git a/board/Marvell/guruplug/Kconfig b/board/Marvell/guruplug/Kconfig
new file mode 100644
index 0000000..fce8562
--- /dev/null
+++ b/board/Marvell/guruplug/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_GURUPLUG
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "guruplug"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_SOC
+	string
+	default "kirkwood"
+
+config SYS_CONFIG_NAME
+	string
+	default "guruplug"
+
+endif
diff --git a/board/Marvell/guruplug/MAINTAINERS b/board/Marvell/guruplug/MAINTAINERS
new file mode 100644
index 0000000..b5d0734
--- /dev/null
+++ b/board/Marvell/guruplug/MAINTAINERS
@@ -0,0 +1,6 @@
+GURUPLUG BOARD
+M:	Siddarth Gore <gores@marvell.com>
+S:	Maintained
+F:	board/Marvell/guruplug/
+F:	include/configs/guruplug.h
+F:	configs/guruplug_defconfig
diff --git a/board/Marvell/mv88f6281gtw_ge/Kconfig b/board/Marvell/mv88f6281gtw_ge/Kconfig
new file mode 100644
index 0000000..17adab0
--- /dev/null
+++ b/board/Marvell/mv88f6281gtw_ge/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_MV88F6281GTW_GE
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "mv88f6281gtw_ge"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_SOC
+	string
+	default "kirkwood"
+
+config SYS_CONFIG_NAME
+	string
+	default "mv88f6281gtw_ge"
+
+endif
diff --git a/board/Marvell/mv88f6281gtw_ge/MAINTAINERS b/board/Marvell/mv88f6281gtw_ge/MAINTAINERS
new file mode 100644
index 0000000..9c26ca7
--- /dev/null
+++ b/board/Marvell/mv88f6281gtw_ge/MAINTAINERS
@@ -0,0 +1,6 @@
+MV88F6281GTW_GE BOARD
+M:	Prafulla Wadaskar <prafulla@marvell.com>
+S:	Maintained
+F:	board/Marvell/mv88f6281gtw_ge/
+F:	include/configs/mv88f6281gtw_ge.h
+F:	configs/mv88f6281gtw_ge_defconfig
diff --git a/board/Marvell/openrd/Kconfig b/board/Marvell/openrd/Kconfig
new file mode 100644
index 0000000..2dfed34
--- /dev/null
+++ b/board/Marvell/openrd/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_OPENRD
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "openrd"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_SOC
+	string
+	default "kirkwood"
+
+config SYS_CONFIG_NAME
+	string
+	default "openrd"
+
+endif
diff --git a/board/Marvell/openrd/MAINTAINERS b/board/Marvell/openrd/MAINTAINERS
new file mode 100644
index 0000000..7a52a8e
--- /dev/null
+++ b/board/Marvell/openrd/MAINTAINERS
@@ -0,0 +1,12 @@
+OPENRD BOARD
+M:	Prafulla Wadaskar <prafulla@marvell.com>
+S:	Maintained
+F:	board/Marvell/openrd/
+F:	include/configs/openrd.h
+F:	configs/openrd_base_defconfig
+
+OPENRD_CLIENT BOARD
+M:	-
+S:	Maintained
+F:	configs/openrd_client_defconfig
+F:	configs/openrd_ultimate_defconfig
diff --git a/board/Marvell/rd6281a/Kconfig b/board/Marvell/rd6281a/Kconfig
new file mode 100644
index 0000000..ae753b0
--- /dev/null
+++ b/board/Marvell/rd6281a/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_RD6281A
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "rd6281a"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_SOC
+	string
+	default "kirkwood"
+
+config SYS_CONFIG_NAME
+	string
+	default "rd6281a"
+
+endif
diff --git a/board/Marvell/rd6281a/MAINTAINERS b/board/Marvell/rd6281a/MAINTAINERS
new file mode 100644
index 0000000..d4ad592
--- /dev/null
+++ b/board/Marvell/rd6281a/MAINTAINERS
@@ -0,0 +1,6 @@
+RD6281A BOARD
+M:	Prafulla Wadaskar <prafulla@marvell.com>
+S:	Maintained
+F:	board/Marvell/rd6281a/
+F:	include/configs/rd6281a.h
+F:	configs/rd6281a_defconfig
diff --git a/board/Marvell/sheevaplug/Kconfig b/board/Marvell/sheevaplug/Kconfig
new file mode 100644
index 0000000..6f3eb38
--- /dev/null
+++ b/board/Marvell/sheevaplug/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_SHEEVAPLUG
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "sheevaplug"
+
+config SYS_VENDOR
+	string
+	default "Marvell"
+
+config SYS_SOC
+	string
+	default "kirkwood"
+
+config SYS_CONFIG_NAME
+	string
+	default "sheevaplug"
+
+endif
diff --git a/board/Marvell/sheevaplug/MAINTAINERS b/board/Marvell/sheevaplug/MAINTAINERS
new file mode 100644
index 0000000..2b0103d
--- /dev/null
+++ b/board/Marvell/sheevaplug/MAINTAINERS
@@ -0,0 +1,6 @@
+SHEEVAPLUG BOARD
+M:	Prafulla Wadaskar <prafulla@marvell.com>
+S:	Maintained
+F:	board/Marvell/sheevaplug/
+F:	include/configs/sheevaplug.h
+F:	configs/sheevaplug_defconfig