From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 28 Nov 2023 09:37:34 +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 1r7tb3-00Bvu2-38 for lore@lore.pengutronix.de; Tue, 28 Nov 2023 09:37:34 +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 1r7tb4-00048z-Bu; Tue, 28 Nov 2023 09:37:34 +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 1r7taO-0002uU-R6; Tue, 28 Nov 2023 09:36:52 +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 1r7taO-00C8A3-EM; Tue, 28 Nov 2023 09:36:52 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1r7taO-004OGW-1E; Tue, 28 Nov 2023 09:36:52 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 28 Nov 2023 09:36:52 +0100 Message-Id: <20231128083652.1046524-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231122190525.2114139-1-a.fatoum@pengutronix.de> References: <20231122190525.2114139-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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 Thanks, applied as 1fa2e0b2aac3cc2eb109dc8a7e0cb8691a88f506. Michael [sent from post-receive hook] On Tue, 28 Nov 2023 09:36:52 +0100, Ahmad Fatoum wrote: > 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 > Message-Id: <20231122190525.2114139-1-a.fatoum@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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)) > > # ----------------------------------------------------------------------------