Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Merge the outstanding changes from the 'next' branch to master.
This commit is contained in:
Tom Rini
2025-10-06 13:20:24 -06:00
parent e50b1e8715 4e4a9de31d
commit 0eaa4b3373
490 changed files with 11756 additions and 8471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/optee/optee.c
View File

@@ -87,7 +87,7 @@ static int optee_copy_firmware_node(ofnode node, void *fdt_blob)
/* copy the compatible property */
prop = ofnode_get_property(node, "compatible", &len);
if (!prop) {
debug("missing OP-TEE compatible property");
debug("missing OP-TEE compatible property\n");
return -EINVAL;
}
@@ -98,7 +98,7 @@ static int optee_copy_firmware_node(ofnode node, void *fdt_blob)
/* copy the method property */
prop = ofnode_get_property(node, "method", &len);
if (!prop) {
debug("missing OP-TEE method property");
debug("missing OP-TEE method property\n");
return -EINVAL;
}
@@ -121,7 +121,7 @@ int optee_copy_fdt_nodes(void *new_blob)
/* only proceed if there is an /firmware/optee node */
node = ofnode_path("/firmware/optee");
if (!ofnode_valid(node)) {
debug("No OP-TEE firmware node in old fdt, nothing to do");
debug("No OP-TEE firmware node in old fdt, nothing to do\n");
return 0;
}
@@ -131,7 +131,7 @@ int optee_copy_fdt_nodes(void *new_blob)
* so do not interfere.
*/
if (fdt_path_offset(new_blob, "/firmware/optee") >= 0) {
debug("OP-TEE Device Tree node already exists in target");
debug("OP-TEE Device Tree node already exists in target\n");
return 0;
}