diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-18 05:15:23 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-18 05:15:23 +0300 |
| commit | fd8adc33b8f999cb09c3ba8ea8860ded28e8d6ca (patch) | |
| tree | 0928b768f2cf5951384fedb5aa25ce9260a6d6b2 /common | |
| parent | 14b254b5f5a841e1227e3667cf94fbcdadaf720e (diff) | |
| parent | 677dac23d8ebfc0342f903aeee2a75e737fd4d7e (diff) | |
| download | u-boot-fd8adc33b8f999cb09c3ba8ea8860ded28e8d6ca.tar.xz | |
Merge tag 'dm-pull-14nov19' of git://git.denx.de/u-boot-dm
Add OP-TEE test swuit
Fix patman cc_file output
Minor sandbox/pinctrl changes
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-fdt.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c index 4247dcee0c..48388488d9 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -17,6 +17,7 @@ #include <linux/libfdt.h> #include <mapmem.h> #include <asm/io.h> +#include <tee/optee.h> #ifndef CONFIG_SYS_FDT_PAD #define CONFIG_SYS_FDT_PAD 0x3000 @@ -561,6 +562,13 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, } } + fdt_ret = optee_copy_fdt_nodes(gd->fdt_blob, blob); + if (fdt_ret) { + printf("ERROR: transfer of optee nodes to new fdt failed: %s\n", + fdt_strerror(fdt_ret)); + goto err; + } + /* Delete the old LMB reservation */ if (lmb) lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob, |