From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 3/4] ARM Linux: Add device tree support
Date: Tue, 18 Oct 2011 13:56:58 +0200 [thread overview]
Message-ID: <1318939019-32713-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1318939019-32713-1-git-send-email-s.hauer@pengutronix.de>
If the user has parsed a tree, we start Linux using the
device tree, otherwise we use the traditional ATAG
mechanism.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/lib/armlinux.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index e3a74f4..d8ca477 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -36,6 +36,7 @@
#include <fcntl.h>
#include <errno.h>
#include <memory.h>
+#include <of.h>
#include <asm/byteorder.h>
#include <asm/setup.h>
@@ -209,8 +210,16 @@ void armlinux_set_serial(u64 serial)
void start_linux(void *adr, int swap, struct image_data *data)
{
void (*kernel)(int zero, int arch, void *params) = adr;
-
- setup_tags(data, swap);
+ void *params = NULL;
+#ifdef CONFIG_OFTREE
+ params = of_get_fixed_tree();
+ if (params)
+ printf("booting Linux kernel with devicetree\n");
+#endif
+ if (!params) {
+ setup_tags(data, swap);
+ params = armlinux_bootparams;
+ }
shutdown_barebox();
if (swap) {
@@ -220,5 +229,5 @@ void start_linux(void *adr, int swap, struct image_data *data)
__asm__ __volatile__("mcr p15, 0, %0, c1, c0" :: "r" (reg));
}
- kernel(0, armlinux_architecture, armlinux_bootparams);
+ kernel(0, armlinux_architecture, params);
}
--
1.7.7
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2011-10-18 11:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-18 11:56 [PATCH v2] devicetree support Sascha Hauer
2011-10-18 11:56 ` [PATCH 1/4] initial libfdt support Sascha Hauer
2011-10-18 14:39 ` Jean-Christophe PLAGNIOL-VILLARD
2011-10-18 11:56 ` [PATCH 2/4] initial oftree command support Sascha Hauer
2011-10-18 11:56 ` Sascha Hauer [this message]
2011-10-18 11:56 ` [PATCH 4/4] oftree: add fixup for memory nodes 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=1318939019-32713-4-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--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