[coreboot-gerrit] [S] Change in coreboot[master]: Revert "soc/amd: Add amdfw.rom in coreboot.pre"

[Bao Zheng (Code Review)]

Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Zheng Bao, Fred Reitberger, Felix Held.

Hello Zheng Bao,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/70312

to review the following change.

Change subject: Revert "soc/amd: Add amdfw.rom in coreboot.pre"
......................................................................

Revert "soc/amd: Add amdfw.rom in coreboot.pre"

This reverts commit 8d66fb1a7056961aaa8874d8d9001716c9a61c1b.

Change-Id: Ifbfb3c88c4407fe57f30660f24208d73937f03f8
Signed-off-by: Zheng Bao 
---
M src/soc/amd/cezanne/Makefile.inc
M src/soc/amd/common/Makefile.inc
M src/soc/amd/mendocino/Makefile.inc
M src/soc/amd/morgana/Makefile.inc
M src/soc/amd/picasso/Makefile.inc
5 files changed, 32 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/70312/1

diff --git a/src/soc/amd/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.inc
index 1f2bb6d..5a1c4e1 100644
--- a/src/soc/amd/cezanne/Makefile.inc
+++ b/src/soc/amd/cezanne/Makefile.inc
@@ -273,6 +273,11 @@
    	--output $@

+cbfs-files-y += apu/amdfw
+apu/amdfw-file := $(obj)/amdfw.rom
+apu/amdfw-position := $(CEZANNE_FWM_POSITION)
+apu/amdfw-type := raw
+
 ifeq ($(CONFIG_VBOOT_SLOTS_RW_A)$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),yy)
 cbfs-files-y += apu/amdfw_a
 apu/amdfw_a-file := $(obj)/amdfw_a.rom
diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc
index f047a59..96ea192 100644
--- a/src/soc/amd/common/Makefile.inc
+++ b/src/soc/amd/common/Makefile.inc
@@ -15,18 +15,6 @@

amd_microcode_bins += $(wildcard ${FIRMWARE_LOCATION}/*UcodePatch_*.bin)

-ifeq ($(CONFIG_RESET_VECTOR_IN_RAM),y)
-$(objcbfs)/bootblock.bin: $(obj)/amdfw.rom
-	cp $< $@
-
-add_bootblock = \
-	$(CBFSTOOL) $(1) add -f $(2) -n apu/amdfw -t amdfw \
-	-b $(call int-add, \
-	$(call int-subtract, 0xffffffff \
-	$(call int-shift-left, \
-	0x80000 $(CONFIG_AMD_FWM_POSITION_INDEX))) 0x20000 1)
-endif # ifeq ($(CONFIG_RESET_VECTOR_IN_RAM),y)
-
 ifeq ($(CONFIG_VBOOT_GSCVD),y)
 build_complete:: $(AMDFWREAD)

diff --git a/src/soc/amd/mendocino/Makefile.inc b/src/soc/amd/mendocino/Makefile.inc
index 92c75f8..30d20f7 100644
--- a/src/soc/amd/mendocino/Makefile.inc
+++ b/src/soc/amd/mendocino/Makefile.inc
@@ -304,6 +304,11 @@
    	--output $@

+cbfs-files-y += apu/amdfw
+apu/amdfw-file := $(obj)/amdfw.rom
+apu/amdfw-position := $(MENDOCINO_FWM_POSITION)
+apu/amdfw-type := raw
+
 ifeq ($(CONFIG_VBOOT_SLOTS_RW_A)$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),yy)
 cbfs-files-y += apu/amdfw_a
 apu/amdfw_a-file := $(obj)/amdfw_a.rom
diff --git a/src/soc/amd/morgana/Makefile.inc b/src/soc/amd/morgana/Makefile.inc
index a88e1a5..f117a4a 100644
--- a/src/soc/amd/morgana/Makefile.inc
+++ b/src/soc/amd/morgana/Makefile.inc
@@ -297,6 +297,11 @@
    	--output $@

+cbfs-files-y += apu/amdfw
+apu/amdfw-file := $(obj)/amdfw.rom
+apu/amdfw-position := $(MORGANA_FWM_POSITION)
+apu/amdfw-type := raw
+
 ifeq ($(CONFIG_VBOOT_SLOTS_RW_AB)$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),yy)
 cbfs-files-y += apu/amdfw_a
 apu/amdfw_a-file := $(obj)/amdfw_a.rom
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 504a40e..7de6c4a 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -285,6 +285,11 @@
    	--anywhere \
    	--output $@

+cbfs-files-y += apu/amdfw
+apu/amdfw-file := $(obj)/amdfw.rom
+apu/amdfw-position := $(PICASSO_FWM_POSITION)
+apu/amdfw-type := raw
+
 ifeq ($(CONFIG_VBOOT_SLOTS_RW_A)$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),yy)
 cbfs-files-y += apu/amdfw_a
 apu/amdfw_a-file := $(obj)/amdfw_a.rom