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

Commit 41579f49 authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

[ARM] 4822/1: RealView: Change the REALVIEW_MPCORE configuration option 



This patch changes the REALVIEW_MPCORE configuration option to
REALVIEW_EB_ARM11MP since this is only specific to RealView/EB.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 39e823e3

arch/arm/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -611,7 +611,7 @@ source "kernel/time/Kconfig" 




config SMP

config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && REALVIEW_MPCORE

	depends on EXPERIMENTAL && REALVIEW_EB_ARM11MP

	help

	help

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

	  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

	  a system with only one CPU, like most personal computers, say N. If
@@ -645,7 +645,7 @@ config HOTPLUG_CPU 




config LOCAL_TIMERS

config LOCAL_TIMERS

	bool "Use local timer interrupts"

	bool "Use local timer interrupts"

	depends on SMP && REALVIEW_MPCORE

	depends on SMP && REALVIEW_EB_ARM11MP

	default y

	default y

	help

	help

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

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

arch/arm/mach-realview/Kconfig

+9 −12
Original line number Original line Diff line number Diff line
@@ -7,24 +7,21 @@ config MACH_REALVIEW_EB 
	help

	help

	  Include support for the ARM(R) RealView Emulation Baseboard platform.

	  Include support for the ARM(R) RealView Emulation Baseboard platform.





config REALVIEW_MPCORE

config REALVIEW_EB_ARM11MP

	bool "Support MPcore tile"

	bool "Support ARM11MPCore tile"

	depends on MACH_REALVIEW_EB

	depends on MACH_REALVIEW_EB

	select CACHE_L2X0

	select CACHE_L2X0

	help

	help

	  Enable support for the MPCore tile on the Realview platform.

	  Enable support for the ARM11MPCore tile on the Realview platform.

	  Since there are device address and interrupt differences, a

	  kernel built with this option enabled is not compatible with

	  other tiles.





config REALVIEW_MPCORE_REVB

config REALVIEW_EB_ARM11MP_REVB

	bool "Support MPcore RevB tile"

	bool "Support ARM11MPCore RevB tile"

	depends on REALVIEW_MPCORE

	depends on REALVIEW_EB_ARM11MP

	default n

	default n

	help

	help

	  Enable support for the MPCore RevB tile on the Realview platform.

	  Enable support for the ARM11MPCore RevB tile on the Realview

	  Since there are device address differences, a

	  platform. Since there are device address differences, a

	  kernel built with this option enabled is not compatible with

	  kernel built with this option enabled is not compatible with

	  other tiles.

	  other revisions of the ARM11MPCore tile.





endmenu
 
endmenu

arch/arm/mach-realview/realview_eb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -261,7 +261,7 @@ static void __init gic_init_irq(void) 
		gic_dist_init(0, __io_address(REALVIEW_EB11MP_GIC_DIST_BASE), 29);

		gic_dist_init(0, __io_address(REALVIEW_EB11MP_GIC_DIST_BASE), 29);

		gic_cpu_init(0, gic_cpu_base_addr);

		gic_cpu_init(0, gic_cpu_base_addr);





#ifndef CONFIG_REALVIEW_MPCORE_REVB

#ifndef CONFIG_REALVIEW_EB_ARM11MP_REVB

		/* board GIC, secondary */

		/* board GIC, secondary */

		gic_dist_init(1, __io_address(REALVIEW_GIC_DIST_BASE), 64);

		gic_dist_init(1, __io_address(REALVIEW_GIC_DIST_BASE), 64);

		gic_cpu_init(1, __io_address(REALVIEW_GIC_CPU_BASE));

		gic_cpu_init(1, __io_address(REALVIEW_GIC_CPU_BASE));

include/asm-arm/arch-realview/board-eb.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
/*

/*

 * RealView EB + ARM11MPCore peripheral addresses

 * RealView EB + ARM11MPCore peripheral addresses

 */

 */

#ifdef CONFIG_REALVIEW_MPCORE_REVB

#ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB

#define REALVIEW_EB11MP_SCU_BASE	0x10100000	/* SCU registers */

#define REALVIEW_EB11MP_SCU_BASE	0x10100000	/* SCU registers */

#define REALVIEW_EB11MP_GIC_CPU_BASE	0x10100100	/* Generic interrupt controller CPU interface */

#define REALVIEW_EB11MP_GIC_CPU_BASE	0x10100100	/* Generic interrupt controller CPU interface */

#define REALVIEW_EB11MP_TWD_BASE	0x10100700

#define REALVIEW_EB11MP_TWD_BASE	0x10100700
@@ -143,7 +143,7 @@ 
#define NR_IRQS			NR_IRQS_EB

#define NR_IRQS			NR_IRQS_EB

#endif

#endif





#if defined(CONFIG_REALVIEW_MPCORE) \

#if defined(CONFIG_REALVIEW_EB_ARM11MP) \

	&& (!defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_EB11MP))

	&& (!defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_EB11MP))

#undef MAX_GIC_NR

#undef MAX_GIC_NR

#define MAX_GIC_NR		NR_GIC_EB11MP

#define MAX_GIC_NR		NR_GIC_EB11MP
@@ -162,7 +162,7 @@ 
	((readl(__io_address(REALVIEW_SYS_PROCID)) & REALVIEW_EB_PROC_MASK)	\

	((readl(__io_address(REALVIEW_SYS_PROCID)) & REALVIEW_EB_PROC_MASK)	\

	 == proc_type)

	 == proc_type)





#ifdef CONFIG_REALVIEW_MPCORE

#ifdef CONFIG_REALVIEW_EB_ARM11MP

#define core_tile_eb11mp()	check_eb_proc(REALVIEW_EB_PROC_ARM11MP)

#define core_tile_eb11mp()	check_eb_proc(REALVIEW_EB_PROC_ARM11MP)

#else

#else

#define core_tile_eb11mp()	0

#define core_tile_eb11mp()	0