36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
|
From 884ab569aec3a0847702dff0dad133bfb67e234c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Josh Cartwright <joshc@codeaurora.org>
|
||
|
|
Date: Thu, 13 Mar 2014 16:36:36 -0500
|
||
|
|
Subject: [PATCH 054/182] of: only scan for reserved mem when fdt present
|
||
|
|
|
||
|
|
When the reserved memory patches hit -next, several legacy (non-DT) boot
|
||
|
|
failures were detected and bisected down to that commit. There needs to
|
||
|
|
be some sanity checking whether a DT is even present before parsing the
|
||
|
|
reserved ranges.
|
||
|
|
|
||
|
|
Reported-by: Kevin Hilman <khilman@linaro.org>
|
||
|
|
Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
|
||
|
|
Tested-by: Kevin Hilman <khilman@linaro.org>
|
||
|
|
Signed-off-by: Grant Likely <grant.likely@linaro.org>
|
||
|
|
---
|
||
|
|
drivers/of/fdt.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
|
||
|
|
index 510c0d8..501bc83 100644
|
||
|
|
--- a/drivers/of/fdt.c
|
||
|
|
+++ b/drivers/of/fdt.c
|
||
|
|
@@ -557,6 +557,9 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname,
|
||
|
|
*/
|
||
|
|
void __init early_init_fdt_scan_reserved_mem(void)
|
||
|
|
{
|
||
|
|
+ if (!initial_boot_params)
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
of_scan_flat_dt(__fdt_scan_reserved_mem, NULL);
|
||
|
|
fdt_init_reserved_mem();
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|