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

Conflicts:
	boards.cfg

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

8 files changed, 120 insertions, 0 deletions

diff --git a/board/avionic-design/medcom-wide/Kconfig b/board/avionic-design/medcom-wide/Kconfig
new file mode 100644
index 00000000000..2472fe2a4ef
--- /dev/null
+++ b/board/avionic-design/medcom-wide/Kconfig
@@ -0,0 +1,24 @@
+if TARGET_MEDCOM_WIDE
+
+config SYS_CPU
+	string
+	default "arm720t" if SPL_BUILD
+	default "armv7" if !SPL_BUILD
+
+config SYS_BOARD
+	string
+	default "medcom-wide"
+
+config SYS_VENDOR
+	string
+	default "avionic-design"
+
+config SYS_SOC
+	string
+	default "tegra20"
+
+config SYS_CONFIG_NAME
+	string
+	default "medcom-wide"
+
+endif
diff --git a/board/avionic-design/medcom-wide/MAINTAINERS b/board/avionic-design/medcom-wide/MAINTAINERS
new file mode 100644
index 00000000000..0a00fcf719e
--- /dev/null
+++ b/board/avionic-design/medcom-wide/MAINTAINERS
@@ -0,0 +1,6 @@
+MEDCOM-WIDE BOARD
+M:	Alban Bedel <alban.bedel@avionic-design.de>
+S:	Maintained
+F:	board/avionic-design/medcom-wide/
+F:	include/configs/medcom-wide.h
+F:	configs/medcom-wide_defconfig
diff --git a/board/avionic-design/plutux/Kconfig b/board/avionic-design/plutux/Kconfig
new file mode 100644
index 00000000000..a697a544770
--- /dev/null
+++ b/board/avionic-design/plutux/Kconfig
@@ -0,0 +1,24 @@
+if TARGET_PLUTUX
+
+config SYS_CPU
+	string
+	default "arm720t" if SPL_BUILD
+	default "armv7" if !SPL_BUILD
+
+config SYS_BOARD
+	string
+	default "plutux"
+
+config SYS_VENDOR
+	string
+	default "avionic-design"
+
+config SYS_SOC
+	string
+	default "tegra20"
+
+config SYS_CONFIG_NAME
+	string
+	default "plutux"
+
+endif
diff --git a/board/avionic-design/plutux/MAINTAINERS b/board/avionic-design/plutux/MAINTAINERS
new file mode 100644
index 00000000000..e8ef5096e56
--- /dev/null
+++ b/board/avionic-design/plutux/MAINTAINERS
@@ -0,0 +1,6 @@
+PLUTUX BOARD
+M:	Alban Bedel <alban.bedel@avionic-design.de>
+S:	Maintained
+F:	board/avionic-design/plutux/
+F:	include/configs/plutux.h
+F:	configs/plutux_defconfig
diff --git a/board/avionic-design/tec-ng/Kconfig b/board/avionic-design/tec-ng/Kconfig
new file mode 100644
index 00000000000..f52eddae762
--- /dev/null
+++ b/board/avionic-design/tec-ng/Kconfig
@@ -0,0 +1,24 @@
+if TARGET_TEC_NG
+
+config SYS_CPU
+	string
+	default "arm720t" if SPL_BUILD
+	default "armv7" if !SPL_BUILD
+
+config SYS_BOARD
+	string
+	default "tec-ng"
+
+config SYS_VENDOR
+	string
+	default "avionic-design"
+
+config SYS_SOC
+	string
+	default "tegra30"
+
+config SYS_CONFIG_NAME
+	string
+	default "tec-ng"
+
+endif
diff --git a/board/avionic-design/tec-ng/MAINTAINERS b/board/avionic-design/tec-ng/MAINTAINERS
new file mode 100644
index 00000000000..5cbdf8e7ebf
--- /dev/null
+++ b/board/avionic-design/tec-ng/MAINTAINERS
@@ -0,0 +1,6 @@
+TEC-NG BOARD
+M:	Alban Bedel <alban.bedel@avionic-design.de>
+S:	Maintained
+F:	board/avionic-design/tec-ng/
+F:	include/configs/tec-ng.h
+F:	configs/tec-ng_defconfig
diff --git a/board/avionic-design/tec/Kconfig b/board/avionic-design/tec/Kconfig
new file mode 100644
index 00000000000..d19e3f43c7b
--- /dev/null
+++ b/board/avionic-design/tec/Kconfig
@@ -0,0 +1,24 @@
+if TARGET_TEC
+
+config SYS_CPU
+	string
+	default "arm720t" if SPL_BUILD
+	default "armv7" if !SPL_BUILD
+
+config SYS_BOARD
+	string
+	default "tec"
+
+config SYS_VENDOR
+	string
+	default "avionic-design"
+
+config SYS_SOC
+	string
+	default "tegra20"
+
+config SYS_CONFIG_NAME
+	string
+	default "tec"
+
+endif
diff --git a/board/avionic-design/tec/MAINTAINERS b/board/avionic-design/tec/MAINTAINERS
new file mode 100644
index 00000000000..10f1aac7a63
--- /dev/null
+++ b/board/avionic-design/tec/MAINTAINERS
@@ -0,0 +1,6 @@
+TEC BOARD
+M:	Alban Bedel <alban.bedel@avionic-design.de>
+S:	Maintained
+F:	board/avionic-design/tec/
+F:	include/configs/tec.h
+F:	configs/tec_defconfig