diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-11 15:35:00 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-11 15:35:00 +0100 |
| commit | 42578c82e0f1810a07ebe29cb05e874893243d8c (patch) | |
| tree | e2a3811677d3594e891fc82c940438f6b6abc3e0 /arch/arm/mach-realview/Kconfig | |
| parent | 2631182bf93919577730e6a6c4345308db590057 (diff) | |
| parent | 85d6943af50537d3aec58b967ffbd3fec88453e9 (diff) | |
| download | kernel_samsung_smdk4412-42578c82e0f1810a07ebe29cb05e874893243d8c.zip kernel_samsung_smdk4412-42578c82e0f1810a07ebe29cb05e874893243d8c.tar.gz kernel_samsung_smdk4412-42578c82e0f1810a07ebe29cb05e874893243d8c.tar.bz2 | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/kernel/smp.c
arch/arm/mach-realview/Makefile
arch/arm/mach-realview/platsmp.c
Diffstat (limited to 'arch/arm/mach-realview/Kconfig')
| -rw-r--r-- | arch/arm/mach-realview/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig index bf35cfd..d4cfa21 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig @@ -47,6 +47,15 @@ config MACH_REALVIEW_PB1176 help Include support for the ARM(R) RealView ARM1176 Platform Baseboard. +config REALVIEW_PB1176_SECURE_FLASH + bool "Allow access to the secure flash memory block" + depends on MACH_REALVIEW_PB1176 + default n + help + Select this option if Linux will only run in secure mode on the + RealView PB1176 platform and access to the secure flash memory + block (64MB @ 0x3c000000) is required. + config MACH_REALVIEW_PBA8 bool "Support RealView/PB-A8 platform" select CPU_V7 @@ -57,6 +66,13 @@ config MACH_REALVIEW_PBA8 PB-A8 is a platform with an on-board Cortex-A8 and has support for PCI-E and Compact Flash. +config MACH_REALVIEW_PBX + bool "Support RealView/PBX platform" + select ARM_GIC + select HAVE_PATA_PLATFORM + help + Include support for the ARM(R) RealView PBX platform. + config REALVIEW_HIGH_PHYS_OFFSET bool "High physical base address for the RealView platform" depends on !MACH_REALVIEW_PB1176 |