diff options
| author | Viresh Kumar <viresh.kumar@st.com> | 2012-04-19 13:04:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 11:34:09 -0400 |
| commit | 0d8e08f5a3b8cda3785e5bc854d89ebba60e9994 (patch) | |
| tree | bb74addf5b8c39aad34aab40007cbb38b12be432 /arch | |
| parent | 07658d9a659ba2e297cead3872ad4be8ec38b5b9 (diff) | |
SPEAr13xx: Add compilation support
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/plat-spear/Kconfig | 12 | ||||
| -rw-r--r-- | arch/arm/plat-spear/Makefile | 5 |
3 files changed, 17 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 047a20780fc1..2aa75b58bf12 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -192,6 +192,8 @@ machine-$(CONFIG_ARCH_VEXPRESS) := vexpress | |||
| 192 | machine-$(CONFIG_ARCH_VT8500) := vt8500 | 192 | machine-$(CONFIG_ARCH_VT8500) := vt8500 |
| 193 | machine-$(CONFIG_ARCH_W90X900) := w90x900 | 193 | machine-$(CONFIG_ARCH_W90X900) := w90x900 |
| 194 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 194 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |
| 195 | machine-$(CONFIG_MACH_SPEAR1310) := spear13xx | ||
| 196 | machine-$(CONFIG_MACH_SPEAR1340) := spear13xx | ||
| 195 | machine-$(CONFIG_MACH_SPEAR300) := spear3xx | 197 | machine-$(CONFIG_MACH_SPEAR300) := spear3xx |
| 196 | machine-$(CONFIG_MACH_SPEAR310) := spear3xx | 198 | machine-$(CONFIG_MACH_SPEAR310) := spear3xx |
| 197 | machine-$(CONFIG_MACH_SPEAR320) := spear3xx | 199 | machine-$(CONFIG_MACH_SPEAR320) := spear3xx |
diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig index 387655b5ce05..4404f82d5979 100644 --- a/arch/arm/plat-spear/Kconfig +++ b/arch/arm/plat-spear/Kconfig | |||
| @@ -8,6 +8,17 @@ choice | |||
| 8 | prompt "ST SPEAr Family" | 8 | prompt "ST SPEAr Family" |
| 9 | default ARCH_SPEAR3XX | 9 | default ARCH_SPEAR3XX |
| 10 | 10 | ||
| 11 | config ARCH_SPEAR13XX | ||
| 12 | bool "ST SPEAr13xx with Device Tree" | ||
| 13 | select ARM_GIC | ||
| 14 | select CPU_V7 | ||
| 15 | select USE_OF | ||
| 16 | select HAVE_SMP | ||
| 17 | select MIGHT_HAVE_CACHE_L2X0 | ||
| 18 | select PINCTRL | ||
| 19 | help | ||
| 20 | Supports for ARM's SPEAR13XX family | ||
| 21 | |||
| 11 | config ARCH_SPEAR3XX | 22 | config ARCH_SPEAR3XX |
| 12 | bool "ST SPEAr3xx with Device Tree" | 23 | bool "ST SPEAr3xx with Device Tree" |
| 13 | select ARM_VIC | 24 | select ARM_VIC |
| @@ -27,6 +38,7 @@ config ARCH_SPEAR6XX | |||
| 27 | endchoice | 38 | endchoice |
| 28 | 39 | ||
| 29 | # Adding SPEAr machine specific configuration files | 40 | # Adding SPEAr machine specific configuration files |
| 41 | source "arch/arm/mach-spear13xx/Kconfig" | ||
| 30 | source "arch/arm/mach-spear3xx/Kconfig" | 42 | source "arch/arm/mach-spear3xx/Kconfig" |
| 31 | source "arch/arm/mach-spear6xx/Kconfig" | 43 | source "arch/arm/mach-spear6xx/Kconfig" |
| 32 | 44 | ||
diff --git a/arch/arm/plat-spear/Makefile b/arch/arm/plat-spear/Makefile index 38f1235f4632..2607bd05c525 100644 --- a/arch/arm/plat-spear/Makefile +++ b/arch/arm/plat-spear/Makefile | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | # Common support | 5 | # Common support |
| 6 | obj-y := restart.o time.o pl080.o | 6 | obj-y := restart.o time.o |
| 7 | 7 | ||
| 8 | obj-$(CONFIG_ARCH_SPEAR3XX) += shirq.o | 8 | obj-$(CONFIG_ARCH_SPEAR3XX) += pl080.o shirq.o |
| 9 | obj-$(CONFIG_ARCH_SPEAR6XX) += pl080.o | ||