From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 22 Nov 2023 20:05:49 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1r5sXk-004jmC-2d for lore@lore.pengutronix.de; Wed, 22 Nov 2023 20:05:49 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1r5sXl-0006FU-6E; Wed, 22 Nov 2023 20:05:49 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r5sXR-0006F0-5E; Wed, 22 Nov 2023 20:05:29 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r5sXQ-00AsAh-PE; Wed, 22 Nov 2023 20:05:28 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1r5sXQ-008rzw-23; Wed, 22 Nov 2023 20:05:28 +0100 From: Ahmad Fatoum To: ptxdist@pengutronix.de Date: Wed, 22 Nov 2023 20:05:24 +0100 Message-Id: <20231122190525.2114139-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 1/2] optee: support empty OPTEE_PLATFORM_FLAVOUR X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Ahmad Fatoum Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Some platforms like the stm32mp, support PLATFORM_FLAVOR to be empty and extract the information from other variables, e.g. CFG_EMBED_DTB_SOURCE_FILE. Support this use case by skipping appending of -$(OPTEE_PLATFORM_FLAVOUR) to the PLATFORM= variable whenever empty. Signed-off-by: Ahmad Fatoum --- rules/optee.make | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rules/optee.make b/rules/optee.make index 11ec68a0ef0e..a3735dc0f605 100644 --- a/rules/optee.make +++ b/rules/optee.make @@ -33,12 +33,16 @@ OPTEE_DEVPKG := NO OPTEE_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) +OPTEE_PLATFORM := $(call remove_quotes,$(PTXCONF_OPTEE_PLATFORM)) +OPTEE_PLATFORM_FLAVOUR := $(call remove_quotes,$(PTXCONF_OPTEE_PLATFORM_FLAVOUR)) +OPTEE_PLATFORM_FLAVOUR := $(if $(OPTEE_PLATFORM_FLAVOUR),-$(OPTEE_PLATFORM_FLAVOUR)) + OPTEE_CONF_TOOL := NO OPTEE_MAKE_ENV += \ PATH=$(CROSS_PATH) \ CROSS_COMPILE=$(COMPILER_PREFIX) \ $(call ptx/ifdef,PTXCONF_ARCH_ARM64,CFG_ARM64_core=y) \ - PLATFORM=$(call remove_quotes,$(PTXCONF_OPTEE_PLATFORM))-$(call remove_quotes,$(PTXCONF_OPTEE_PLATFORM_FLAVOUR)) \ + PLATFORM=$(OPTEE_PLATFORM)$(OPTEE_PLATFORM_FLAVOUR) \ $(call remove_quotes,$(PTXCONF_OPTEE_CFG)) # ---------------------------------------------------------------------------- -- 2.39.2