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, 172 insertions, 0 deletions

diff --git a/board/siemens/corvus/Kconfig b/board/siemens/corvus/Kconfig
new file mode 100644
index 0000000..e24364c
--- /dev/null
+++ b/board/siemens/corvus/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_CORVUS
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "corvus"
+
+config SYS_VENDOR
+	string
+	default "siemens"
+
+config SYS_SOC
+	string
+	default "at91"
+
+config SYS_CONFIG_NAME
+	string
+	default "corvus"
+
+endif
diff --git a/board/siemens/corvus/MAINTAINERS b/board/siemens/corvus/MAINTAINERS
new file mode 100644
index 0000000..59176aa
--- /dev/null
+++ b/board/siemens/corvus/MAINTAINERS
@@ -0,0 +1,6 @@
+CORVUS BOARD
+M:	Heiko Schocher <hs@denx.de>
+S:	Maintained
+F:	board/siemens/corvus/
+F:	include/configs/corvus.h
+F:	configs/corvus_defconfig
diff --git a/board/siemens/draco/Kconfig b/board/siemens/draco/Kconfig
new file mode 100644
index 0000000..c6dac1c
--- /dev/null
+++ b/board/siemens/draco/Kconfig
@@ -0,0 +1,47 @@
+if TARGET_DRACO
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "draco"
+
+config SYS_VENDOR
+	string
+	default "siemens"
+
+config SYS_SOC
+	string
+	default "am33xx"
+
+config SYS_CONFIG_NAME
+	string
+	default "draco"
+
+endif
+
+if TARGET_DXR2
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "draco"
+
+config SYS_VENDOR
+	string
+	default "siemens"
+
+config SYS_SOC
+	string
+	default "am33xx"
+
+config SYS_CONFIG_NAME
+	string
+	default "dxr2"
+
+endif
diff --git a/board/siemens/draco/MAINTAINERS b/board/siemens/draco/MAINTAINERS
new file mode 100644
index 0000000..f6b68ca
--- /dev/null
+++ b/board/siemens/draco/MAINTAINERS
@@ -0,0 +1,8 @@
+DRACO BOARD
+M:	Roger Meier <r.meier@siemens.com>
+S:	Maintained
+F:	board/siemens/draco/
+F:	include/configs/draco.h
+F:	configs/draco_defconfig
+F:	include/configs/dxr2.h
+F:	configs/dxr2_defconfig
diff --git a/board/siemens/pxm2/Kconfig b/board/siemens/pxm2/Kconfig
new file mode 100644
index 0000000..db69537
--- /dev/null
+++ b/board/siemens/pxm2/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_PXM2
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "pxm2"
+
+config SYS_VENDOR
+	string
+	default "siemens"
+
+config SYS_SOC
+	string
+	default "am33xx"
+
+config SYS_CONFIG_NAME
+	string
+	default "pxm2"
+
+endif
diff --git a/board/siemens/pxm2/MAINTAINERS b/board/siemens/pxm2/MAINTAINERS
new file mode 100644
index 0000000..fa734c9
--- /dev/null
+++ b/board/siemens/pxm2/MAINTAINERS
@@ -0,0 +1,6 @@
+PXM2 BOARD
+M:	Roger Meier <r.meier@siemens.com>
+S:	Maintained
+F:	board/siemens/pxm2/
+F:	include/configs/pxm2.h
+F:	configs/pxm2_defconfig
diff --git a/board/siemens/rut/Kconfig b/board/siemens/rut/Kconfig
new file mode 100644
index 0000000..c4d9e7e
--- /dev/null
+++ b/board/siemens/rut/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_RUT
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "rut"
+
+config SYS_VENDOR
+	string
+	default "siemens"
+
+config SYS_SOC
+	string
+	default "am33xx"
+
+config SYS_CONFIG_NAME
+	string
+	default "rut"
+
+endif
diff --git a/board/siemens/rut/MAINTAINERS b/board/siemens/rut/MAINTAINERS
new file mode 100644
index 0000000..8c1b770
--- /dev/null
+++ b/board/siemens/rut/MAINTAINERS
@@ -0,0 +1,6 @@
+RUT BOARD
+M:	Roger Meier <r.meier@siemens.com>
+S:	Maintained
+F:	board/siemens/rut/
+F:	include/configs/rut.h
+F:	configs/rut_defconfig
diff --git a/board/siemens/taurus/Kconfig b/board/siemens/taurus/Kconfig
new file mode 100644
index 0000000..3ef14c6
--- /dev/null
+++ b/board/siemens/taurus/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_TAURUS
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "taurus"
+
+config SYS_VENDOR
+	string
+	default "siemens"
+
+config SYS_SOC
+	string
+	default "at91"
+
+config SYS_CONFIG_NAME
+	string
+	default "taurus"
+
+endif
diff --git a/board/siemens/taurus/MAINTAINERS b/board/siemens/taurus/MAINTAINERS
new file mode 100644
index 0000000..74e3518
--- /dev/null
+++ b/board/siemens/taurus/MAINTAINERS
@@ -0,0 +1,7 @@
+TAURUS BOARD
+M:	Heiko Schocher <hs@denx.de>
+S:	Maintained
+F:	board/siemens/taurus/
+F:	include/configs/taurus.h
+F:	configs/axm_defconfig
+F:	configs/taurus_defconfig