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>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 8f868ec4e27f..4572f00e64f5 100644
--- 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.