diff mbox series

rockchip: px30: remove CONFIG_OPTEE support

Message ID 20200107085939.23235-1-kever.yang@rock-chips.com
State Accepted
Commit 3c176ea7cef3de1e047d2572cd5bcc0171b97338
Headers show
Series rockchip: px30: remove CONFIG_OPTEE support | expand

Commit Message

Kever Yang Jan. 7, 2020, 8:59 a.m. UTC
Rockchip use CONFIG_SPL_OPTEE for OPTEE support, which is load and run
before U-Boot, but not use CONFIG_OPTEE which is after U-Boot.

Signed-off-by: Kever Yang <kever.yang at rock-chips.com>
---

 configs/evb-px30_defconfig     | 1 -
 configs/firefly-px30_defconfig | 1 -
 2 files changed, 2 deletions(-)

Comments

Heiko Stübner Jan. 27, 2020, 8:43 a.m. UTC | #1
Hi Kever,

Am Dienstag, 7. Januar 2020, 09:59:39 CET schrieb Kever Yang:
> Rockchip use CONFIG_SPL_OPTEE for OPTEE support, which is load and run
> before U-Boot, but not use CONFIG_OPTEE which is after U-Boot.
> 
> Signed-off-by: Kever Yang <kever.yang at rock-chips.com>

I see you applied this to the Rockchip custodian tree and I would
like to ask you to revert that.

SPL_OPTEE is only useful on boards that want to jump directly into
OPTEE from SPL, like the rk3228 currently does.

CONFIG_OPTEE on the other hand enables the functionality to claim
the correct regions of ram in the kernel DT.

When OPTEE loads it will reserve its memory regions as "reserved-memory"
but of course only in the DT provided through the SPL. So when U-Boot
loads a kernel+separate DT it will not know about them and may access them.

The functionality provided by CONFIG_OPTEE will transfer the reserved
areas from the SPL-DT to the kernel-DT to make sure we don't run into
security exceptions later on.

So please reenable CONFIG_OPTEE for px30

Thanks
Heiko


> ---
> 
>  configs/evb-px30_defconfig     | 1 -
>  configs/firefly-px30_defconfig | 1 -
>  2 files changed, 2 deletions(-)
> 
> diff --git a/configs/evb-px30_defconfig b/configs/evb-px30_defconfig
> index d83cc6f4db..912ea95223 100644
> --- a/configs/evb-px30_defconfig
> +++ b/configs/evb-px30_defconfig
> @@ -90,7 +90,6 @@ CONFIG_DEBUG_UART_SHIFT=2
>  CONFIG_DEBUG_UART_SKIP_INIT=y
>  CONFIG_SOUND=y
>  CONFIG_SYSRESET=y
> -CONFIG_OPTEE=y
>  CONFIG_DM_THERMAL=y
>  CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
> diff --git a/configs/firefly-px30_defconfig b/configs/firefly-px30_defconfig
> index e24f1cf8c8..2bfe9e6fc6 100644
> --- a/configs/firefly-px30_defconfig
> +++ b/configs/firefly-px30_defconfig
> @@ -95,7 +95,6 @@ CONFIG_DEBUG_UART_SHIFT=2
>  CONFIG_DEBUG_UART_SKIP_INIT=y
>  CONFIG_SOUND=y
>  CONFIG_SYSRESET=y
> -CONFIG_OPTEE=y
>  CONFIG_DM_THERMAL=y
>  CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>
diff mbox series

Patch

diff --git a/configs/evb-px30_defconfig b/configs/evb-px30_defconfig
index d83cc6f4db..912ea95223 100644
--- a/configs/evb-px30_defconfig
+++ b/configs/evb-px30_defconfig
@@ -90,7 +90,6 @@  CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
-CONFIG_OPTEE=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/firefly-px30_defconfig b/configs/firefly-px30_defconfig
index e24f1cf8c8..2bfe9e6fc6 100644
--- a/configs/firefly-px30_defconfig
+++ b/configs/firefly-px30_defconfig
@@ -95,7 +95,6 @@  CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
-CONFIG_OPTEE=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y