mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-06 11:30:47 +09:00
dm: Init device tree as well as driver model in SPL
If enabled, make sure that the device tree is available in SPL before setting up driver model. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
b2b0d3e712
commit
f3d46bd658
@ -151,6 +151,8 @@ static void spl_ram_load_image(void)
|
|||||||
void board_init_r(gd_t *dummy1, ulong dummy2)
|
void board_init_r(gd_t *dummy1, ulong dummy2)
|
||||||
{
|
{
|
||||||
u32 boot_device;
|
u32 boot_device;
|
||||||
|
int ret;
|
||||||
|
|
||||||
debug(">>spl:board_init_r()\n");
|
debug(">>spl:board_init_r()\n");
|
||||||
|
|
||||||
#if defined(CONFIG_SYS_SPL_MALLOC_START)
|
#if defined(CONFIG_SYS_SPL_MALLOC_START)
|
||||||
@ -161,9 +163,21 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
|
|||||||
gd->malloc_limit = CONFIG_SYS_MALLOC_F_LEN;
|
gd->malloc_limit = CONFIG_SYS_MALLOC_F_LEN;
|
||||||
gd->malloc_ptr = 0;
|
gd->malloc_ptr = 0;
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_SPL_DM
|
if (IS_ENABLED(CONFIG_OF_CONTROL) &&
|
||||||
dm_init_and_scan(true);
|
!IS_ENABLED(CONFIG_SPL_DISABLE_OF_CONTROL)) {
|
||||||
#endif
|
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
|
#ifndef CONFIG_PPC
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user