summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorJeremy Kerr <jeremy.kerr@canonical.com>2010-01-30 01:31:21 -0700
committerGrant Likely <grant.likely@secretlab.ca>2010-02-09 08:34:10 -0700
commit1406bc2f57787797d1f6a3675c019a7093769275 (patch)
tree2b3bee50a75fa1502ef00eccf7bcecda19acd56a /drivers/of
parent50ab2fe147e22c8786552cda1791a61ae81b84d2 (diff)
downloadop-kernel-dev-1406bc2f57787797d1f6a3675c019a7093769275.zip
op-kernel-dev-1406bc2f57787797d1f6a3675c019a7093769275.tar.gz
of/flattree: use callback to setup initrd from /chosen
At present, the fdt code sets the kernel-wide initrd_start and initrd_end variables when parsing /chosen. On ARM, we only set these once the bootmem has been reserved. This change adds an arch hook to setup the initrd from the device tree: void early_init_dt_setup_initrd_arch(unsigned long start, unsigned long end); The arch-specific code can then setup the initrd however it likes. Compiled on powerpc, with CONFIG_BLK_DEV_INITRD=y and =n. Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/fdt.c27
1 files changed, 11 insertions, 16 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index f84152d..9290ca5 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -384,28 +384,23 @@ unsigned long __init unflatten_dt_node(unsigned long mem,
*/
void __init early_init_dt_check_for_initrd(unsigned long node)
{
- unsigned long len;
+ unsigned long start, end, 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;
- }
- }
+ if (!prop)
+ return;
+ start = of_read_ulong(prop, len/4);
+
+ prop = of_get_flat_dt_prop(node, "linux,initrd-end", &len);
+ if (!prop)
+ return;
+ end = of_read_ulong(prop, len/4);
- pr_debug("initrd_start=0x%lx initrd_end=0x%lx\n",
- initrd_start, initrd_end);
+ early_init_dt_setup_initrd_arch(start, end);
+ pr_debug("initrd_start=0x%lx initrd_end=0x%lx\n", start, end);
}
#else
inline void early_init_dt_check_for_initrd(unsigned long node)
OpenPOWER on IntegriCloud