From cbc5081436f4b719a648e4701c7322da0628375d Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 15 Nov 2023 12:17:50 +0100 Subject: [PATCH] [review] tree wide: CFG_INSECURE deprecates CFG_WARN_INSECURE Refines sanity tests CFG_WARN_INSECURE. Signed-off-by: Etienne Carriere --- mk/config.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mk/config.mk b/mk/config.mk index ef174c2a9c5..b6a149db3f8 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -919,12 +919,16 @@ $(eval $(call cfg-enable-all-depends,CFG_REGULATOR_FIXED, \ # they've finalized implementing stubbed functionality (see OP-TEE # documentation/Porting guidelines) as well as vendor specific security # configuration. -CFG_INSECURE ?= y - +# # CFG_WARN_INSECURE served the same purpose as CFG_INSECURE but is deprecated. -ifneq (,$(CFG_WARN_INSECURE)) -$(error CFG_WARN_INSECURE is deprecated, please use CFG_INSECURE instead) +ifneq (undefined,$(flavor CFG_WARN_INSECURE)) +$(info WARNING: CFG_WARN_INSECURE is deprecated, use CFG_INSECURE instead) +CFG_INSECURE ?= $(CFG_WARN_INSECURE) +ifneq ($(CFG_INSECURE),$(CFG_WARN_INSECURE)) +$(error Inconsistent CFG_INSECURE=$(CFG_INSECURE) and CFG_WARN_INSECURE=$(CFG_WARN_INSECURE)) endif +endif # CFG_WARN_INSECURE defined +CFG_INSECURE ?= y # Enables warnings for declarations mixed with statements CFG_WARN_DECL_AFTER_STATEMENT ?= y