[U-Boot] [PATCH] powerpc: Add support for CONFIG_OF_CONTROL
Jonathan Klee
klee.jonathan at gmail.com
Mon Apr 15 13:59:48 CEST 2013
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
More information about the U-Boot
mailing list