Kapil Porwal has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/81051?usp=email )
Change subject: soc/intel/cmn/cse: Simplify logic to get CSE RW version ......................................................................
soc/intel/cmn/cse: Simplify logic to get CSE RW version
BUG=none TEST=Build and boot to google/screebo TEST=CSE RW version remains same with and without this change.
``` $ cbfstool image-screebo.bin extract -r FW_MAIN_A -n me_rw.version -f me_rw.version Found file me_rw.version at 0x81b40, type raw, compressed 12, size 12
$ hexdump -C me_rw.version 00000000 31 38 2e 30 2e 35 2e 32 31 30 37 0a |18.0.5.2107.| 0000000c ```
Signed-off-by: Kapil Porwal kapilporwal@google.com Change-Id: I86f2848788d0576a8fe3557fa8048e4162e61e05 --- M src/soc/intel/common/block/cse/Makefile.mk 1 file changed, 1 insertion(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/81051/1
diff --git a/src/soc/intel/common/block/cse/Makefile.mk b/src/soc/intel/common/block/cse/Makefile.mk index 653d674..50011ec 100644 --- a/src/soc/intel/common/block/cse/Makefile.mk +++ b/src/soc/intel/common/block/cse/Makefile.mk @@ -89,20 +89,8 @@ $(CSE_LITE_ME_RW)-compression := LZMA endif
-INPUT_FILE := $(call strip_quotes,$(CONFIG_SOC_INTEL_CSE_RW_FILE)) -TEMP_FILE := $(shell mktemp) -OFFSETS := 16 18 20 22 # Offsets for CSE version components -VERSIONS := CSE_VERSION_MAJOR CSE_VERSION_MINOR CSE_VERSION_HOTFIX CSE_VERSION_BUILD -INDEXES := $(shell seq 1 $(words $(OFFSETS))) - $(obj)/cse_rw.version: - $(foreach index,$(INDEXES), \ - $(shell dd if=$(INPUT_FILE) of=$(TEMP_FILE) bs=1 skip=$(word $(index),$(OFFSETS)) count=2 status=none) \ - $(eval $(word $(index),$(VERSIONS)) := $(shell printf "%d" 0x$(shell echo $(shell echo $(shell xxd -p $(TEMP_FILE)) | cut -c3-4)$(shell echo $(shell xxd -p $(TEMP_FILE)) | cut -c1-2))) ) \ - ) - rm -f $(TEMP_FILE) - $(eval CSE_RW_CBFS_VERSION := $(shell printf "%d.%d.%d.%d" $(CSE_VERSION_MAJOR)$(CSE_VERSION_MINOR)$(CSE_VERSION_HOTFIX)$(CSE_VERSION_BUILD))) - @echo '$(CSE_RW_CBFS_VERSION)' > $@ + @echo $(shell hexdump -s 16 -n 8 -e '4/2 "%d."' $(CSE_RW_FILE) | sed 's/.$$//') > $@
CSE_RW_VERSION = $(call strip_quotes,$(CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME)) regions-for-file-$(CSE_RW_VERSION) = FW_MAIN_A,FW_MAIN_B