From: Alexander Shiyan <shc_work@mail.ru>
To: barebox@lists.infradead.org
Subject: [PATCH] ARM: Use armlinux_bootparams address for DTB
Date: Tue, 9 Jul 2013 16:56:40 +0400 [thread overview]
Message-ID: <1373374600-13856-1-git-send-email-shc_work@mail.ru> (raw)
In some cases, the address of the devicetree, which is obtained
dynamically, may be located in the kernel text area, which leads
to malfunction of the devicetree. The patch uses the address of
the devicetree, designed for the board, if it possible.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/lib/armlinux.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index 40a63ea..12fb06d 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -261,16 +261,20 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
unsigned long initrd_size, void *oftree)
{
void (*kernel)(int zero, int arch, void *params) = adr;
- void *params = NULL;
int architecture;
if (oftree) {
- printf("booting Linux kernel with devicetree\n");
- params = oftree;
- } else {
+ if (armlinux_bootparams) {
+ struct fdt_header *header = oftree;
+
+ printf("Relocate DTB to 0x%p\n", armlinux_bootparams);
+ memcpy(armlinux_bootparams, oftree,
+ fdt32_to_cpu(header->totalsize));
+ } else
+ armlinux_bootparams = oftree;
+ } else
setup_tags(initrd_address, initrd_size, swap);
- params = armlinux_bootparams;
- }
+
architecture = armlinux_get_architecture();
shutdown_barebox();
@@ -288,10 +292,10 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
"mov r2, %1\n"
"bx %2\n"
:
- : "r" (architecture), "r" (params), "r" (kernel)
+ : "r" (architecture), "r" (armlinux_bootparams), "r" (kernel)
: "r0", "r1", "r2"
);
#else
- kernel(0, architecture, params);
+ kernel(0, architecture, armlinux_bootparams);
#endif
}
--
1.8.1.5
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2013-07-09 12:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-09 12:56 Alexander Shiyan [this message]
2013-07-09 17:54 ` Sascha Hauer
2013-07-09 18:00 ` Alexander Shiyan
2013-07-09 18:11 ` Sascha Hauer
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=1373374600-13856-1-git-send-email-shc_work@mail.ru \
--to=shc_work@mail.ru \
--cc=barebox@lists.infradead.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: 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