aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2014-02-05 13:59:50 +0000
committerGraeme Gregory <graeme.gregory@linaro.org>2014-06-03 09:24:20 +0100
commitfd7d61fb5330fa18840131401730b3e262d083bd (patch)
treed9cc5a4d0d8b930b1bf09a8d0fff3f0a277f4cf2
parent4ca6e1651e98b0c373e5d678099c990db13ed4b0 (diff)
downloadleg-kernel-fd7d61fb5330fa18840131401730b3e262d083bd.tar.gz
arm64: if we chose to boot from acpi then disable FDT
If the early boot methods of acpi are happy that we have valid ACPI tables and acpi=off has not been passed. Then do not unflatted devicetree effectively disabling further hardware probing from DT. Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-rw-r--r--arch/arm64/kernel/setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 42b297f6a714..448cf67b4c2f 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -382,7 +382,8 @@ void __init setup_arch(char **cmdline_p)
efi_idmap_init();
- unflatten_device_tree();
+ if (acpi_disabled)
+ unflatten_device_tree();
psci_init();