Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 850265e8 authored by Srinidhi Kasagar's avatar Srinidhi Kasagar Committed by Russell King
Browse files

ARM: 5834/1: ARM: U8500 integrate to ARM architecture 



This hooks the U8500 support into the ARM kbuild
system. This integration also enables SMP and its
helper functions for U8500 platform

Signed-off-by: default avatarsrinidhi kasagar <srinidhi.kasagar@stericsson.com>
Acked-by: default avatarAndrea Gallo <andrea.gallo@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e3fd1745

arch/arm/Kconfig

+16 −4
Original line number Diff line number Diff line
@@ -702,6 +702,16 @@ config ARCH_BCMRING 
	help

	  Support for Broadcom's BCMRing platform.



config ARCH_U8500

	bool "ST-Ericsson U8500 Series"

	select CPU_V7

	select ARM_AMBA

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	help

	  Support for ST-Ericsson's Ux500 architecture



endchoice



source "arch/arm/mach-clps711x/Kconfig"
@@ -805,6 +815,8 @@ source "arch/arm/mach-w90x900/Kconfig" 


source "arch/arm/mach-bcmring/Kconfig"



source "arch/arm/mach-ux500/Kconfig"



# Definitions to make life easier

config ARCH_ACORN

	bool
@@ -956,10 +968,10 @@ source "kernel/time/Kconfig" 
config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4)

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || ARCH_U8500)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4)

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500)

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If
@@ -1028,9 +1040,9 @@ config HOTPLUG_CPU 
config LOCAL_TIMERS

	bool "Use local timer interrupts"

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \

		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4)

		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || ARCH_U8500)

	default y

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4)

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500)

	help

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ machine-$(CONFIG_ARCH_SHARK) := shark 
machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x

machine-$(CONFIG_ARCH_STMP37XX)		:= stmp37xx

machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_U8500)		:= ux500

machine-$(CONFIG_ARCH_VERSATILE)	:= versatile

machine-$(CONFIG_ARCH_W90X900)		:= w90x900

machine-$(CONFIG_FOOTBRIDGE)		:= footbridge