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 | |
| 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')
| -rw-r--r-- | common/spl/Kconfig | 6 | ||||
| -rw-r--r-- | common/spl/Makefile | 2 | ||||
| -rw-r--r-- | common/spl/spl.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 34f6fc2cfa..8a8a971a91 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1263,11 +1263,11 @@ config SPL_AM33XX_ENABLE_RTC32K_OSC Enable access to the AM33xx RTC and select the external 32kHz clock source. -config SPL_OPTEE - bool "Support OP-TEE Trusted OS" +config SPL_OPTEE_IMAGE + bool "Support OP-TEE Trusted OS image in SPL" depends on ARM help - OP-TEE is an open source Trusted OS which is loaded by SPL. + OP-TEE is an open source Trusted OS which is loaded by SPL. More detail at: https://github.com/OP-TEE/optee_os config SPL_OPENSBI diff --git a/common/spl/Makefile b/common/spl/Makefile index cb15c8e827..db8fd36a26 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -22,7 +22,7 @@ obj-$(CONFIG_$(SPL_TPL_)UBI) += spl_ubi.o obj-$(CONFIG_$(SPL_TPL_)NET) += spl_net.o obj-$(CONFIG_$(SPL_TPL_)MMC) += spl_mmc.o obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o -obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o +obj-$(CONFIG_$(SPL_TPL_)OPTEE_IMAGE) += spl_optee.o obj-$(CONFIG_$(SPL_TPL_)OPENSBI) += spl_opensbi.o obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o 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); |