ARM: UniPhier: add basic support for UniPhier architecture

Initial commit for a new SoC family, UniPhier, developed by
Socionext Inc. (formerly, System LSI Business Division of
Panasonic Corporation).

This commit includes a minimal set of components for booting the
kernel, including SMP support.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 45df48ba0b128dd408e2275687b1757c87e0ca74..b2e0d98894d389aafbdd4252baab300f94315126 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -937,6 +937,8 @@ source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-u300/Kconfig"
 
+source "arch/arm/mach-uniphier/Kconfig"
+
 source "arch/arm/mach-ux500/Kconfig"
 
 source "arch/arm/mach-versatile/Kconfig"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 985227cbbd1bd797546c36099dcd7cc17c0efc4f..fe8f9ef89395c00fe918174e725d77953e9ccd9e 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -200,6 +200,7 @@ machine-$(CONFIG_ARCH_SUNXI)                += sunxi
 machine-$(CONFIG_ARCH_TEGRA)           += tegra
 machine-$(CONFIG_ARCH_U300)            += u300
 machine-$(CONFIG_ARCH_U8500)           += ux500
+machine-$(CONFIG_ARCH_UNIPHIER)                += uniphier
 machine-$(CONFIG_ARCH_VERSATILE)       += versatile
 machine-$(CONFIG_ARCH_VEXPRESS)                += vexpress
 machine-$(CONFIG_ARCH_VT8500)          += vt8500

diff --cc arch/arm/mach-uniphier/Kconfig
Simple merge

diff --cc arch/arm/mach-uniphier/Makefile
Simple merge

diff --cc arch/arm/mach-uniphier/platsmp.c
Simple merge

diff --cc arch/arm/mach-uniphier/uniphier.c
Simple merge