diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:45 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:45 +0100 |
| commit | 801119922cb086ea7fc9f9194253a180d40581cb (patch) | |
| tree | db40f3a353c683ef16b771f11450e689fab32393 /common/Kconfig | |
| parent | d69b7f3d693887c755671bffab677362f4e4a0b6 (diff) | |
| parent | af1a0da42f9493b2d4266580b15d52946b326ca7 (diff) | |
| download | barebox-801119922cb086ea7fc9f9194253a180d40581cb.tar.gz barebox-801119922cb086ea7fc9f9194253a180d40581cb.tar.xz | |
Merge branch 'for-next/optee'
Diffstat (limited to 'common/Kconfig')
| -rw-r--r-- | common/Kconfig | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/common/Kconfig b/common/Kconfig index 82bbdb3145..02ef3631e0 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -640,27 +640,6 @@ config BOOTM_FORCE_SIGNED_IMAGES are refused to boot. Effectively this means only FIT images can be booted since they are the only supported image type that support signing. -config BOOTM_OPTEE - bool - prompt "support booting OP-TEE" - depends on BOOTM && ARM - help - OP-TEE is a trusted execution environment (TEE). With this option - enabled barebox supports starting optee_os as part of the bootm command. - Instead of the kernel bootm starts the optee_os binary which then starts - the kernel in nonsecure mode. Pass the optee_os binary with the -t option - or in the global.bootm.tee variable. - -config BOOTM_OPTEE_SIZE - hex - default 0x02000000 - prompt "OP-TEE Memory Size" - depends on BOOTM_OPTEE - help - Size to reserve in main memory for OP-TEE. - Can be smaller than the actual size used by OP-TEE, this is used to prevent - barebox from allocating memory in this area. - config BLSPEC depends on FLEXIBLE_BOOTARGS depends on !SHELL_NONE @@ -1001,6 +980,39 @@ config MACHINE_ID Note: if no hashable information is available no machine id will be passed to the kernel. +menu "OP-TEE loading" + +config OPTEE_SIZE + hex + default 0x02000000 + prompt "OP-TEE Memory Size" + depends on BOOTM_OPTEE || PBL_OPTEE + help + Size to reserve in main memory for OP-TEE. + Can be smaller than the actual size used by OP-TEE, this is used to prevent + barebox from allocating memory in this area. + +config BOOTM_OPTEE + bool + prompt "support booting OP-TEE" + depends on BOOTM && ARM + help + OP-TEE is a trusted execution environment (TEE). With this option + enabled barebox supports starting optee_os as part of the bootm command. + Instead of the kernel bootm starts the optee_os binary which then starts + the kernel in nonsecure mode. Pass the optee_os binary with the -t option + or in the global.bootm.tee variable. + +config PBL_OPTEE + bool "Enable OP-TEE early start" + depends on ARM + depends on !THUMB2_BAREBOX + help + Allows starting OP-TEE during lowlevel initialization of the PBL. + Requires explicit support in the boards lowlevel file. + +endmenu + endmenu menu "Debugging" |