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

diff --git a/board/armltd/integrator/Kconfig b/board/armltd/integrator/Kconfig
new file mode 100644
index 0000000000..c1ac6b1872
--- /dev/null
+++ b/board/armltd/integrator/Kconfig
@@ -0,0 +1,159 @@
+if TARGET_INTEGRATORAP_CM720T
+
+config SYS_CPU
+	string
+	default "arm720t"
+
+config SYS_BOARD
+	string
+	default "integrator"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "integratorap"
+
+endif
+
+if TARGET_INTEGRATORAP_CM920T
+
+config SYS_CPU
+	string
+	default "arm920t"
+
+config SYS_BOARD
+	string
+	default "integrator"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "integratorap"
+
+endif
+
+if TARGET_INTEGRATORCP_CM920T
+
+config SYS_CPU
+	string
+	default "arm920t"
+
+config SYS_BOARD
+	string
+	default "integrator"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "integratorcp"
+
+endif
+
+if TARGET_INTEGRATORAP_CM926EJS
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "integrator"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "integratorap"
+
+endif
+
+if TARGET_INTEGRATORCP_CM926EJS
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "integrator"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "integratorcp"
+
+endif
+
+if TARGET_INTEGRATORCP_CM1136
+
+config SYS_CPU
+	string
+	default "arm1136"
+
+config SYS_BOARD
+	string
+	default "integrator"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "integratorcp"
+
+endif
+
+if TARGET_INTEGRATORAP_CM946ES
+
+config SYS_CPU
+	string
+	default "arm946es"
+
+config SYS_BOARD
+	string
+	default "integrator"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "integratorap"
+
+endif
+
+if TARGET_INTEGRATORCP_CM946ES
+
+config SYS_CPU
+	string
+	default "arm946es"
+
+config SYS_BOARD
+	string
+	default "integrator"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "integratorcp"
+
+endif
diff --git a/board/armltd/integrator/MAINTAINERS b/board/armltd/integrator/MAINTAINERS
new file mode 100644
index 0000000000..8af765eaeb
--- /dev/null
+++ b/board/armltd/integrator/MAINTAINERS
@@ -0,0 +1,14 @@
+INTEGRATOR BOARD
+M:	Linus Walleij <linus.walleij@linaro.org>
+S:	Maintained
+F:	board/armltd/integrator/
+F:	include/configs/integratorcp.h
+F:	configs/integratorcp_cm1136_defconfig
+F:	include/configs/integratorap.h
+F:	configs/integratorap_cm720t_defconfig
+F:	configs/integratorap_cm920t_defconfig
+F:	configs/integratorcp_cm920t_defconfig
+F:	configs/integratorap_cm926ejs_defconfig
+F:	configs/integratorcp_cm926ejs_defconfig
+F:	configs/integratorap_cm946es_defconfig
+F:	configs/integratorcp_cm946es_defconfig
diff --git a/board/armltd/versatile/Kconfig b/board/armltd/versatile/Kconfig
new file mode 100644
index 0000000000..f96d0b2a56
--- /dev/null
+++ b/board/armltd/versatile/Kconfig
@@ -0,0 +1,71 @@
+if TARGET_VERSATILEAB
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "versatile"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_SOC
+	string
+	default "versatile"
+
+config SYS_CONFIG_NAME
+	string
+	default "versatile"
+
+endif
+
+if TARGET_VERSATILEPB
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "versatile"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_SOC
+	string
+	default "versatile"
+
+config SYS_CONFIG_NAME
+	string
+	default "versatile"
+
+endif
+
+if TARGET_VERSATILEQEMU
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "versatile"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_SOC
+	string
+	default "versatile"
+
+config SYS_CONFIG_NAME
+	string
+	default "versatile"
+
+endif
diff --git a/board/armltd/versatile/MAINTAINERS b/board/armltd/versatile/MAINTAINERS
new file mode 100644
index 0000000000..f390e53307
--- /dev/null
+++ b/board/armltd/versatile/MAINTAINERS
@@ -0,0 +1,8 @@
+VERSATILE BOARD
+M:	-
+S:	Maintained
+F:	board/armltd/versatile/
+F:	include/configs/versatile.h
+F:	configs/versatileab_defconfig
+F:	configs/versatilepb_defconfig
+F:	configs/versatileqemu_defconfig
diff --git a/board/armltd/vexpress/Kconfig b/board/armltd/vexpress/Kconfig
new file mode 100644
index 0000000000..e49e87133a
--- /dev/null
+++ b/board/armltd/vexpress/Kconfig
@@ -0,0 +1,59 @@
+if TARGET_VEXPRESS_CA15_TC2
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "vexpress"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "vexpress_ca15_tc2"
+
+endif
+
+if TARGET_VEXPRESS_CA5X2
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "vexpress"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "vexpress_ca5x2"
+
+endif
+
+if TARGET_VEXPRESS_CA9X4
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "vexpress"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "vexpress_ca9x4"
+
+endif
diff --git a/board/armltd/vexpress/MAINTAINERS b/board/armltd/vexpress/MAINTAINERS
new file mode 100644
index 0000000000..cfde7f24fb
--- /dev/null
+++ b/board/armltd/vexpress/MAINTAINERS
@@ -0,0 +1,14 @@
+VEXPRESS BOARD
+M:	-
+S:	Maintained
+F:	board/armltd/vexpress/
+F:	include/configs/vexpress_ca15_tc2.h
+F:	configs/vexpress_ca15_tc2_defconfig
+
+VEXPRESS_CA5X2 BOARD
+M:	Matt Waddel <matt.waddel@linaro.org>
+S:	Maintained
+F:	include/configs/vexpress_ca5x2.h
+F:	configs/vexpress_ca5x2_defconfig
+F:	include/configs/vexpress_ca9x4.h
+F:	configs/vexpress_ca9x4_defconfig
diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
new file mode 100644
index 0000000000..91eb8d2997
--- /dev/null
+++ b/board/armltd/vexpress64/Kconfig
@@ -0,0 +1,39 @@
+if TARGET_VEXPRESS_AEMV8A
+
+config SYS_CPU
+	string
+	default "armv8"
+
+config SYS_BOARD
+	string
+	default "vexpress64"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "vexpress_aemv8a"
+
+endif
+
+if TARGET_VEXPRESS_AEMV8A_SEMI
+
+config SYS_CPU
+	string
+	default "armv8"
+
+config SYS_BOARD
+	string
+	default "vexpress64"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_CONFIG_NAME
+	string
+	default "vexpress_aemv8a"
+
+endif
diff --git a/board/armltd/vexpress64/MAINTAINERS b/board/armltd/vexpress64/MAINTAINERS
new file mode 100644
index 0000000000..97c4b0e574
--- /dev/null
+++ b/board/armltd/vexpress64/MAINTAINERS
@@ -0,0 +1,11 @@
+VEXPRESS64 BOARD
+M:	David Feng <fenghua@phytium.com.cn>
+S:	Maintained
+F:	board/armltd/vexpress64/
+F:	include/configs/vexpress_aemv8a.h
+F:	configs/vexpress_aemv8a_defconfig
+
+VEXPRESS_AEMV8A_SEMI BOARD
+M:	Steve Rae <srae@broadcom.com>
+S:	Maintained
+F:	configs/vexpress_aemv8a_semi_defconfig