From 5e9e7bff4b07cc23874ff07dd291ac09694baeca Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Sat, 11 Feb 2023 15:27:08 +0800 Subject: [PATCH] mb/amd/birman&mayan: Use relative address as EC FW location When the flash size is over 16M, the absolute address could be lager than 16M, which can not be taken by CBFS. For the relative address, it is more flexible. This is one of series of patches to support 32/64M flash. BUG=b:255374782 TEST=binary identical test on birman and mayan when CONFIG_BIRMAN_HAVE_MCHP_FW and CONFIG_MAYAN_HAVE_MCHP_FW are set as y. Change-Id: I65be3039cd3449bfb481ad87281b72e88a58bd45 Signed-off-by: Zheng Bao Reviewed-on: https://review.coreboot.org/c/coreboot/+/72960 Tested-by: build bot (Jenkins) Reviewed-by: Fred Reitberger --- src/mainboard/amd/birman/Makefile.inc | 7 +------ src/mainboard/amd/mayan/Makefile.inc | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/mainboard/amd/birman/Makefile.inc b/src/mainboard/amd/birman/Makefile.inc index 6255ff07c7..f4a5924555 100644 --- a/src/mainboard/amd/birman/Makefile.inc +++ b/src/mainboard/amd/birman/Makefile.inc @@ -21,14 +21,9 @@ ifeq ($(CONFIG_BIRMAN_HAVE_MCHP_FW),y) $(call add_intermediate, add_mchp_fw) $(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_BIRMAN_MCHP_SIG_FILE) --fill-upward -# calculate the absolute position from the config offset -BIRMAN_EC_POSITION=$(call int-add, \ - $(call int-subtract, 0xffffffff \ - $(CONFIG_ROM_SIZE)) $(CONFIG_BIRMAN_MCHP_FW_OFFSET) 1) - cbfs-files-y += apu/ecfw apu/ecfw-file := $(CONFIG_BIRMAN_MCHP_FW_FILE) -apu/ecfw-position := $(BIRMAN_EC_POSITION) +apu/ecfw-position := $(CONFIG_BIRMAN_MCHP_FW_OFFSET) apu/ecfw-type := raw else diff --git a/src/mainboard/amd/mayan/Makefile.inc b/src/mainboard/amd/mayan/Makefile.inc index 7f7da96293..08a73546a3 100644 --- a/src/mainboard/amd/mayan/Makefile.inc +++ b/src/mainboard/amd/mayan/Makefile.inc @@ -21,14 +21,9 @@ ifeq ($(CONFIG_MAYAN_HAVE_MCHP_FW),y) $(call add_intermediate, add_mchp_fw) $(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_MAYAN_MCHP_SIG_FILE) --fill-upward -# calculate the absolute position from the config offset -MAYAN_EC_POSITION=$(call int-add, \ - $(call int-subtract, 0xffffffff \ - $(CONFIG_ROM_SIZE)) $(CONFIG_MAYAN_MCHP_FW_OFFSET) 1) - cbfs-files-y += ec/ecfw ec/ecfw-file := $(CONFIG_MAYAN_MCHP_FW_FILE) -ec/ecfw-position := $(MAYAN_EC_POSITION) +ec/ecfw-position := $(CONFIG_MAYAN_MCHP_FW_OFFSET) ec/ecfw-type := raw else