soc/amd/*/Makefile.inc: remove command line soc-name
The function has already moved to fw.cfg. 4/5 of split changes of https://review.coreboot.org/c/coreboot/+/58552/28 Change-Id: Idf9e491ed46ae574ccd17f24925e3e5c595039fa Signed-off-by: Zheng Bao <fishbaozi@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/72467 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
This commit is contained in:
parent
010cc99896
commit
21975e4a49
|
@ -210,7 +210,6 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \
|
||||||
$(OPT_EFS_SPI_SPEED) \
|
$(OPT_EFS_SPI_SPEED) \
|
||||||
$(OPT_EFS_SPI_MICRON_FLAG) \
|
$(OPT_EFS_SPI_MICRON_FLAG) \
|
||||||
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
||||||
--soc-name "Cezanne" \
|
|
||||||
--flashsize $(CONFIG_ROM_SIZE)
|
--flashsize $(CONFIG_ROM_SIZE)
|
||||||
|
|
||||||
$(obj)/amdfw.rom: $(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
|
$(obj)/amdfw.rom: $(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
|
||||||
|
|
|
@ -227,7 +227,6 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \
|
||||||
$(OPT_EFS_SPI_SPEED) \
|
$(OPT_EFS_SPI_SPEED) \
|
||||||
$(OPT_EFS_SPI_MICRON_FLAG) \
|
$(OPT_EFS_SPI_MICRON_FLAG) \
|
||||||
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
||||||
--soc-name "Glinda" \
|
|
||||||
--flashsize $(CONFIG_ROM_SIZE) \
|
--flashsize $(CONFIG_ROM_SIZE) \
|
||||||
$(OPT_RECOVERY_AB_SINGLE_COPY)
|
$(OPT_RECOVERY_AB_SINGLE_COPY)
|
||||||
|
|
||||||
|
|
|
@ -230,7 +230,6 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \
|
||||||
$(OPT_EFS_SPI_SPEED) \
|
$(OPT_EFS_SPI_SPEED) \
|
||||||
$(OPT_EFS_SPI_MICRON_FLAG) \
|
$(OPT_EFS_SPI_MICRON_FLAG) \
|
||||||
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
||||||
--soc-name "Mendocino" \
|
|
||||||
--flashsize $(CONFIG_ROM_SIZE) \
|
--flashsize $(CONFIG_ROM_SIZE) \
|
||||||
$(OPT_RECOVERY_AB_SINGLE_COPY)
|
$(OPT_RECOVERY_AB_SINGLE_COPY)
|
||||||
|
|
||||||
|
|
|
@ -229,7 +229,6 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \
|
||||||
$(OPT_EFS_SPI_SPEED) \
|
$(OPT_EFS_SPI_SPEED) \
|
||||||
$(OPT_EFS_SPI_MICRON_FLAG) \
|
$(OPT_EFS_SPI_MICRON_FLAG) \
|
||||||
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
||||||
--soc-name "Phoenix" \
|
|
||||||
--flashsize $(CONFIG_ROM_SIZE) \
|
--flashsize $(CONFIG_ROM_SIZE) \
|
||||||
$(OPT_RECOVERY_AB_SINGLE_COPY)
|
$(OPT_RECOVERY_AB_SINGLE_COPY)
|
||||||
|
|
||||||
|
|
|
@ -227,7 +227,6 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \
|
||||||
$(OPT_EFS_SPI_SPEED) \
|
$(OPT_EFS_SPI_SPEED) \
|
||||||
$(OPT_EFS_SPI_MICRON_FLAG) \
|
$(OPT_EFS_SPI_MICRON_FLAG) \
|
||||||
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
||||||
--soc-name "Picasso" \
|
|
||||||
--flashsize $(CONFIG_ROM_SIZE)
|
--flashsize $(CONFIG_ROM_SIZE)
|
||||||
|
|
||||||
$(obj)/amdfw.rom: $(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
|
$(obj)/amdfw.rom: $(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
|
||||||
|
|
|
@ -124,12 +124,10 @@ endif
|
||||||
|
|
||||||
ifeq ($(FIRMWARE_TYPE),ST)
|
ifeq ($(FIRMWARE_TYPE),ST)
|
||||||
OPT_COMBOCAPABLE=--combo-capable
|
OPT_COMBOCAPABLE=--combo-capable
|
||||||
OPT_SOCNAME=--soc-name "Stoneyridge"
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(FIRMWARE_TYPE),CZ)
|
ifeq ($(FIRMWARE_TYPE),CZ)
|
||||||
OPT_COMBOCAPABLE=--combo-capable
|
OPT_COMBOCAPABLE=--combo-capable
|
||||||
OPT_SOCNAME=--soc-name "Carrizo"
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_USE_PSPSECUREOS),y)
|
ifeq ($(CONFIG_USE_PSPSECUREOS),y)
|
||||||
|
@ -155,7 +153,6 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_STONEYRIDGE_XHCI_FWM_FILE)) \
|
||||||
$(OPT_EFS_SPI_READ_MODE) \
|
$(OPT_EFS_SPI_READ_MODE) \
|
||||||
$(OPT_EFS_SPI_SPEED) \
|
$(OPT_EFS_SPI_SPEED) \
|
||||||
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
--config $(CONFIG_AMDFW_CONFIG_FILE) \
|
||||||
$(OPT_SOCNAME) \
|
|
||||||
--flashsize $(CONFIG_ROM_SIZE) \
|
--flashsize $(CONFIG_ROM_SIZE) \
|
||||||
--location $(shell printf "0x%x" $(STONEYRIDGE_FWM_POSITION)) \
|
--location $(shell printf "0x%x" $(STONEYRIDGE_FWM_POSITION)) \
|
||||||
--output $@
|
--output $@
|
||||||
|
|
Loading…
Reference in New Issue