lkml.org 
[lkml]   [2013]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 5/9] microblaze: Use NULL as the default DTB
Date
early_init_dt_scan() now takes care of falling back to the built-in DTB,
and printing what it did.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: microblaze-uclinux@itee.uq.edu.au
---
Note: I did not remove the now-unused fdt parameter from
machine_early_init(), as this would require quite some changes
to head.S. BTW, cmdline is also unused.

arch/microblaze/kernel/setup.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index a4534f584be0..a9a9f8baa94a 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -136,7 +136,7 @@ void __init machine_early_init(const char *cmdline, unsigned int ram,
lockdep_init();

/* initialize device tree for usage in early_printk */
- early_init_devtree(&__dtb_start);
+ early_init_devtree(NULL);

#ifdef CONFIG_EARLY_PRINTK
setup_early_printk(NULL);
@@ -149,10 +149,6 @@ void __init machine_early_init(const char *cmdline, unsigned int ram,
tlb1, kernel_tlb); */

pr_info("Ramdisk addr 0x%08x, ", ram);
- if (fdt)
- pr_info("FDT at 0x%08x\n", fdt);
- else
- pr_info("Compiled-in FDT at %p\n", &__dtb_start);

#ifdef CONFIG_MTD_UCLINUX
pr_info("Found romfs @ 0x%08x (0x%08x)\n",
--
1.7.9.5


\
 
 \ /
  Last update: 2013-11-19 13:41    [W:0.429 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site