diff options
author | Tom Rini <trini@konsulko.com> | 2020-04-20 17:22:47 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-04-20 17:22:47 -0400 |
commit | a06375805917a5b48c46724ceef4a1cd04935992 (patch) | |
tree | 45bba4e4fb8332c55324efaf96e46e6cbd8f4d93 /drivers/tee/optee/core.c | |
parent | e4837da7828293ea49abc579f939c0f5c4b127c3 (diff) | |
parent | 48180e15d3eaff51b1da30a90bc64b7acba8fb51 (diff) | |
download | u-boot-WIP/20Apr2020.tar.gz |
Merge branch '2020-04-17-master-imports'WIP/20Apr2020
- Further cleanups for 'make refcheckdocs'
- Another BTRFS fix.
- Support for automatic decompression of images with booti as well as
unlz4 command for manual decompression.
Diffstat (limited to 'drivers/tee/optee/core.c')
-rw-r--r-- | drivers/tee/optee/core.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 9fb5e658f9..5260dab3ac 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -512,7 +512,7 @@ static bool is_optee_api(optee_invoke_fn *invoke_fn) res.a2 == OPTEE_MSG_UID_2 && res.a3 == OPTEE_MSG_UID_3; } -static void print_os_revision(optee_invoke_fn *invoke_fn) +static void print_os_revision(struct udevice *dev, optee_invoke_fn *invoke_fn) { union { struct arm_smccc_res smccc; @@ -527,11 +527,12 @@ static void print_os_revision(optee_invoke_fn *invoke_fn) &res.smccc); if (res.result.build_id) - debug("OP-TEE revision %lu.%lu (%08lx)\n", res.result.major, - res.result.minor, res.result.build_id); + dev_info(dev, "OP-TEE: revision %lu.%lu (%08lx)\n", + res.result.major, res.result.minor, + res.result.build_id); else - debug("OP-TEE revision %lu.%lu\n", res.result.major, - res.result.minor); + dev_info(dev, "OP-TEE: revision %lu.%lu\n", + res.result.major, res.result.minor); } static bool api_revision_is_compatible(optee_invoke_fn *invoke_fn) @@ -626,7 +627,7 @@ static int optee_probe(struct udevice *dev) return -ENOENT; } - print_os_revision(pdata->invoke_fn); + print_os_revision(dev, pdata->invoke_fn); if (!api_revision_is_compatible(pdata->invoke_fn)) { debug("%s: OP-TEE api revision mismatch\n", __func__); |