arm64: Kconfig: select OF/ACPI_NUMA under NUMA config

Move OF_NUMA select under NUMA config, and select ACPI_NUMA
when ACPI enabled.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 8f868ec4e27f1e4d99eea8710bc20cd23baad69c..4572f00e64f59ab36eb57ad20abd6a70249e6559 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -103,7 +103,6 @@ config ARM64
        select NO_BOOTMEM
        select OF
        select OF_EARLY_FLATTREE
-       select OF_NUMA if NUMA && OF
        select OF_RESERVED_MEM
        select PCI_ECAM if ACPI
        select POWER_RESET
@@ -581,6 +580,8 @@ config HOTPLUG_CPU
 config NUMA
        bool "Numa Memory Allocation and Scheduler Support"
        depends on SMP
+       select ACPI_NUMA if ACPI
+       select OF_NUMA
        help
          Enable NUMA (Non Uniform Memory Access) support.