GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/phoenix/Makefile.inc: Refactor repeated lines to a variable 

Rather than repeat the same line multiple times, save it in a variable
once and use that variable in the rest of the file.

TEST=timeless birman build identical

Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com>
Change-Id: I4eb262adb3bbda04add79b2e2b8bee9a609a1e5b
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76197
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
This commit is contained in:
Fred Reitberger 2023-06-30 13:44:14 -04:00 committed by Felix Held
parent 41a162b7a8
commit dbf1b63b11
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/soc/amd/phoenix/Makefile.inc
View File

@ -69,6 +69,9 @@ PHOENIX_FW_A_POSITION=$(call int-add, \
PHOENIX_FW_B_POSITION=$(call int-add, \ PHOENIX_FW_B_POSITION=$(call int-add, \
$(call get_fmap_value,FMAP_SECTION_FW_MAIN_B_START) $(AMD_FW_AB_POSITION)) $(call get_fmap_value,FMAP_SECTION_FW_MAIN_B_START) $(AMD_FW_AB_POSITION))
FMAP_FLASH_START=$(call get_fmap_value,FMAP_SECTION_FLASH_START)
# #
# PSP Directory Table items # PSP Directory Table items
# #
@ -132,16 +135,14 @@ PSP_BIOSBIN_DEST=$(shell $(READELF_bootblock) -Wl $(PSP_ELF_FILE) | grep LOAD |
# The flashmap section used for this is expected to be named RW_MRC_CACHE # The flashmap section used for this is expected to be named RW_MRC_CACHE
APOB_NV_SIZE=$(call get_fmap_value,FMAP_SECTION_RW_MRC_CACHE_SIZE) APOB_NV_SIZE=$(call get_fmap_value,FMAP_SECTION_RW_MRC_CACHE_SIZE)
APOB_NV_BASE=$(shell printf "%#x" $(call int-subtract, \ APOB_NV_BASE=$(shell printf "%#x" $(call int-subtract, \
$(call get_fmap_value,FMAP_SECTION_RW_MRC_CACHE_START) \ $(call get_fmap_value,FMAP_SECTION_RW_MRC_CACHE_START) $(FMAP_FLASH_START)))
$(call get_fmap_value,FMAP_SECTION_FLASH_START)))
ifeq ($(CONFIG_HAS_RECOVERY_MRC_CACHE),y) ifeq ($(CONFIG_HAS_RECOVERY_MRC_CACHE),y)
# On boards with recovery MRC cache, point type 0x63 entry to RECOVERY_MRC_CACHE. # On boards with recovery MRC cache, point type 0x63 entry to RECOVERY_MRC_CACHE.
# Else use RW_MRC_CACHE. This entry will be added in the RO section. # Else use RW_MRC_CACHE. This entry will be added in the RO section.
APOB_NV_RO_SIZE=$(call get_fmap_value,FMAP_SECTION_RECOVERY_MRC_CACHE_SIZE) APOB_NV_RO_SIZE=$(call get_fmap_value,FMAP_SECTION_RECOVERY_MRC_CACHE_SIZE)
APOB_NV_RO_BASE=$(shell printf "%#x" $(call int-subtract, \ APOB_NV_RO_BASE=$(shell printf "%#x" $(call int-subtract, \
$(call get_fmap_value,FMAP_SECTION_RECOVERY_MRC_CACHE_START) \ $(call get_fmap_value,FMAP_SECTION_RECOVERY_MRC_CACHE_START) $(FMAP_FLASH_START)))
$(call get_fmap_value,FMAP_SECTION_FLASH_START)))
else else
APOB_NV_RO_SIZE=$(APOB_NV_SIZE) APOB_NV_RO_SIZE=$(APOB_NV_SIZE)
APOB_NV_RO_BASE=$(APOB_NV_BASE) APOB_NV_RO_BASE=$(APOB_NV_BASE)
@ -165,11 +166,9 @@ endif # CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK
ifeq ($(CONFIG_SEPARATE_SIGNED_PSPFW),y) ifeq ($(CONFIG_SEPARATE_SIGNED_PSPFW),y)
SIGNED_AMDFW_A_POSITION=$(call int-subtract, \ SIGNED_AMDFW_A_POSITION=$(call int-subtract, \
$(call get_fmap_value,FMAP_SECTION_SIGNED_AMDFW_A_START) \ $(call get_fmap_value,FMAP_SECTION_SIGNED_AMDFW_A_START) $(FMAP_FLASH_START))
$(call get_fmap_value,FMAP_SECTION_FLASH_START))
SIGNED_AMDFW_B_POSITION=$(call int-subtract, \ SIGNED_AMDFW_B_POSITION=$(call int-subtract, \
$(call get_fmap_value,FMAP_SECTION_SIGNED_AMDFW_B_START) \ $(call get_fmap_value,FMAP_SECTION_SIGNED_AMDFW_B_START) $(FMAP_FLASH_START))
$(call get_fmap_value,FMAP_SECTION_FLASH_START))
SIGNED_AMDFW_A_FILE=$(obj)/amdfw_a.rom.signed SIGNED_AMDFW_A_FILE=$(obj)/amdfw_a.rom.signed
SIGNED_AMDFW_B_FILE=$(obj)/amdfw_b.rom.signed SIGNED_AMDFW_B_FILE=$(obj)/amdfw_b.rom.signed
endif # CONFIG_SEPARATE_SIGNED_PSPFW endif # CONFIG_SEPARATE_SIGNED_PSPFW