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

soc/amd/*/Makefile.inc: Use _tohex instead of printf 

Use the _tohex function to convert values to hex instead of 'shell
printf'

TEST=timeless builds identical for grunt,dalboz,guybrush,chausie,birman

Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com>
Change-Id: Ic7f7d1b764479088cc0980b208d8d603bc712832
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76314
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
This commit is contained in:
Fred Reitberger 2023-07-05 15:43:19 -04:00
parent 8b42a05fed
commit e66ce2f418
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/soc/amd/cezanne/Makefile.inc
View File

@ -219,7 +219,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
$(OPT_APOB_NV_BASE) \ $(OPT_APOB_NV_BASE) \
$(OPT_VERSTAGE_FILE) \ $(OPT_VERSTAGE_FILE) \
$(OPT_VERSTAGE_SIG_FILE) \ $(OPT_VERSTAGE_SIG_FILE) \
--location $(shell printf "%#x" $(CEZANNE_FWM_POSITION)) \ --location $(call _tohex,$(CEZANNE_FWM_POSITION)) \
--multilevel \ --multilevel \
--output $@ --output $@
@ -236,7 +236,7 @@ $(obj)/amdfw_a.rom: $(obj)/amdfw.rom
$(AMDFW_COMMON_ARGS) \ $(AMDFW_COMMON_ARGS) \
$(OPT_APOB_NV_SIZE) \ $(OPT_APOB_NV_SIZE) \
$(OPT_APOB_NV_BASE) \ $(OPT_APOB_NV_BASE) \
--location $(shell printf "%#x" $(CEZANNE_FW_A_POSITION)) \ --location $(call _tohex,$(CEZANNE_FW_A_POSITION)) \
--anywhere \ --anywhere \
--multilevel \ --multilevel \
--output $@ --output $@
@ -248,7 +248,7 @@ $(obj)/amdfw_b.rom: $(obj)/amdfw.rom
$(AMDFW_COMMON_ARGS) \ $(AMDFW_COMMON_ARGS) \
$(OPT_APOB_NV_SIZE) \ $(OPT_APOB_NV_SIZE) \
$(OPT_APOB_NV_BASE) \ $(OPT_APOB_NV_BASE) \
--location $(shell printf "%#x" $(CEZANNE_FW_B_POSITION)) \ --location $(call _tohex,$(CEZANNE_FW_B_POSITION)) \
--anywhere \ --anywhere \
--multilevel \ --multilevel \
--output $@ --output $@

6
src/soc/amd/glinda/Makefile.inc
View File

@ -238,7 +238,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
$(OPT_VERSTAGE_FILE) \ $(OPT_VERSTAGE_FILE) \
$(OPT_VERSTAGE_SIG_FILE) \ $(OPT_VERSTAGE_SIG_FILE) \
$(OPT_SPL_TABLE_FILE) \ $(OPT_SPL_TABLE_FILE) \
--location $(shell printf "%#x" $(GLINDA_FWM_POSITION)) \ --location $(call _tohex,$(GLINDA_FWM_POSITION)) \
--output $@ --output $@
$(PSP_BIOSBIN_FILE): $(PSP_ELF_FILE) $(AMDCOMPRESS) $(PSP_BIOSBIN_FILE): $(PSP_ELF_FILE) $(AMDCOMPRESS)
@ -257,7 +257,7 @@ $(obj)/amdfw_a.rom: $(obj)/amdfw.rom
$(OPT_SPL_RW_AB_TABLE_FILE) \ $(OPT_SPL_RW_AB_TABLE_FILE) \
$(OPT_SIGNED_AMDFW_A_POSITION) \ $(OPT_SIGNED_AMDFW_A_POSITION) \
$(OPT_SIGNED_AMDFW_A_FILE) \ $(OPT_SIGNED_AMDFW_A_FILE) \
--location $(shell printf "%#x" $(GLINDA_FW_A_POSITION)) \ --location $(call _tohex,$(GLINDA_FW_A_POSITION)) \
--anywhere \ --anywhere \
--output $@ --output $@
@ -271,7 +271,7 @@ $(obj)/amdfw_b.rom: $(obj)/amdfw.rom
$(OPT_SPL_RW_AB_TABLE_FILE) \ $(OPT_SPL_RW_AB_TABLE_FILE) \
$(OPT_SIGNED_AMDFW_B_POSITION) \ $(OPT_SIGNED_AMDFW_B_POSITION) \
$(OPT_SIGNED_AMDFW_B_FILE) \ $(OPT_SIGNED_AMDFW_B_FILE) \
--location $(shell printf "%#x" $(GLINDA_FW_B_POSITION)) \ --location $(call _tohex,$(GLINDA_FW_B_POSITION)) \
--anywhere \ --anywhere \
--output $@ --output $@

10
src/soc/amd/mendocino/Makefile.inc
View File

@ -262,7 +262,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
$(OPT_VERSTAGE_SIG_FILE) \ $(OPT_VERSTAGE_SIG_FILE) \
$(OPT_SPL_TABLE_FILE) \ $(OPT_SPL_TABLE_FILE) \
$(OPT_MANIFEST) \ $(OPT_MANIFEST) \
--location $(shell printf "%#x" $(MENDOCINO_FWM_POSITION)) \ --location $(call _tohex,$(MENDOCINO_FWM_POSITION)) \
--output $@ --output $@
ifeq ($(CONFIG_CBFS_VERIFICATION)$(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK),yy) ifeq ($(CONFIG_CBFS_VERIFICATION)$(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK),yy)
@ -288,8 +288,8 @@ $(obj)/amdfw_a.rom: $(obj)/amdfw.rom
$(OPT_SIGNED_AMDFW_A_POSITION) \ $(OPT_SIGNED_AMDFW_A_POSITION) \
$(OPT_SIGNED_AMDFW_A_FILE) \ $(OPT_SIGNED_AMDFW_A_FILE) \
$(OPT_PSP_LOAD_MP2_FW) \ $(OPT_PSP_LOAD_MP2_FW) \
--location $(shell printf "%#x" $(MENDOCINO_FW_A_POSITION)) \ --location $(call _tohex,$(MENDOCINO_FW_A_POSITION)) \
--body-location $(shell printf "%#x" $$(($(MENDOCINO_FW_A_POSITION) + $(MENDOCINO_FW_BODY_OFFSET)))) \ --body-location $(call _tohex,$$(($(MENDOCINO_FW_A_POSITION) + $(MENDOCINO_FW_BODY_OFFSET)))) \
--anywhere \ --anywhere \
--output $@ --output $@
@ -304,8 +304,8 @@ $(obj)/amdfw_b.rom: $(obj)/amdfw.rom
$(OPT_SIGNED_AMDFW_B_POSITION) \ $(OPT_SIGNED_AMDFW_B_POSITION) \
$(OPT_SIGNED_AMDFW_B_FILE) \ $(OPT_SIGNED_AMDFW_B_FILE) \
$(OPT_PSP_LOAD_MP2_FW) \ $(OPT_PSP_LOAD_MP2_FW) \
--location $(shell printf "%#x" $(MENDOCINO_FW_B_POSITION)) \ --location $(call _tohex,$(MENDOCINO_FW_B_POSITION)) \
--body-location $(shell printf "%#x" $$(($(MENDOCINO_FW_B_POSITION) + $(MENDOCINO_FW_BODY_OFFSET)))) \ --body-location $(call _tohex,$$(($(MENDOCINO_FW_B_POSITION) + $(MENDOCINO_FW_BODY_OFFSET)))) \
--anywhere \ --anywhere \
--output $@ --output $@

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

@ -134,14 +134,14 @@ PSP_BIOSBIN_DEST=$(shell $(READELF_bootblock) -Wl $(PSP_ELF_FILE) | grep LOAD |
# type = 0x63 - construct APOB NV base/size from flash map # type = 0x63 - construct APOB NV base/size from flash map
# 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=$(call _tohex,$(call int-subtract, \
$(call get_fmap_value,FMAP_SECTION_RW_MRC_CACHE_START) $(FMAP_FLASH_START))) $(call get_fmap_value,FMAP_SECTION_RW_MRC_CACHE_START) $(FMAP_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=$(call _tohex,$(call int-subtract, \
$(call get_fmap_value,FMAP_SECTION_RECOVERY_MRC_CACHE_START) $(FMAP_FLASH_START))) $(call get_fmap_value,FMAP_SECTION_RECOVERY_MRC_CACHE_START) $(FMAP_FLASH_START)))
else else
APOB_NV_RO_SIZE=$(APOB_NV_SIZE) APOB_NV_RO_SIZE=$(APOB_NV_SIZE)
@ -263,7 +263,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
$(OPT_VERSTAGE_FILE) \ $(OPT_VERSTAGE_FILE) \
$(OPT_VERSTAGE_SIG_FILE) \ $(OPT_VERSTAGE_SIG_FILE) \
$(OPT_SPL_TABLE_FILE) \ $(OPT_SPL_TABLE_FILE) \
--location $(shell printf "%#x" $(PHOENIX_FWM_POSITION)) \ --location $(call _tohex,$(PHOENIX_FWM_POSITION)) \
--output $@ --output $@
ifeq ($(CONFIG_AMDFW_SPLIT),y) ifeq ($(CONFIG_AMDFW_SPLIT),y)
@ -288,7 +288,7 @@ $(obj)/amdfw_a.rom: $(obj)/amdfw.rom
$(OPT_SPL_RW_AB_TABLE_FILE) \ $(OPT_SPL_RW_AB_TABLE_FILE) \
$(OPT_SIGNED_AMDFW_A_POSITION) \ $(OPT_SIGNED_AMDFW_A_POSITION) \
$(OPT_SIGNED_AMDFW_A_FILE) \ $(OPT_SIGNED_AMDFW_A_FILE) \
--location $(shell printf "%#x" $(PHOENIX_FW_A_POSITION)) \ --location $(call _tohex,$(PHOENIX_FW_A_POSITION)) \
--anywhere \ --anywhere \
--output $@ --output $@
@ -302,7 +302,7 @@ $(obj)/amdfw_b.rom: $(obj)/amdfw.rom
$(OPT_SPL_RW_AB_TABLE_FILE) \ $(OPT_SPL_RW_AB_TABLE_FILE) \
$(OPT_SIGNED_AMDFW_B_POSITION) \ $(OPT_SIGNED_AMDFW_B_POSITION) \
$(OPT_SIGNED_AMDFW_B_FILE) \ $(OPT_SIGNED_AMDFW_B_FILE) \
--location $(shell printf "%#x" $(PHOENIX_FW_B_POSITION)) \ --location $(call _tohex,$(PHOENIX_FW_B_POSITION)) \
--anywhere \ --anywhere \
--output $@ --output $@

6
src/soc/amd/picasso/Makefile.inc
View File

@ -236,7 +236,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
$(OPT_APOB0_NV_BASE) \ $(OPT_APOB0_NV_BASE) \
$(OPT_VERSTAGE_FILE) \ $(OPT_VERSTAGE_FILE) \
$(OPT_VERSTAGE_SIG_FILE) \ $(OPT_VERSTAGE_SIG_FILE) \
--location $(shell printf "%#x" $(PICASSO_FWM_POSITION)) \ --location $(call _tohex,$(PICASSO_FWM_POSITION)) \
--output $@ --output $@
$(PSP_BIOSBIN_FILE): $(PSP_ELF_FILE) $(AMDCOMPRESS) $(PSP_BIOSBIN_FILE): $(PSP_ELF_FILE) $(AMDCOMPRESS)
@ -252,7 +252,7 @@ $(obj)/amdfw_a.rom: $(obj)/amdfw.rom
$(AMDFW_COMMON_ARGS) \ $(AMDFW_COMMON_ARGS) \
$(OPT_APOB_NV_SIZE) \ $(OPT_APOB_NV_SIZE) \
$(OPT_APOB_NV_BASE) \ $(OPT_APOB_NV_BASE) \
--location $(shell printf "%#x" $(PICASSO_FW_A_POSITION)) \ --location $(call _tohex,$(PICASSO_FW_A_POSITION)) \
--anywhere \ --anywhere \
--output $@ --output $@
@ -263,7 +263,7 @@ $(obj)/amdfw_b.rom: $(obj)/amdfw.rom
$(AMDFW_COMMON_ARGS) \ $(AMDFW_COMMON_ARGS) \
$(OPT_APOB_NV_SIZE) \ $(OPT_APOB_NV_SIZE) \
$(OPT_APOB_NV_BASE) \ $(OPT_APOB_NV_BASE) \
--location $(shell printf "%#x" $(PICASSO_FW_B_POSITION)) \ --location $(call _tohex,$(PICASSO_FW_B_POSITION)) \
--anywhere \ --anywhere \
--output $@ --output $@

2
src/soc/amd/stoneyridge/Makefile.inc
View File

@ -137,7 +137,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_STONEYRIDGE_XHCI_FWM_FILE)) \
$(OPT_DEBUG_AMDFWTOOL) \ $(OPT_DEBUG_AMDFWTOOL) \
--config $(CONFIG_AMDFW_CONFIG_FILE) \ --config $(CONFIG_AMDFW_CONFIG_FILE) \
--flashsize $(CONFIG_ROM_SIZE) \ --flashsize $(CONFIG_ROM_SIZE) \
--location $(shell printf "0x%x" $(STONEYRIDGE_FWM_POSITION)) \ --location $(call _tohex,$(STONEYRIDGE_FWM_POSITION)) \
--output $@ --output $@
ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y) ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y)