From: James Hogan <james.hogan@imgtec.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
<linux-arch@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Vineet Gupta <vgupta@synopsys.com>,
"Ralf Baechle" <ralf@linux-mips.org>,
Jonas Bonn <jonas@southpole.se>, Chris Zankel <chris@zankel.net>,
Rob Herring <rob.herring@calxeda.com>,
<devicetree@vger.kernel.org>,
linux-metag <linux-metag@vger.kernel.org>
Subject: Re: [PATCH 14/17] dt: Consolidate __dtb_start declarations in <linux/of_fdt.h>
Date: Tue, 19 Nov 2013 13:24:03 +0000 [thread overview]
Message-ID: <528B6673.3080309@imgtec.com> (raw)
In-Reply-To: <1384285347-13506-15-git-send-email-geert@linux-m68k.org>
On 12/11/13 19:42, Geert Uytterhoeven wrote:
> The different architectures used their own (and different) declarations:
>
> extern struct boot_param_header __dtb_start;
> extern u32 __dtb_start[];
> extern char __dtb_start[];
>
> Consolidate them using the first variant in <linux/of_fdt.h>.
> This requires adding a few "address of" operators on architectures where
> __dtb_start was an array before.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Jonas Bonn <jonas@southpole.se>
> CC: Chris Zankel <chris@zankel.net>
> Cc: Rob Herring <rob.herring@calxeda.com>
> Cc: devicetree@vger.kernel.org
Acked-by: James Hogan <james.hogan@imgtec.com>
Thanks
James
> ---
> arch/arc/include/asm/sections.h | 1 -
> arch/arc/kernel/setup.c | 2 +-
> arch/metag/kernel/setup.c | 6 +-----
> arch/mips/include/asm/mips-boards/generic.h | 4 ----
> arch/mips/lantiq/prom.h | 2 --
> arch/mips/netlogic/xlp/dt.c | 4 ++--
> arch/mips/ralink/of.c | 2 --
> arch/openrisc/kernel/setup.c | 2 +-
> arch/openrisc/kernel/vmlinux.h | 2 --
> arch/xtensa/kernel/setup.c | 3 +--
> include/linux/of_fdt.h | 3 +++
> 11 files changed, 9 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arc/include/asm/sections.h b/arch/arc/include/asm/sections.h
> index 764f1e3ba752..09db952e14bd 100644
> --- a/arch/arc/include/asm/sections.h
> +++ b/arch/arc/include/asm/sections.h
> @@ -12,6 +12,5 @@
> #include <asm-generic/sections.h>
>
> extern char __arc_dccm_base[];
> -extern char __dtb_start[];
>
> #endif
> diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
> index 643eae4436e0..ef705d0f50f5 100644
> --- a/arch/arc/kernel/setup.c
> +++ b/arch/arc/kernel/setup.c
> @@ -314,7 +314,7 @@ void setup_processor(void)
> void __init setup_arch(char **cmdline_p)
> {
> /* This also populates @boot_command_line from /bootargs */
> - machine_desc = setup_machine_fdt(__dtb_start);
> + machine_desc = setup_machine_fdt(&__dtb_start);
> if (!machine_desc)
> panic("Embedded DT invalid\n");
>
> diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c
> index 129c7cdda1ce..919c782f5479 100644
> --- a/arch/metag/kernel/setup.c
> +++ b/arch/metag/kernel/setup.c
> @@ -105,10 +105,6 @@
>
> extern char _heap_start[];
>
> -#ifdef CONFIG_METAG_BUILTIN_DTB
> -extern u32 __dtb_start[];
> -#endif
> -
> #ifdef CONFIG_DA_CONSOLE
> /* Our early channel based console driver */
> extern struct console dash_console;
> @@ -251,7 +247,7 @@ void __init setup_arch(char **cmdline_p)
> if (!machine_desc) {
> #ifdef CONFIG_METAG_BUILTIN_DTB
> /* try the embedded device tree */
> - machine_desc = setup_machine_fdt(__dtb_start);
> + machine_desc = setup_machine_fdt(&__dtb_start);
> if (!machine_desc)
> panic("Invalid embedded device tree.");
> #else
> diff --git a/arch/mips/include/asm/mips-boards/generic.h b/arch/mips/include/asm/mips-boards/generic.h
> index 48616816bcbc..c904c24550f6 100644
> --- a/arch/mips/include/asm/mips-boards/generic.h
> +++ b/arch/mips/include/asm/mips-boards/generic.h
> @@ -67,10 +67,6 @@
>
> extern int mips_revision_sconid;
>
> -#ifdef CONFIG_OF
> -extern struct boot_param_header __dtb_start;
> -#endif
> -
> #ifdef CONFIG_PCI
> extern void mips_pcibios_init(void);
> #else
> diff --git a/arch/mips/lantiq/prom.h b/arch/mips/lantiq/prom.h
> index 8e07b5f28ef1..bfd2d58c1d69 100644
> --- a/arch/mips/lantiq/prom.h
> +++ b/arch/mips/lantiq/prom.h
> @@ -26,6 +26,4 @@ struct ltq_soc_info {
> extern void ltq_soc_detect(struct ltq_soc_info *i);
> extern void ltq_soc_init(void);
>
> -extern struct boot_param_header __dtb_start;
> -
> #endif
> diff --git a/arch/mips/netlogic/xlp/dt.c b/arch/mips/netlogic/xlp/dt.c
> index 8316d5454b17..87250f378386 100644
> --- a/arch/mips/netlogic/xlp/dt.c
> +++ b/arch/mips/netlogic/xlp/dt.c
> @@ -42,7 +42,7 @@
> #include <asm/prom.h>
>
> extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[],
> - __dtb_xlp_fvp_begin[], __dtb_start[];
> + __dtb_xlp_fvp_begin[];
> static void *xlp_fdt_blob;
>
> void __init *xlp_dt_init(void *fdtp)
> @@ -66,7 +66,7 @@ void __init *xlp_dt_init(void *fdtp)
> #endif
> default:
> /* Pick a built-in if any, and hope for the best */
> - fdtp = __dtb_start;
> + fdtp = &__dtb_start;
> break;
> }
> }
> diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
> index eccc5526155e..615603bd8063 100644
> --- a/arch/mips/ralink/of.c
> +++ b/arch/mips/ralink/of.c
> @@ -28,8 +28,6 @@
> __iomem void *rt_sysc_membase;
> __iomem void *rt_memc_membase;
>
> -extern struct boot_param_header __dtb_start;
> -
> __iomem void *plat_of_remap_node(const char *node)
> {
> struct resource res;
> diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
> index 4fc7ccc0a2cf..c9b880d64bb8 100644
> --- a/arch/openrisc/kernel/setup.c
> +++ b/arch/openrisc/kernel/setup.c
> @@ -213,7 +213,7 @@ void __init or32_early_setup(void *fdt)
> if (fdt)
> pr_info("FDT at %p\n", fdt);
> else {
> - fdt = __dtb_start;
> + fdt = &__dtb_start;
> pr_info("Compiled-in FDT at %p\n", fdt);
> }
> early_init_devtree(fdt);
> diff --git a/arch/openrisc/kernel/vmlinux.h b/arch/openrisc/kernel/vmlinux.h
> index 70b9ce41835c..bbcdf21b0b35 100644
> --- a/arch/openrisc/kernel/vmlinux.h
> +++ b/arch/openrisc/kernel/vmlinux.h
> @@ -5,6 +5,4 @@
> extern char __initrd_start, __initrd_end;
> #endif
>
> -extern u32 __dtb_start[];
> -
> #endif
> diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
> index 6e2b6638122d..d96cf8f3fe70 100644
> --- a/arch/xtensa/kernel/setup.c
> +++ b/arch/xtensa/kernel/setup.c
> @@ -68,8 +68,7 @@ extern int initrd_below_start_ok;
> #endif
>
> #ifdef CONFIG_OF
> -extern u32 __dtb_start[];
> -void *dtb_start = __dtb_start;
> +void *dtb_start = &__dtb_start;
> #endif
>
> unsigned char aux_device_present;
> diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
> index 0beaee9dac1f..aabc49f3e403 100644
> --- a/include/linux/of_fdt.h
> +++ b/include/linux/of_fdt.h
> @@ -57,6 +57,9 @@ struct boot_param_header {
> __be32 dt_struct_size; /* size of the DT structure block */
> };
>
> +/* For kernels with a built-in device tree */
> +extern struct boot_param_header __dtb_start;
> +
> #if defined(CONFIG_OF_FLATTREE)
>
> struct device_node;
>
next prev parent reply other threads:[~2013-11-19 13:24 UTC|newest]
Thread overview: 74+ 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 21:23 ` Richard Henderson
2013-11-12 19:42 ` [PATCH 02/17] cris: " Geert Uytterhoeven
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 ` [PATCH 05/17] score: " 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
2013-11-12 19:42 ` [PATCH 08/17] microblaze: Remove _fdt_start casts 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 ` [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-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-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-13 5:41 ` Vineet Gupta
2013-11-13 15:51 ` Rob Herring
[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] ` < 20131121155348.66751C406A3@trevor.secretlab.ca>
[not found] ` < CAL_JsqJVteJuaD0PRMHSR9cVcMJTSNj4wXtYiftG=-pYSR9vsQ@mail.gmail.com>
2013-11-13 17:20 ` Geert Uytterhoeven
2013-11-13 17:34 ` Rob Herring
2013-11-13 18:40 ` Geert Uytterhoeven
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 ` [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
2013-11-19 11:12 ` [PATCH 4/9] metag: " Geert Uytterhoeven
2013-11-19 13:14 ` James Hogan
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 ` [PATCH 7/9] mips: Use NULL as the default DTB 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 13:27 ` [PATCH 1/9] dt: Handle passed/built-in DT selection in early_init_dt_scan() James Hogan
2013-11-20 20:50 ` Rob Herring
2013-11-21 12:21 ` Grant Likely
2013-11-21 12:23 ` Grant Likely
2013-11-21 12:33 ` Grant Likely
2013-11-21 13:42 ` Geert Uytterhoeven
2013-11-21 15:53 ` Grant Likely
2013-11-21 17:49 ` Geert Uytterhoeven
2013-11-27 15:32 ` Grant Likely
2013-11-21 17:38 ` Rob Herring
2013-11-21 17:42 ` Geert Uytterhoeven
2013-11-27 15:35 ` Grant Likely
2013-11-19 13:24 ` James Hogan [this message]
2013-11-12 19:42 ` [PATCH RFC 15/17] microblaze: Convert from _fdt_start to __dtb_start 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:21 ` Michal Simek
2013-11-13 16:14 ` Rob Herring
2013-11-14 16:29 ` Michal Simek
2013-11-12 19:42 ` [PATCH RFC 16/17] c6x: " Geert Uytterhoeven
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: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 ` [PATCH 2/2] openrisc: Remove unused declaration of __initramfs_start 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
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=528B6673.3080309@imgtec.com \
--to=james.hogan@imgtec.com \
--cc=akpm@linux-foundation.org \
--cc=chris@zankel.net \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=jonas@southpole.se \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-metag@vger.kernel.org \
--cc=ralf@linux-mips.org \
--cc=rob.herring@calxeda.com \
--cc=vgupta@synopsys.com \
/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: link
Be 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
Powered by JetHome