public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Jonathan Klee <klee.jonathan@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] powerpc: Add support for CONFIG_OF_CONTROL
Date: Mon, 15 Apr 2013 13:59:48 +0200	[thread overview]
Message-ID: <1366027188-6385-2-git-send-email-klee.jonathan@gmail.com> (raw)
In-Reply-To: <1366027188-6385-1-git-send-email-klee.jonathan@gmail.com>

Allow a device tree to be provided through the standard mechanisms.

Tests have been made using CONFIG_OF_SEPERATE on a MPC8378 board.
---
 arch/powerpc/lib/board.c |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 422b4a3..3a9a6ce 100644
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -26,6 +26,8 @@
 #include <command.h>
 #include <malloc.h>
 #include <stdio_dev.h>
+#include <libfdt.h>
+#include <fdtdec.h>
 #ifdef CONFIG_8xx
 #include <mpc8xx.h>
 #endif
@@ -124,6 +126,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 extern ulong __init_end;
 extern ulong __bss_end;
+extern ulong __stop___ex_table;
 ulong monitor_flash_len;
 
 #if defined(CONFIG_CMD_BEDBUG)
@@ -255,6 +258,21 @@ int init_func_watchdog_reset(void)
  * Initialization sequence
  */
 
+#ifdef CONFIG_OF_CONTROL
+int find_fdt(void)
+{
+#ifdef CONFIG_OF_EMBED
+	/* get a pointer to the FDT */
+	gd->fdt_blob = _binary_dt_dtb_start;
+#elif defined CONFIG_OF_SEPARATE
+	gd->fdt_blob = (void *)&__stop___ex_table;
+#endif
+	gd->fdt_blob = (void *)getenv_ulong("fdtcontroladdr", 16,
+						(uintptr_t)gd->fdt_blob);
+	return 0;
+}
+#endif
+
 static init_fnc_t *init_sequence[] = {
 #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
 	probecpu,
@@ -321,6 +339,10 @@ static init_fnc_t *init_sequence[] = {
 #endif
 	INIT_FUNC_WATCHDOG_RESET
 	init_func_ram,
+#ifdef CONFIG_OF_CONTROL
+	find_fdt,
+	fdtdec_check_fdt,
+#endif
 #if defined(CONFIG_SYS_DRAM_TEST)
 	testdram,
 #endif /* CONFIG_SYS_DRAM_TEST */
-- 
1.7.10.4

  reply	other threads:[~2013-04-15 11:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-15 11:59 [U-Boot] [PATCH] powerpc: CONFIG_OF_CONTROL support Jonathan Klee
2013-04-15 11:59 ` Jonathan Klee [this message]
2013-04-16  5:01   ` [U-Boot] [PATCH] powerpc: Add support for CONFIG_OF_CONTROL Simon Glass

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=1366027188-6385-2-git-send-email-klee.jonathan@gmail.com \
    --to=klee.jonathan@gmail.com \
    --cc=u-boot@lists.denx.de \
    /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