qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: root: fix reloc condition error '||' => '&&' 

Fixes: (930ceb1 driver: core/input: treat 'u-boot,dm-spl' as 'u-boot,dm-pre-reloc')

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie0dad067451bc35ade865fbd9e52f43d0ec83aab
This commit is contained in:
Joseph Chen 2019-12-03 12:39:59 +08:00
parent 8226ac627b
commit b455f42c3d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/core/root.c
View File

@ -225,7 +225,7 @@ static int dm_scan_fdt_live(struct udevice *parent,
for (np = node_parent->child; np; np = np->sibling) {
if (pre_reloc_only &&
#ifdef CONFIG_USING_KERNEL_DTB
(!of_find_property(np, "u-boot,dm-pre-reloc", NULL) ||
(!of_find_property(np, "u-boot,dm-pre-reloc", NULL) &&
!of_find_property(np, "u-boot,dm-spl", NULL)))
#else
!of_find_property(np, "u-boot,dm-pre-reloc", NULL))