diff options
| author | John Williams <john.williams@petalogix.com> | 2009-06-22 14:02:09 +1000 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2009-07-27 07:39:53 +0200 |
| commit | 909964ec89ba466d75d53250d5738d1891cc1a3d (patch) | |
| tree | 5b0b2ce13b2d82e9193dd0398535f634d8c4d8e7 /arch/microblaze/kernel/setup.c | |
| parent | 1170902b343053f50d4caf8ec2aa745fd0ce5c84 (diff) | |
microblaze: Final support for statically linked DTB
If r7 is zero at kernel boot, or does not point to a valid DTB, then
we fall back to a DTB (assumed to be) linked statically in the kernel, instead
of blindly copying bogus cruft into the kernel DTB memory region
Signed-off-by: John Williams <john.williams@petalogix.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel/setup.c')
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 8709bea09604..59a383621b22 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -139,7 +139,8 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, #endif early_printk("Ramdisk addr 0x%08x, FDT 0x%08x\n", ram, fdt); - printk(KERN_NOTICE "Found FDT at 0x%08x\n", fdt); + if(fdt) + printk(KERN_NOTICE "Found FDT at 0x%08x\n", fdt); #ifdef CONFIG_MTD_UCLINUX early_printk("Found romfs @ 0x%08x (0x%08x)\n", |