leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-usb

Browse Source
This commit is contained in:
Tom Rini
2018-08-24 16:11:01 -04:00
parent 8b7f04f14a 49c752c93a
commit 15fd1b7903
19 changed files with 713 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-rockchip/rk3188-board-spl.c
View File

@@ -49,7 +49,7 @@ u32 spl_boot_device(void)
debug("node=%d\n", node);
goto fallback;
}
ret = device_get_global_by_of_offset(node, &dev);
ret = device_get_global_by_ofnode(offset_to_ofnode(node), &dev);
if (ret) {
debug("device at node %s/%d not found: %d\n", bootdev, node,
ret);

2
arch/arm/mach-rockchip/rk3288-board-spl.c
View File

@@ -51,7 +51,7 @@ u32 spl_boot_device(void)
debug("node=%d\n", node);
goto fallback;
}
ret = device_get_global_by_of_offset(node, &dev);
ret = device_get_global_by_ofnode(offset_to_ofnode(node), &dev);
if (ret) {
debug("device at node %s/%d not found: %d\n", bootdev, node,
ret);

11
arch/sandbox/dts/test.dts
View File

@@ -61,6 +61,17 @@
reg = <2 1>;
};
bind-test {
bind-test-child1 {
compatible = "sandbox,phy";
#phy-cells = <1>;
};
bind-test-child2 {
compatible = "simple-bus";
};
};
b-test {
reg = <3 1>;
compatible = "denx,u-boot-fdt-test";