From 53a43f14da0f7921eb338ee819a8391df93ab6da Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 20 Aug 2023 03:09:49 +0200 Subject: [PATCH] drivers/intel/fsp2/Makefile.inc: Deduplicate compression type checks When LZMA compression is selected, then it's not needed to check if LZ4 compression is selected in addition. So instead of handling both cases separately, check for LZ4 only if LZMA is not selected. This applies to the cases of both, FSP-M and FSP-S. Change-Id: I4ea61a38baf4c29bf522a50a26c6b47292e67960 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/77323 Reviewed-by: Frans Hendriks Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik --- src/drivers/intel/fsp2_0/Makefile.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc index bdfee9353b..756ba1ec5a 100644 --- a/src/drivers/intel/fsp2_0/Makefile.inc +++ b/src/drivers/intel/fsp2_0/Makefile.inc @@ -68,8 +68,7 @@ $(FSP_M_CBFS)-options := --xip $(TXTIBB) endif ifeq ($(CONFIG_FSP_COMPRESS_FSP_M_LZMA),y) $(FSP_M_CBFS)-compression := LZMA -endif -ifeq ($(CONFIG_FSP_COMPRESS_FSP_M_LZ4),y) +else ifeq ($(CONFIG_FSP_COMPRESS_FSP_M_LZ4),y) $(FSP_M_CBFS)-compression := LZ4 endif ifneq ($(CONFIG_FSP_ALIGNMENT_FSP_M),) @@ -81,8 +80,7 @@ $(FSP_S_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_S_FILE)) $(FSP_S_CBFS)-type := fsp ifeq ($(CONFIG_FSP_COMPRESS_FSP_S_LZMA),y) $(FSP_S_CBFS)-compression := LZMA -endif -ifeq ($(CONFIG_FSP_COMPRESS_FSP_S_LZ4),y) +else ifeq ($(CONFIG_FSP_COMPRESS_FSP_S_LZ4),y) $(FSP_S_CBFS)-compression := LZ4 endif ifneq ($(CONFIG_FSP_ALIGNMENT_FSP_S),)