[U-Boot] [PATCH 18/29] dm: Init device tree as well as driver model in SPL
Simon Glass
sjg at chromium.org
Sat Feb 28 06:06:42 CET 2015
If enabled, make sure that the device tree is available in SPL before
setting up driver model.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
common/spl/spl.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index c655332..1e263b3 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -139,6 +139,8 @@ static void spl_ram_load_image(void)
void board_init_r(gd_t *dummy1, ulong dummy2)
{
u32 boot_device;
+ int ret;
+
debug(">>spl:board_init_r()\n");
#if defined(CONFIG_SYS_SPL_MALLOC_START)
@@ -149,9 +151,21 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
gd->malloc_limit = CONFIG_SYS_MALLOC_F_LEN;
gd->malloc_ptr = 0;
#endif
-#ifdef CONFIG_SPL_DM
- dm_init_and_scan(true);
-#endif
+ if (IS_ENABLED(CONFIG_OF_CONTROL) &&
+ !IS_ENABLED(CONFIG_SPL_DISABLE_OF_CONTROL)) {
+ ret = fdtdec_setup();
+ if (ret) {
+ debug("fdtdec_setup() returned error %d\n", ret);
+ hang();
+ }
+ }
+ if (IS_ENABLED(CONFIG_SPL_DM)) {
+ ret = dm_init_and_scan(true);
+ if (ret) {
+ debug("dm_init_and_scan() returned error %d\n", ret);
+ hang();
+ }
+ }
#ifndef CONFIG_PPC
/*
--
2.2.0.rc0.207.ga3a616c
More information about the U-Boot
mailing list