diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-19 14:07:43 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-19 14:07:43 +1100 |
commit | ff76883b7fe55f6be970aae6b1ee443c211e43a8 (patch) | |
tree | 099beb2aea668ffa004567aaee33f6bf3ebb5720 /drivers | |
parent | a729e2081b004d6d7578035dbf11f71b5afdc1cb (diff) | |
parent | 9cbbd9e33e2441bb109224c6f5f53ee5ae52a391 (diff) |
Merge remote branch 'devicetree/next-devicetree'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/of/fdt.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 406757a9d7ea..5ce7bd5b80c8 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -553,6 +553,21 @@ void __init unflatten_device_tree(void) pr_debug(" -> unflatten_device_tree()\n"); + if (!initial_boot_params) { + pr_debug("No device tree pointer\n"); + return; + } + + pr_debug("Unflattening device tree:\n"); + pr_debug("magic: %08x\n", be32_to_cpu(initial_boot_params->magic)); + pr_debug("size: %08x\n", be32_to_cpu(initial_boot_params->totalsize)); + pr_debug("version: %08x\n", be32_to_cpu(initial_boot_params->version)); + + if (be32_to_cpu(initial_boot_params->magic) != OF_DT_HEADER) { + pr_err("Invalid device tree blob header\n"); + return; + } + /* First pass, scan for size */ start = ((unsigned long)initial_boot_params) + be32_to_cpu(initial_boot_params->off_dt_struct); |