[DistroKit] [PATCH] reason: make OP-TEE override truly v7a-specific

[DistroKit] [PATCH] reason: make OP-TEE override truly v7a-specific

[Ahmad Fatoum]

QA tool complains that optee_disable_features doesn't apply when running
the check against non-v7a platforms.

To fix this, move the override into a v7a-specific file and include
that conditionally.

Suggested-by: Jan Lübbe <j.luebbe@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/bsp.ref              | 14 ++------------
 configs/platform-v7a/bsp.ref | 12 ++++++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 configs/platform-v7a/bsp.ref

diff --git a/configs/bsp.ref b/configs/bsp.ref
index 2f64107ef52a..680148dbe129 100644
--- a/configs/bsp.ref
+++ b/configs/bsp.ref
@@ -1,5 +1,7 @@
 includes:
   - file: ptxdist.ref
+  - file: platform-v7a/bsp.ref
+    condition: kconfig.have_optee_config() and kconfig.OPTEEConfig()['CFG_STM32MP13']
 
 ptxdist_debug_pci:
   description: |
@@ -33,18 +35,6 @@ kernel_initrd:
       value: True
     - value: False
 
-optee_disabled_features:
-  description: |
-    OP-TEE is used as secure monitor on STM32MP13x providing power
-    management and clock/reset control support. We don't use it as
-    part of a trusted boot setup, so we prefer debuggability over
-    reduction of the attack surface.
-  condition: kconfig.have_optee_config() and kconfig.OPTEEConfig()['CFG_STM32MP13']
-  present:
-    - CFG_DEBUG_INFO
-    - CFG_ENABLE_EMBEDDED_TESTS
-    - CFG_TEE_CORE_TA_TRACE
-
 barebox_arm_optimized_string_functions:
   description: |
     The use of assembler optimized memcpy / memset functions improves
diff --git a/configs/platform-v7a/bsp.ref b/configs/platform-v7a/bsp.ref
new file mode 100644
index 000000000000..169e555df53a
--- /dev/null
+++ b/configs/platform-v7a/bsp.ref
@@ -0,0 +1,12 @@
+optee_disabled_features:
+  description: |
+    OP-TEE is used as secure monitor on STM32MP13x providing power
+    management and clock/reset control support. We don't use it as
+    part of a trusted boot setup, so we prefer debuggability over
+    reduction of the attack surface.
+  present:
+    - CFG_DEBUG_INFO
+    - CFG_ENABLE_EMBEDDED_TESTS
+    - CFG_TEE_CORE_TA_TRACE
+
+# vim: filetype=yaml shiftwidth=2 expandtab
-- 
2.39.2

Re: [DistroKit] [PATCH] reason: make OP-TEE override truly v7a-specific

[Robert Schwebel]

Applied to next.

On Thu, Aug 15, 2024 at 04:06:18PM +0200, Ahmad Fatoum wrote:
> QA tool complains that optee_disable_features doesn't apply when running
> the check against non-v7a platforms.
> 
> To fix this, move the override into a v7a-specific file and include
> that conditionally.
> 
> Suggested-by: Jan Lübbe <j.luebbe@pengutronix.de>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  configs/bsp.ref              | 14 ++------------
>  configs/platform-v7a/bsp.ref | 12 ++++++++++++
>  2 files changed, 14 insertions(+), 12 deletions(-)
>  create mode 100644 configs/platform-v7a/bsp.ref
> 
> diff --git a/configs/bsp.ref b/configs/bsp.ref
> index 2f64107ef52a..680148dbe129 100644
> --- a/configs/bsp.ref
> +++ b/configs/bsp.ref
> @@ -1,5 +1,7 @@
>  includes:
>    - file: ptxdist.ref
> +  - file: platform-v7a/bsp.ref
> +    condition: kconfig.have_optee_config() and kconfig.OPTEEConfig()['CFG_STM32MP13']
>  
>  ptxdist_debug_pci:
>    description: |
> @@ -33,18 +35,6 @@ kernel_initrd:
>        value: True
>      - value: False
>  
> -optee_disabled_features:
> -  description: |
> -    OP-TEE is used as secure monitor on STM32MP13x providing power
> -    management and clock/reset control support. We don't use it as
> -    part of a trusted boot setup, so we prefer debuggability over
> -    reduction of the attack surface.
> -  condition: kconfig.have_optee_config() and kconfig.OPTEEConfig()['CFG_STM32MP13']
> -  present:
> -    - CFG_DEBUG_INFO
> -    - CFG_ENABLE_EMBEDDED_TESTS
> -    - CFG_TEE_CORE_TA_TRACE
> -
>  barebox_arm_optimized_string_functions:
>    description: |
>      The use of assembler optimized memcpy / memset functions improves
> diff --git a/configs/platform-v7a/bsp.ref b/configs/platform-v7a/bsp.ref
> new file mode 100644
> index 000000000000..169e555df53a
> --- /dev/null
> +++ b/configs/platform-v7a/bsp.ref
> @@ -0,0 +1,12 @@
> +optee_disabled_features:
> +  description: |
> +    OP-TEE is used as secure monitor on STM32MP13x providing power
> +    management and clock/reset control support. We don't use it as
> +    part of a trusted boot setup, so we prefer debuggability over
> +    reduction of the attack surface.
> +  present:
> +    - CFG_DEBUG_INFO
> +    - CFG_ENABLE_EMBEDDED_TESTS
> +    - CFG_TEE_CORE_TA_TRACE
> +
> +# vim: filetype=yaml shiftwidth=2 expandtab
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |