SPEAr13xx: Add compilation support

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 047a20780fc15a5b753c3ea80c2178efed29c18c..2aa75b58bf128ac14bc9ef116369eca26218f487 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -192,6 +192,8 @@ machine-$(CONFIG_ARCH_VEXPRESS)             := vexpress
 machine-$(CONFIG_ARCH_VT8500)          := vt8500
 machine-$(CONFIG_ARCH_W90X900)         := w90x900
 machine-$(CONFIG_FOOTBRIDGE)           := footbridge
+machine-$(CONFIG_MACH_SPEAR1310)       := spear13xx
+machine-$(CONFIG_MACH_SPEAR1340)       := spear13xx
 machine-$(CONFIG_MACH_SPEAR300)                := spear3xx
 machine-$(CONFIG_MACH_SPEAR310)                := spear3xx
 machine-$(CONFIG_MACH_SPEAR320)                := spear3xx

diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig
index 387655b5ce0593025e4a5b73194fa2033dc3965c..4404f82d59793d1227e2c6c0474941801b36807f 100644 (file)
--- a/arch/arm/plat-spear/Kconfig
+++ b/arch/arm/plat-spear/Kconfig
@@ -8,6 +8,17 @@ choice
        prompt "ST SPEAr Family"
        default ARCH_SPEAR3XX
 
+config ARCH_SPEAR13XX
+       bool "ST SPEAr13xx with Device Tree"
+       select ARM_GIC
+       select CPU_V7
+       select USE_OF
+       select HAVE_SMP
+       select MIGHT_HAVE_CACHE_L2X0
+       select PINCTRL
+       help
+         Supports for ARM's SPEAR13XX family
+
 config ARCH_SPEAR3XX
        bool "ST SPEAr3xx with Device Tree"
        select ARM_VIC
@@ -27,6 +38,7 @@ config ARCH_SPEAR6XX
 endchoice
 
 # Adding SPEAr machine specific configuration files
+source "arch/arm/mach-spear13xx/Kconfig"
 source "arch/arm/mach-spear3xx/Kconfig"
 source "arch/arm/mach-spear6xx/Kconfig"
 

diff --git a/arch/arm/plat-spear/Makefile b/arch/arm/plat-spear/Makefile
index 38f1235f4632649d19c45a4d6db6af9d33b9c15c..2607bd05c525ed12f4821064529269a7ae4169f2 100644 (file)
--- a/arch/arm/plat-spear/Makefile
+++ b/arch/arm/plat-spear/Makefile
@@ -3,6 +3,7 @@
 #
 
 # Common support
-obj-y  := restart.o time.o pl080.o
+obj-y  := restart.o time.o
 
-obj-$(CONFIG_ARCH_SPEAR3XX)    += shirq.o
+obj-$(CONFIG_ARCH_SPEAR3XX)    += pl080.o shirq.o
+obj-$(CONFIG_ARCH_SPEAR6XX)    += pl080.o