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 <[email protected]> v1 -> v2: - made optee.config a fixed file instead of an option - added an warning to move the string variables to the new file format --- platforms/optee.in | 4 ---- rules/optee.make | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/platforms/optee.in b/platforms/optee.in index 371f5b237..eaf81ce2a 100644 --- a/platforms/optee.in +++ b/platforms/optee.in @@ -36,9 +36,5 @@ config OPTEE_PLATFORM_FLAVOUR config OPTEE_CFG string - prompt "OP-TEE CFG Flags" - help - Refer to the following file for the CFG_FLAGS: - https://github.com/OP-TEE/optee_os/blob/master/mk/config.mk endif diff --git a/rules/optee.make b/rules/optee.make index 8ddff64ec..7f624274c 100644 --- a/rules/optee.make +++ b/rules/optee.make @@ -26,6 +26,20 @@ 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, optee.config)) + +ifneq ($(call remove_quotes,$(PTXCONF_OPTEE_CFG)),) +$(OPTEE_CONFIG): + @echo + @echo "**************************************************************************************" + @echo "**** Please move the variables from OPTEE_CFG to optee.config file in platformdir ****" + @echo "**************************************************************************************" + @echo + @echo + @exit 1 +endif + # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -43,7 +57,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
