[ptxdist] [PATCH] optee: switch optee cfg string to config file

[ptxdist] [PATCH] optee: switch optee cfg string to config file

[Michael Grzeschik]

The current situation of one string containing all config options in one
line is nearly impossible to handle inside of the BSPs platformconfig.
Every change in that line makes the diff heavy to parse for differences.

This patch is switching the rule to load one config file
that contains a list of set config variables instead of that
one bulky line.

Just like barebox and kernel the optee config will be located in the
platformdir and be named as optee.config as default.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
 platforms/optee.in | 5 +++--
 rules/optee.make   | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/platforms/optee.in b/platforms/optee.in
index 371f5b237..2c567b78a 100644
--- a/platforms/optee.in
+++ b/platforms/optee.in
@@ -34,9 +34,10 @@ config OPTEE_PLATFORM_FLAVOUR
 	  Platform Flavour for the selected platform, i.e. mx6qsabresd for the
 	  imx platform.
 
-config OPTEE_CFG
+config OPTEE_CONFIG
 	string
-	prompt "OP-TEE CFG Flags"
+	prompt "OP-TEE CFG File"
+	default "optee.config"
 	help
 	  Refer to the following file for the CFG_FLAGS:
 	  https://github.com/OP-TEE/optee_os/blob/master/mk/config.mk
diff --git a/rules/optee.make b/rules/optee.make
index 8ddff64ec..8c5b963fb 100644
--- a/rules/optee.make
+++ b/rules/optee.make
@@ -26,6 +26,9 @@ OPTEE_DIR	:= $(BUILDDIR)/$(OPTEE)
 OPTEE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause
 OPTEE_DEVPKG	:= NO
 
+OPTEE_CONFIG	:= $(call ptx/in-platformconfigdir, \
+			$(call remove_quotes, $(PTXCONF_OPTEE_CONFIG)))
+
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
@@ -43,7 +46,7 @@ OPTEE_MAKE_ENV += \
 	CROSS_COMPILE=$(COMPILER_PREFIX) \
 	$(call ptx/ifdef,PTXCONF_ARCH_ARM64,CFG_ARM64_core=y) \
 	PLATFORM=$(OPTEE_PLATFORM)$(OPTEE_PLATFORM_FLAVOUR) \
-	$(call remove_quotes,$(PTXCONF_OPTEE_CFG))
+	CFG_OPTEE_CONFIG=$(OPTEE_CONFIG)
 
 # ----------------------------------------------------------------------------
 # Install
-- 
2.39.5