From: Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> To: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>, Michal Simek <monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org>, microblaze-uclinux-rVRm/Wmeqae7NGdpmJTKYQ@public.gmane.org Subject: [PATCH 5/9] microblaze: Use NULL as the default DTB Date: Tue, 19 Nov 2013 12:12:30 +0100 [thread overview] Message-ID: <1384859554-27268-5-git-send-email-geert@linux-m68k.org> (raw) In-Reply-To: <1384859554-27268-1-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> 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-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> Cc: Michal Simek <monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org> Cc: microblaze-uclinux-rVRm/Wmeqae7NGdpmJTKYQ@public.gmane.org --- 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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert@linux-m68k.org> To: Rob Herring <rob.herring@calxeda.com> Cc: devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert@linux-m68k.org>, Michal Simek <monstr@monstr.eu>, microblaze-uclinux@itee.uq.edu.au Subject: [PATCH 5/9] microblaze: Use NULL as the default DTB Date: Tue, 19 Nov 2013 12:12:30 +0100 [thread overview] Message-ID: <1384859554-27268-5-git-send-email-geert@linux-m68k.org> (raw) Message-ID: <20131119111230.vlChFGZS1iG_PUhun4kP9h3ST09JBQjdMBmL-4PdbMc@z> (raw) In-Reply-To: <1384859554-27268-1-git-send-email-geert@linux-m68k.org> 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
next prev parent reply other threads:[~2013-11-19 11:12 UTC|newest] Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-11-12 19:42 [PATCH 00/17] <asm/sections.h> related cleanups Geert Uytterhoeven 2013-11-12 19:42 ` [PATCH 01/17] alpha: Use Kbuild logic to include <asm-generic/sections.h> Geert Uytterhoeven 2013-11-12 19:42 ` Geert Uytterhoeven 2013-11-12 21:23 ` Richard Henderson 2013-11-12 21:23 ` Richard Henderson 2013-11-12 19:42 ` [PATCH 02/17] cris: " Geert Uytterhoeven 2013-11-12 19:42 ` Geert Uytterhoeven 2013-11-15 16:52 ` Jesper Nilsson 2013-11-15 16:52 ` Jesper Nilsson 2013-11-12 19:42 ` [PATCH 03/17] m32r: " Geert Uytterhoeven 2013-11-12 19:42 ` [PATCH 04/17] mn10300: " Geert Uytterhoeven 2013-11-12 19:42 ` Geert Uytterhoeven 2013-11-12 19:42 ` [PATCH 05/17] score: " Geert Uytterhoeven 2013-11-12 19:42 ` Geert Uytterhoeven 2013-11-15 18:05 ` Lennox Wu 2013-11-12 19:42 ` [PATCH 06/17] frv: Remove unused declarations of __start___ex_table and __stop___ex_table Geert Uytterhoeven 2013-11-12 19:42 ` [PATCH 07/17] ia64: Remove duplicate declarations of __per_cpu_start[] and __per_cpu_end[] Geert Uytterhoeven [not found] ` <1384285347-13506-1-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> 2013-11-12 19:42 ` [PATCH 08/17] microblaze: Remove _fdt_start casts Geert Uytterhoeven 2013-11-12 19:42 ` Geert Uytterhoeven 2013-11-13 10:08 ` Michal Simek 2013-11-12 19:42 ` [PATCH 09/17] microblaze: Remove duplicate declarations of _stext[] and _etext[] Geert Uytterhoeven 2013-11-12 19:42 ` Geert Uytterhoeven 2013-11-12 19:42 ` [PATCH RFC 15/17] microblaze: Convert from _fdt_start to __dtb_start Geert Uytterhoeven 2013-11-12 19:42 ` Geert Uytterhoeven 2013-11-13 10:19 ` Michal Simek 2013-11-13 13:40 ` Michal Simek 2013-11-13 14:02 ` Geert Uytterhoeven 2013-11-13 14:02 ` Geert Uytterhoeven 2013-11-13 14:21 ` Michal Simek 2013-11-13 16:14 ` Rob Herring 2013-11-14 16:29 ` Michal Simek 2013-11-12 19:42 ` [PATCH 10/17] tile: Remove tile-specific _sinitdata and _einitdata Geert Uytterhoeven 2013-11-14 0:09 ` Chris Metcalf 2013-11-14 8:31 ` Geert Uytterhoeven 2013-11-14 14:55 ` Chris Metcalf 2014-07-09 18:33 ` Geert Uytterhoeven 2014-07-10 19:49 ` Chris Metcalf 2014-07-10 20:14 ` Geert Uytterhoeven 2013-11-12 19:42 ` [PATCH 11/17] kernel/param: Consolidate __{start,stop}___param[] in <linux/moduleparam.h> Geert Uytterhoeven 2013-11-14 4:01 ` Rusty Russell 2013-11-14 4:01 ` Rusty Russell 2013-11-12 19:42 ` [PATCH 12/17] nosave: Consolidate __nosave_{begin,end} in <asm/sections.h> Geert Uytterhoeven 2013-11-12 19:42 ` [PATCH 13/17] openrisc: Refactor or32_early_setup() Geert Uytterhoeven 2013-11-12 19:42 ` Geert Uytterhoeven 2013-11-15 9:59 ` Jonas Bonn 2013-11-15 9:59 ` Jonas Bonn 2013-11-12 19:42 ` [PATCH 14/17] dt: Consolidate __dtb_start declarations in <linux/of_fdt.h> Geert Uytterhoeven 2013-11-12 19:42 ` Geert Uytterhoeven 2013-11-13 5:41 ` Vineet Gupta [not found] ` <1384285347-13506-15-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> 2013-11-13 15:51 ` Rob Herring 2013-11-13 15:51 ` Rob Herring 2013-11-13 17:20 ` Geert Uytterhoeven 2013-11-13 17:34 ` Rob Herring 2013-11-13 18:40 ` Geert Uytterhoeven [not found] ` <5283A000.8090007-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2013-11-19 11:12 ` [PATCH 1/9] dt: Handle passed/built-in DT selection in early_init_dt_scan() Geert Uytterhoeven 2013-11-19 11:12 ` Geert Uytterhoeven 2013-11-19 11:12 ` [PATCH 2/9] arc: Use NULL as the default DTB Geert Uytterhoeven 2013-11-20 4:58 ` Vineet Gupta 2013-11-19 11:12 ` [PATCH 3/9] c6x: Remove duplicate DT selection logic Geert Uytterhoeven [not found] ` <1384859554-27268-1-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> 2013-11-19 11:12 ` [PATCH 4/9] metag: " Geert Uytterhoeven 2013-11-19 11:12 ` Geert Uytterhoeven [not found] ` <1384859554-27268-4-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> 2013-11-19 13:14 ` James Hogan 2013-11-19 13:14 ` James Hogan 2013-11-19 11:12 ` Geert Uytterhoeven [this message] 2013-11-19 11:12 ` [PATCH 5/9] microblaze: Use NULL as the default DTB Geert Uytterhoeven 2013-11-19 11:12 ` [PATCH 6/9] mips: Remove unused dt_setup_arch() Geert Uytterhoeven 2013-11-19 11:12 ` Geert Uytterhoeven 2013-11-19 11:12 ` [PATCH 7/9] mips: Use NULL as the default DTB Geert Uytterhoeven 2013-11-19 11:12 ` Geert Uytterhoeven 2013-11-19 11:12 ` [PATCH 8/9] openrisc: Remove duplicate DT selection logic Geert Uytterhoeven 2013-11-19 11:12 ` [PATCH 9/9] xtensa: Use NULL as the default DTB Geert Uytterhoeven 2013-11-19 11:12 ` Geert Uytterhoeven 2013-11-19 13:27 ` [PATCH 1/9] dt: Handle passed/built-in DT selection in early_init_dt_scan() James Hogan 2013-11-19 13:27 ` James Hogan 2013-11-20 20:50 ` Rob Herring 2013-11-21 12:21 ` Grant Likely 2013-11-21 12:21 ` Grant Likely 2013-11-21 12:23 ` Grant Likely 2013-11-21 12:33 ` Grant Likely 2013-11-21 12:33 ` Grant Likely 2013-11-21 13:42 ` Geert Uytterhoeven 2013-11-21 13:42 ` Geert Uytterhoeven 2013-11-21 15:53 ` Grant Likely 2013-11-21 17:49 ` Geert Uytterhoeven [not found] ` <CAMuHMdXfsB_Ewz9sUPZaAjFaQGTGeqMiD8mJ0tCoH1uFLYGoxw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2013-11-21 17:38 ` Rob Herring 2013-11-21 17:42 ` Geert Uytterhoeven 2013-11-27 15:35 ` Grant Likely 2013-11-27 15:35 ` Grant Likely [not found] ` < 1384859554-27268-1-git-send-email-geert@linux-m68k.org> [not found] ` <20131121122148. 1B43DC40A2C@trevor.secretlab.ca> [not found] ` < CAMuHMdXfsB_Ewz9sUPZaAjFaQGTGeqMiD8mJ0tCoH1uFLYGoxw@mail.gmail.com> [not found] ` < CAL_JsqJVteJuaD0PRMHSR9cVcMJTSNj4wXtYiftG=-pYSR9vsQ@mail.gmail.com> [not found] ` < 20131121155348.66751C406A3@trevor.secretlab.ca> [not found] ` < CAMuHMdXjROx-LqNkq_GhNp4M-iYvDXV6X4j7EkgQGdkUmAMvhg@mail.gmail.com> [not found] ` <CAMuHMdXjROx-LqNkq_GhNp4M-iYvDXV6X4j7EkgQGdkUmAMvhg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2013-11-27 15:32 ` Grant Likely 2013-11-27 15:32 ` Grant Likely 2013-11-19 13:24 ` [PATCH 14/17] dt: Consolidate __dtb_start declarations in <linux/of_fdt.h> James Hogan 2013-11-19 13:24 ` James Hogan 2013-11-12 19:42 ` [PATCH RFC 16/17] c6x: Convert from _fdt_start to __dtb_start Geert Uytterhoeven [not found] ` <1384285347-13506-17-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> 2013-11-12 23:38 ` Mark Salter 2013-11-12 23:38 ` Mark Salter 2013-11-12 19:42 ` [PATCH 17/17] um: Remove unused declarations from <as-layout.h> Geert Uytterhoeven 2013-11-12 19:42 ` Geert Uytterhoeven 2013-11-12 19:51 ` Richard Weinberger 2013-11-12 19:51 ` Richard Weinberger 2013-11-12 19:52 ` Geert Uytterhoeven 2013-11-12 19:54 ` [PATCH 00/17] <asm/sections.h> related cleanups Geert Uytterhoeven 2013-11-12 19:56 ` [PATCH 1/2] openrisc: Use the declarations provided by <asm/sections.h> Geert Uytterhoeven 2013-11-12 19:56 ` Geert Uytterhoeven 2013-11-12 19:56 ` [PATCH 2/2] openrisc: Remove unused declaration of __initramfs_start Geert Uytterhoeven 2013-11-12 19:56 ` Geert Uytterhoeven 2013-11-13 5:25 ` [PATCH 00/17] <asm/sections.h> related cleanups Vineet Gupta 2013-11-20 18:55 ` [PATCH 06/17] frv: Remove unused declarations of __start___ex_table and __stop___ex_table David Howells 2013-11-20 18:56 ` [PATCH 04/17] mn10300: Use Kbuild logic to include <asm-generic/sections.h> David Howells 2013-11-20 18:56 ` David Howells
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1384859554-27268-5-git-send-email-geert@linux-m68k.org \ --to=geert-td1emuhucqxl1znqvxdv9g@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=microblaze-uclinux-rVRm/Wmeqae7NGdpmJTKYQ@public.gmane.org \ --cc=monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org \ --cc=rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).