[S] Change in coreboot[master]: soc/amd/*/Makefile.inc: remove command line soc-name

[Fred Reitberger (Code Review)]

Fred Reitberger has submitted this change. ( https://review.coreboot.org/c/coreboot/+/72467 )

Change subject: soc/amd/*/Makefile.inc: remove command line soc-name
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72467
Tested-by: build bot (Jenkins) 
Reviewed-by: Fred Reitberger 
---
M src/soc/amd/cezanne/Makefile.inc
M src/soc/amd/glinda/Makefile.inc
M src/soc/amd/mendocino/Makefile.inc
M src/soc/amd/phoenix/Makefile.inc
M src/soc/amd/picasso/Makefile.inc
M src/soc/amd/stoneyridge/Makefile.inc
6 files changed, 18 insertions(+), 8 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Fred Reitberger: Looks good to me, approved

diff --git a/src/soc/amd/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.inc
index a8474e2..808c1e8 100644
--- a/src/soc/amd/cezanne/Makefile.inc
+++ b/src/soc/amd/cezanne/Makefile.inc
@@ -210,7 +210,6 @@
    	$(OPT_EFS_SPI_SPEED) \
    	$(OPT_EFS_SPI_MICRON_FLAG) \
    	--config $(CONFIG_AMDFW_CONFIG_FILE) \
-		--soc-name "Cezanne" \
    	--flashsize $(CONFIG_ROM_SIZE)

$(obj)/amdfw.rom:	$(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
diff --git a/src/soc/amd/glinda/Makefile.inc b/src/soc/amd/glinda/Makefile.inc
index ef0d27d..2fc7a9c 100644
--- a/src/soc/amd/glinda/Makefile.inc
+++ b/src/soc/amd/glinda/Makefile.inc
@@ -227,7 +227,6 @@
    	$(OPT_EFS_SPI_SPEED) \
    	$(OPT_EFS_SPI_MICRON_FLAG) \
    	--config $(CONFIG_AMDFW_CONFIG_FILE) \
-		--soc-name "Glinda" \
    	--flashsize $(CONFIG_ROM_SIZE) \
    	$(OPT_RECOVERY_AB_SINGLE_COPY)

diff --git a/src/soc/amd/mendocino/Makefile.inc b/src/soc/amd/mendocino/Makefile.inc
index 1dc0773..0679a54 100644
--- a/src/soc/amd/mendocino/Makefile.inc
+++ b/src/soc/amd/mendocino/Makefile.inc
@@ -230,7 +230,6 @@
    	$(OPT_EFS_SPI_SPEED) \
    	$(OPT_EFS_SPI_MICRON_FLAG) \
    	--config $(CONFIG_AMDFW_CONFIG_FILE) \
-		--soc-name "Mendocino" \
    	--flashsize $(CONFIG_ROM_SIZE) \
    	$(OPT_RECOVERY_AB_SINGLE_COPY)

diff --git a/src/soc/amd/phoenix/Makefile.inc b/src/soc/amd/phoenix/Makefile.inc
index de465a2..a1e8765 100644
--- a/src/soc/amd/phoenix/Makefile.inc
+++ b/src/soc/amd/phoenix/Makefile.inc
@@ -229,7 +229,6 @@
    	$(OPT_EFS_SPI_SPEED) \
    	$(OPT_EFS_SPI_MICRON_FLAG) \
    	--config $(CONFIG_AMDFW_CONFIG_FILE) \
-		--soc-name "Phoenix" \
    	--flashsize $(CONFIG_ROM_SIZE) \
    	$(OPT_RECOVERY_AB_SINGLE_COPY)

diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index e7ed68e..e00784d 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -227,7 +227,6 @@
    	$(OPT_EFS_SPI_SPEED) \
    	$(OPT_EFS_SPI_MICRON_FLAG) \
    	--config $(CONFIG_AMDFW_CONFIG_FILE) \
-		--soc-name "Picasso" \
    	--flashsize $(CONFIG_ROM_SIZE)

$(obj)/amdfw.rom:	$(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index 17867eb..4d427a3 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -124,12 +124,10 @@

ifeq ($(FIRMWARE_TYPE),ST)
 OPT_COMBOCAPABLE=--combo-capable
-OPT_SOCNAME=--soc-name "Stoneyridge"
 endif

ifeq ($(FIRMWARE_TYPE),CZ)
 OPT_COMBOCAPABLE=--combo-capable
-OPT_SOCNAME=--soc-name "Carrizo"
 endif

ifeq ($(CONFIG_USE_PSPSECUREOS),y)
@@ -155,7 +153,6 @@
    	$(OPT_EFS_SPI_READ_MODE) \
    	$(OPT_EFS_SPI_SPEED) \
    	--config $(CONFIG_AMDFW_CONFIG_FILE) \
-		$(OPT_SOCNAME) \
    	--flashsize $(CONFIG_ROM_SIZE) \
    	--location $(shell printf "0x%x" $(STONEYRIDGE_FWM_POSITION)) \
    	--output	$@