diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-24 11:26:58 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-12-10 23:18:03 +0100 |
| commit | f7b3a8355ba6cad251297844a0bdd08898ea36e0 (patch) | |
| tree | 018eee7bfdbf99961e929644a761354bbea12688 /drivers | |
| parent | of: remove special case definition of of_read_ulong() (diff) | |
| download | linux-f7b3a8355ba6cad251297844a0bdd08898ea36e0.tar.xz linux-f7b3a8355ba6cad251297844a0bdd08898ea36e0.zip | |
of/flattree: Merge early_init_dt_check_for_initrd()
Merge common code between PowerPC and Microblaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/fdt.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 43d236cbc17b..6ad98e85dc93 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/lmb.h> +#include <linux/initrd.h> #include <linux/of.h> #include <linux/of_fdt.h> @@ -369,6 +370,42 @@ unsigned long __init unflatten_dt_node(unsigned long mem, return mem; } +#ifdef CONFIG_BLK_DEV_INITRD +/** + * early_init_dt_check_for_initrd - Decode initrd location from flat tree + * @node: reference to node containing initrd location ('chosen') + */ +void __init early_init_dt_check_for_initrd(unsigned long node) +{ + unsigned long len; + u32 *prop; + + pr_debug("Looking for initrd properties... "); + + prop = of_get_flat_dt_prop(node, "linux,initrd-start", &len); + if (prop) { + initrd_start = (unsigned long) + __va(of_read_ulong(prop, len/4)); + + prop = of_get_flat_dt_prop(node, "linux,initrd-end", &len); + if (prop) { + initrd_end = (unsigned long) + __va(of_read_ulong(prop, len/4)); + initrd_below_start_ok = 1; + } else { + initrd_start = 0; + } + } + + pr_debug("initrd_start=0x%lx initrd_end=0x%lx\n", + initrd_start, initrd_end); +} +#else +inline void early_init_dt_check_for_initrd(unsigned long node) +{ +} +#endif /* CONFIG_BLK_DEV_INITRD */ + /** * unflatten_device_tree - create tree of device_nodes from flat blob * |