From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
Michal Simek <monstr@monstr.eu>,
Rob Herring <rob.herring@calxeda.com>,
microblaze-uclinux@itee.uq.edu.au, devicetree@vger.kernel.org
Subject: [PATCH RFC 15/17] microblaze: Convert from _fdt_start to __dtb_start
Date: Tue, 12 Nov 2013 20:42:25 +0100 [thread overview]
Message-ID: <1384285347-13506-16-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1384285347-13506-1-git-send-email-geert@linux-m68k.org>
Kill the microblaze-specific __fdt_blob section, and start using
.dtb.init.rodata from <asm-generic/sections.h> for built-in DTBs, like
most other DT enabled architectures.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: devicetree@vger.kernel.org
---
Untested, but the resulting vmlinux after "make simpleImage.system" looks
sane.
QUESTION: The padding of the DTB is gone, is this OK?
TODO: Start using the DTB logic in scripts/Makefile.lib instead of
arch/microblaze/boot/dts/linked_dtb.S
arch/microblaze/boot/Makefile | 2 +-
arch/microblaze/boot/dts/linked_dtb.S | 2 +-
arch/microblaze/include/asm/sections.h | 4 +---
arch/microblaze/kernel/head.S | 2 +-
arch/microblaze/kernel/setup.c | 4 ++--
arch/microblaze/kernel/vmlinux.lds.S | 8 --------
6 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
index 8e211cc28dac..e4a99a22dab8 100644
--- a/arch/microblaze/boot/Makefile
+++ b/arch/microblaze/boot/Makefile
@@ -23,7 +23,7 @@ quiet_cmd_cp = CP $< $@$2
quiet_cmd_strip = STRIP $@
cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \
- -K _fdt_start vmlinux -o $@
+ -K __dtb_start vmlinux -o $@
UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR)
diff --git a/arch/microblaze/boot/dts/linked_dtb.S b/arch/microblaze/boot/dts/linked_dtb.S
index 23345af3721f..bfc53b5795aa 100644
--- a/arch/microblaze/boot/dts/linked_dtb.S
+++ b/arch/microblaze/boot/dts/linked_dtb.S
@@ -1,2 +1,2 @@
-.section __fdt_blob,"a"
+.section .dtb.init.rodata,"a"
.incbin "arch/microblaze/boot/dts/system.dtb"
diff --git a/arch/microblaze/include/asm/sections.h b/arch/microblaze/include/asm/sections.h
index 1b281d3ea734..fb8ab0ba03fc 100644
--- a/arch/microblaze/include/asm/sections.h
+++ b/arch/microblaze/include/asm/sections.h
@@ -16,8 +16,6 @@
# ifndef __ASSEMBLY__
extern char _ssbss[], _esbss[];
extern unsigned long __ivt_start[], __ivt_end[];
-
-extern u32 _fdt_start[], _fdt_end[];
-
# endif /* !__ASSEMBLY__ */
+
#endif /* _ASM_MICROBLAZE_SECTIONS_H */
diff --git a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S
index 817b7eec95b6..6108889f0025 100644
--- a/arch/microblaze/kernel/head.S
+++ b/arch/microblaze/kernel/head.S
@@ -94,7 +94,7 @@ big_endian:
bnei r11, no_fdt_arg /* No - get out of here */
_prepare_copy_fdt:
or r11, r0, r0 /* incremment */
- ori r4, r0, TOPHYS(_fdt_start)
+ ori r4, r0, TOPHYS(__dtb_start)
ori r3, r0, (0x8000 - 4)
_copy_fdt:
lw r12, r7, r11 /* r12 = r7 + r11 */
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index 603e22fec6d5..a4534f584be0 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(_fdt_start);
+ early_init_devtree(&__dtb_start);
#ifdef CONFIG_EARLY_PRINTK
setup_early_printk(NULL);
@@ -152,7 +152,7 @@ void __init machine_early_init(const char *cmdline, unsigned int ram,
if (fdt)
pr_info("FDT at 0x%08x\n", fdt);
else
- pr_info("Compiled-in FDT at %p\n", _fdt_start);
+ pr_info("Compiled-in FDT at %p\n", &__dtb_start);
#ifdef CONFIG_MTD_UCLINUX
pr_info("Found romfs @ 0x%08x (0x%08x)\n",
diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S
index 936d01a689d7..2659e70984a3 100644
--- a/arch/microblaze/kernel/vmlinux.lds.S
+++ b/arch/microblaze/kernel/vmlinux.lds.S
@@ -40,14 +40,6 @@ SECTIONS {
_etext = . ;
}
- . = ALIGN (4) ;
- __fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) {
- _fdt_start = . ; /* place for fdt blob */
- *(__fdt_blob) ; /* Any link-placed DTB */
- . = _fdt_start + 0x8000; /* Pad up to 32kbyte */
- _fdt_end = . ;
- }
-
. = ALIGN(16);
RODATA
EXCEPTION_TABLE(16)
--
1.7.9.5
next prev parent reply other threads:[~2013-11-12 19:43 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] ` < CAL_JsqJVteJuaD0PRMHSR9cVcMJTSNj4wXtYiftG=-pYSR9vsQ@mail.gmail.com>
[not found] ` < 20131121155348.66751C406A3@trevor.secretlab.ca>
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 ` [PATCH 14/17] dt: Consolidate __dtb_start declarations in <linux/of_fdt.h> James Hogan
2013-11-12 19:42 ` Geert Uytterhoeven [this message]
2013-11-13 10:19 ` [PATCH RFC 15/17] microblaze: Convert from _fdt_start to __dtb_start 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=1384285347-13506-16-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=akpm@linux-foundation.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=microblaze-uclinux@itee.uq.edu.au \
--cc=monstr@monstr.eu \
--cc=rob.herring@calxeda.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;
as well as URLs for NNTP newsgroup(s).