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

Commit e28edb72 authored by Russell King's avatar Russell King
Browse files

Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' into devel

parents 2fc42814 01c62c9b 43234b1e 183bd50f 50dcfa02 045868df 66355299 870725d9

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -923,6 +923,12 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
W:	http://www.mcuos.com

S:	Maintained



ARM/U8500 ARM ARCHITECTURE

M:	Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-ux500/



ARM/VFP SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+17 −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"
@@ -787,6 +797,7 @@ source "arch/arm/mach-at91/Kconfig" 
source "arch/arm/plat-mxc/Kconfig"



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

source "arch/arm/plat-nomadik/Kconfig"



source "arch/arm/mach-netx/Kconfig"
@@ -804,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
@@ -955,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
@@ -1027,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/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -83,6 +83,14 @@ config DEBUG_ICEDCC 
	  It does include a timeout to ensure that the system does not

	  totally freeze when there is nothing connected to read.



config OC_ETM

	bool "On-chip ETM and ETB"

	select ARM_AMBA

	help

	  Enables the on-chip embedded trace macrocell and embedded trace

	  buffer driver that will allow you to collect traces of the

	  kernel code.



config DEBUG_DC21285_PORT

	bool "Kernel low-level debugging messages via footbridge serial port"

	depends on DEBUG_LL && FOOTBRIDGE

arch/arm/Makefile

+2 −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
@@ -176,6 +177,7 @@ machine-$(CONFIG_ARCH_MXC91231) := mxc91231 
plat-$(CONFIG_ARCH_MXC)		:= mxc

plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

plat-$(CONFIG_PLAT_ORION)	:= orion

plat-$(CONFIG_PLAT_PXA)		:= pxa

plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx s3c

arch/arm/configs/at91rm9200dk_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ CONFIG_ARCH_AT91RM9200DK=y 
# CONFIG_MACH_CARMEVA is not set

# CONFIG_MACH_KB9200 is not set

# CONFIG_MACH_ATEB9200 is not set

CONFIG_MACH_ECO920=y



#

# AT91RM9200 Feature Selections