diff options
| author | Jonathan Austin | 2013-02-22 19:56:04 +0100 |
|---|---|---|
| committer | Jonathan Austin | 2013-06-17 16:13:03 +0200 |
| commit | 801bb21c600161c8626d7d9cb649be869ee4dbbe (patch) | |
| tree | d4418d0f772af88dbfbaa8a4019acc92c9a79df0 /arch/arm/Kconfig | |
| parent | ARM: mpu: add MPU initialisation for secondary cores (diff) | |
| download | kernel-qcow2-linux-801bb21c600161c8626d7d9cb649be869ee4dbbe.tar.gz kernel-qcow2-linux-801bb21c600161c8626d7d9cb649be869ee4dbbe.tar.xz kernel-qcow2-linux-801bb21c600161c8626d7d9cb649be869ee4dbbe.zip | |
ARM: mpu: Allow enabling of the MPU via kconfig
Allows the user to select MPU support when compiling for ARM processors
that support the PMSAv7.
This ensures that CONFIG_SMP depends on the MPU in the case that no MMU
is present.
CONFIG_SMP_ON_UP is not implemented for nommu, so introduce an MMU
dependency there.
Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
Reviewed-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5543d36c2834..ec38cacb3d08 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1414,7 +1414,7 @@ config SMP depends on CPU_V6K || CPU_V7 depends on GENERIC_CLOCKEVENTS depends on HAVE_SMP - depends on MMU + depends on MMU || ARM_MPU select USE_GENERIC_SMP_HELPERS help This enables support for systems with more than one CPU. If you have @@ -1435,7 +1435,7 @@ config SMP config SMP_ON_UP bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)" - depends on SMP && !XIP_KERNEL + depends on SMP && !XIP_KERNEL && MMU default y help SMP kernels contain instructions which fail on non-SMP processors. |