]> git.karo-electronics.de Git - linux-beck.git/commitdiff
powerpc: add support for reserved memory defined by device tree
authorMarek Szyprowski <m.szyprowski@samsung.com>
Fri, 28 Feb 2014 13:42:56 +0000 (14:42 +0100)
committerGrant Likely <grant.likely@linaro.org>
Thu, 13 Mar 2014 10:53:23 +0000 (10:53 +0000)
Enable reserved memory initialization from device tree.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
arch/powerpc/Kconfig
arch/powerpc/kernel/prom.c

index 957bf344c0f533e4ebf0c6248b3ba02caf3d8595..3b6617fed8fc9cf3458a277d932fe7e4378d5fd1 100644 (file)
@@ -90,6 +90,7 @@ config PPC
        select BINFMT_ELF
        select OF
        select OF_EARLY_FLATTREE
+       select OF_RESERVED_MEM
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACER
index f58c0d3aaeb497697aaa7ed75874ddee33146652..591986215801163de9f3a29733adc57f09514882 100644 (file)
@@ -33,6 +33,7 @@
 #include <linux/irq.h>
 #include <linux/memblock.h>
 #include <linux/of.h>
+#include <linux/of_fdt.h>
 
 #include <asm/prom.h>
 #include <asm/rtas.h>
@@ -588,6 +589,8 @@ static void __init early_reserve_mem_dt(void)
                        memblock_reserve(base, size);
                }
        }
+
+       early_init_fdt_scan_reserved_mem();
 }
 
 static void __init early_reserve_mem(void)