Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpu' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 022f20097930e5a8c2f64248e34c2812eb6f3167..a275ec3f743353025ebc812d3335ac5674168d4e 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -144,6 +144,14 @@ config SMP
 
          If you don't know what to do here, say N.
 
+config ARM_CPU_TOPOLOGY
+       bool "Support CPU topology definition"
+       depends on SMP
+       default y
+       help
+         Support CPU topology definition, based on configuration
+         provided by the firmware.
+
 config NR_CPUS
        int "Maximum number of CPUs (2-32)"
        range 2 32
@@ -236,6 +244,14 @@ config SYSVIPC_COMPAT
 
 endmenu
 
+menu "Power management options"
+
+source "kernel/power/Kconfig"
+
+source "drivers/cpufreq/Kconfig"
+
+endmenu
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"