diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-05 17:16:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-05 17:16:23 -0400 |
| commit | 7240e1b8f94a56db88a2af688cad27e2e6545302 (patch) | |
| tree | 00e07de1f4b83cf96f183b881e80cd273dabd892 /common/spl/spl.c | |
| parent | 50c84208ad50a27382c64af911abba4510a8b608 (diff) | |
| parent | c3ef4550a2c439e9726205769d4381ed7e7fbc3d (diff) | |
Merge branch '2021-10-05-general-updates'
- Assorted OPTEE cleanups
- pinctrl, gpio improvements, assorted livetree migrations
- Assorted pytest improvements
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index ed94d5146c..a9304d4148 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -776,7 +776,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_invoke_atf(&spl_image); break; #endif -#if CONFIG_IS_ENABLED(OPTEE) +#if CONFIG_IS_ENABLED(OPTEE_IMAGE) case IH_OS_TEE: debug("Jumping to U-Boot via OP-TEE\n"); spl_board_prepare_for_optee(spl_image.fdt_addr); |