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

Conflicts:
	boards.cfg

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

12 files changed, 184 insertions, 0 deletions

diff --git a/board/gdsys/405ep/Kconfig b/board/gdsys/405ep/Kconfig
new file mode 100644
index 0000000..8a5d3f5
--- /dev/null
+++ b/board/gdsys/405ep/Kconfig
@@ -0,0 +1,63 @@
+if TARGET_DLVISION_10G
+
+config SYS_BOARD
+	string
+	default "405ep"
+
+config SYS_VENDOR
+	string
+	default "gdsys"
+
+config SYS_CONFIG_NAME
+	string
+	default "dlvision-10g"
+
+endif
+
+if TARGET_IO
+
+config SYS_BOARD
+	string
+	default "405ep"
+
+config SYS_VENDOR
+	string
+	default "gdsys"
+
+config SYS_CONFIG_NAME
+	string
+	default "io"
+
+endif
+
+if TARGET_IOCON
+
+config SYS_BOARD
+	string
+	default "405ep"
+
+config SYS_VENDOR
+	string
+	default "gdsys"
+
+config SYS_CONFIG_NAME
+	string
+	default "iocon"
+
+endif
+
+if TARGET_NEO
+
+config SYS_BOARD
+	string
+	default "405ep"
+
+config SYS_VENDOR
+	string
+	default "gdsys"
+
+config SYS_CONFIG_NAME
+	string
+	default "neo"
+
+endif
diff --git a/board/gdsys/405ep/MAINTAINERS b/board/gdsys/405ep/MAINTAINERS
new file mode 100644
index 0000000..1403880
--- /dev/null
+++ b/board/gdsys/405ep/MAINTAINERS
@@ -0,0 +1,12 @@
+405EP BOARD
+M:	Dirk Eibach <eibach@gdsys.de>
+S:	Maintained
+F:	board/gdsys/405ep/
+F:	include/configs/dlvision-10g.h
+F:	configs/dlvision-10g_defconfig
+F:	include/configs/io.h
+F:	configs/io_defconfig
+F:	include/configs/iocon.h
+F:	configs/iocon_defconfig
+F:	include/configs/neo.h
+F:	configs/neo_defconfig
diff --git a/board/gdsys/405ex/Kconfig b/board/gdsys/405ex/Kconfig
new file mode 100644
index 0000000..b4fb975
--- /dev/null
+++ b/board/gdsys/405ex/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_IO64
+
+config SYS_BOARD
+	string
+	default "405ex"
+
+config SYS_VENDOR
+	string
+	default "gdsys"
+
+config SYS_CONFIG_NAME
+	string
+	default "io64"
+
+endif
diff --git a/board/gdsys/405ex/MAINTAINERS b/board/gdsys/405ex/MAINTAINERS
new file mode 100644
index 0000000..395b1ac
--- /dev/null
+++ b/board/gdsys/405ex/MAINTAINERS
@@ -0,0 +1,6 @@
+405EX BOARD
+M:	Dirk Eibach <eibach@gdsys.de>
+S:	Maintained
+F:	board/gdsys/405ex/
+F:	include/configs/io64.h
+F:	configs/io64_defconfig
diff --git a/board/gdsys/dlvision/Kconfig b/board/gdsys/dlvision/Kconfig
new file mode 100644
index 0000000..af8334e
--- /dev/null
+++ b/board/gdsys/dlvision/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_DLVISION
+
+config SYS_BOARD
+	string
+	default "dlvision"
+
+config SYS_VENDOR
+	string
+	default "gdsys"
+
+config SYS_CONFIG_NAME
+	string
+	default "dlvision"
+
+endif
diff --git a/board/gdsys/dlvision/MAINTAINERS b/board/gdsys/dlvision/MAINTAINERS
new file mode 100644
index 0000000..e4d40f8
--- /dev/null
+++ b/board/gdsys/dlvision/MAINTAINERS
@@ -0,0 +1,6 @@
+DLVISION BOARD
+M:	Dirk Eibach <eibach@gdsys.de>
+S:	Maintained
+F:	board/gdsys/dlvision/
+F:	include/configs/dlvision.h
+F:	configs/dlvision_defconfig
diff --git a/board/gdsys/gdppc440etx/Kconfig b/board/gdsys/gdppc440etx/Kconfig
new file mode 100644
index 0000000..5a05c1c
--- /dev/null
+++ b/board/gdsys/gdppc440etx/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_GDPPC440ETX
+
+config SYS_BOARD
+	string
+	default "gdppc440etx"
+
+config SYS_VENDOR
+	string
+	default "gdsys"
+
+config SYS_CONFIG_NAME
+	string
+	default "gdppc440etx"
+
+endif
diff --git a/board/gdsys/gdppc440etx/MAINTAINERS b/board/gdsys/gdppc440etx/MAINTAINERS
new file mode 100644
index 0000000..cd8d1c6
--- /dev/null
+++ b/board/gdsys/gdppc440etx/MAINTAINERS
@@ -0,0 +1,6 @@
+GDPPC440ETX BOARD
+M:	Dirk Eibach <eibach@gdsys.de>
+S:	Maintained
+F:	board/gdsys/gdppc440etx/
+F:	include/configs/gdppc440etx.h
+F:	configs/gdppc440etx_defconfig
diff --git a/board/gdsys/intip/Kconfig b/board/gdsys/intip/Kconfig
new file mode 100644
index 0000000..7be439c
--- /dev/null
+++ b/board/gdsys/intip/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_INTIP
+
+config SYS_BOARD
+	string
+	default "intip"
+
+config SYS_VENDOR
+	string
+	default "gdsys"
+
+config SYS_CONFIG_NAME
+	string
+	default "intip"
+
+endif
diff --git a/board/gdsys/intip/MAINTAINERS b/board/gdsys/intip/MAINTAINERS
new file mode 100644
index 0000000..c99d507
--- /dev/null
+++ b/board/gdsys/intip/MAINTAINERS
@@ -0,0 +1,7 @@
+INTIP BOARD
+M:	Dirk Eibach <eibach@gdsys.de>
+S:	Maintained
+F:	board/gdsys/intip/
+F:	include/configs/intip.h
+F:	configs/devconcenter_defconfig
+F:	configs/intip_defconfig
diff --git a/board/gdsys/p1022/Kconfig b/board/gdsys/p1022/Kconfig
new file mode 100644
index 0000000..277ed7d
--- /dev/null
+++ b/board/gdsys/p1022/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_CONTROLCENTERD
+
+config SYS_BOARD
+	string
+	default "p1022"
+
+config SYS_VENDOR
+	string
+	default "gdsys"
+
+config SYS_CONFIG_NAME
+	string
+	default "controlcenterd"
+
+endif
diff --git a/board/gdsys/p1022/MAINTAINERS b/board/gdsys/p1022/MAINTAINERS
new file mode 100644
index 0000000..5119fbb
--- /dev/null
+++ b/board/gdsys/p1022/MAINTAINERS
@@ -0,0 +1,9 @@
+P1022 BOARD
+M:	Dirk Eibach <eibach@gdsys.de>
+S:	Maintained
+F:	board/gdsys/p1022/
+F:	include/configs/controlcenterd.h
+F:	configs/controlcenterd_36BIT_SDCARD_defconfig
+F:	configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+F:	configs/controlcenterd_TRAILBLAZER_defconfig
+F:	configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig