From 2f707374d04fd52432ca21aefcc556eedade3245 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Thu, 29 Jun 2023 16:39:53 -0500 Subject: [PATCH] Makefile.inc: relocate get_fmap_value() here from soc/intel/common/block/cse Move this function to the root Makefile.inc since other Makefiles use the exact same function call. Will allow for deduplication in AMD SoC Makefiles in a follow-on commit. Change-Id: I56a50e21b27a4cd6ce1a08a3aea338c63322a6b2 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/76167 Reviewed-by: Fred Reitberger Reviewed-by: Julius Werner Reviewed-by: Eric Lai Tested-by: build bot (Jenkins) --- Makefile.inc | 2 ++ src/soc/intel/common/block/cse/Makefile.inc | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc b/Makefile.inc index ab57abd4ce..9a34c61f6c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -146,6 +146,7 @@ $(foreach supported_arch,$(ARCH_SUPPORTED), \ # tolower: returns the value in all lowercase # toupper: returns the value in all uppercase # ws_to_under: returns the value with any whitespace changed to underscores +# get_fmap_value returns the value of a given FMAP field from fmap_config.h _toint=$(shell printf "%d" $1) _tohex=$(shell printf 0x"%x" $1) _int-add2=$(shell expr $(call _toint,$1) + $(call _toint,$2)) @@ -165,6 +166,7 @@ file-size=$(strip $(shell wc -c "$1" | cut -f 1 -d ' ')) tolower=$(shell echo '$1' | tr '[:upper:]' '[:lower:]') toupper=$(shell echo '$1' | tr '[:lower:]' '[:upper:]') ws_to_under=$(shell echo '$1' | tr ' \t' '_') +get_fmap_value=$(shell awk '$$2 == "$1" {print $$3}' $(obj)/fmap_config.h) ####################################################################### # Helper functions for ramstage postprocess diff --git a/src/soc/intel/common/block/cse/Makefile.inc b/src/soc/intel/common/block/cse/Makefile.inc index 3e1127957d..ad15dc4f94 100644 --- a/src/soc/intel/common/block/cse/Makefile.inc +++ b/src/soc/intel/common/block/cse/Makefile.inc @@ -24,7 +24,6 @@ endif CSE_FPT_INPUT=$(call cse_input_path,$(CONFIG_CSE_FPT_FILE)) CSE_DATA_INPUT=$(call cse_input_path,$(CONFIG_CSE_DATA_FILE)) -get_fmap_value=$(shell awk '$$2 == "$1" {print $$3}' $(obj)/fmap_config.h) get_cse_region_offset=$(call int-subtract,$(call get_fmap_value,$(1)) $(CSE_LAYOUT_OFFSET)) CSE_LAYOUT_OFFSET=$(call get_fmap_value,FMAP_SECTION_CSE_LAYOUT_START)