summaryrefslogtreecommitdiff
path: root/src/soc/amd/picasso
diff options
context:
space:
mode:
authorFelix Held <felix.held@amd.corp-partner.google.com>2020-06-17 02:13:34 +0200
committerFelix Held <felix-coreboot@felixheld.de>2020-06-18 13:23:42 +0000
commitef3395d990bbf1118a8d4e367a986bdbc92b1820 (patch)
treeed3dcb91f02c0c1fc3d242b1b8d3586e1f0e637a /src/soc/amd/picasso
parent61ab3fe6ef0ac93d8ef1235bfe4090c9623fae9d (diff)
downloadcoreboot-ef3395d990bbf1118a8d4e367a986bdbc92b1820.tar.xz
soc/amd/picasso: remove AMDFW_OUTSIDE_CBFS option
The option to have amdfw outside of CBFS used dd to write amdfw at a given location overwriting anything that was there before, which may cause the build to fail due to the FMAP header being overwritten resulting in a not too obvious error that the image is a legacy image without FMAP header. Mandolin was the only board using this functionality, but I fixed the placement of components in the flash image there, so that amdfw can just be placed in CBFS avoiding those problems. Change-Id: I0f3abab9d3939da43e1681d5cfe2c8d494402acf Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/42438 Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd/picasso')
-rw-r--r--src/soc/amd/picasso/Makefile.inc22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 98948775d9..796f77cb71 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -429,33 +429,11 @@ $(PSP_BIOSBIN_FILE): $(PSP_ELF_FILE) $(AMDCOMPRESS)
$(AMDCOMPRESS) --infile $(PSP_ELF_FILE) --outfile $@ --compress \
--maxsize $(PSP_BIOSBIN_SIZE)
-ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y)
-PHONY+=add_amdfw
-INTERMEDIATE+=add_amdfw
-
-# Calculate firmware position inside the ROM
-PICASSO_FWM_ROM_POSITION=$(call int-add, \
- $(call int-subtract, $(CONFIG_ROM_SIZE) \
- $(call int-shift-left, \
- 0x80000 $(CONFIG_AMD_FWM_POSITION_INDEX))) 0x20000)
-
-add_amdfw: $(obj)/coreboot.pre $(obj)/amdfw.rom
- printf " DD Adding AMD Firmware at ROM offset 0x%x\n" \
- "$(PICASSO_FWM_ROM_POSITION)"
- dd oflag=seek_bytes \
- if=$(obj)/amdfw.rom \
- of=$(obj)/coreboot.pre conv=notrunc \
- seek=$(PICASSO_FWM_ROM_POSITION) >/dev/null 2>&1
-
-else # ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y)
-
cbfs-files-y += apu/amdfw
apu/amdfw-file := $(obj)/amdfw.rom
apu/amdfw-position := $(PICASSO_FWM_POSITION)
apu/amdfw-type := raw
-endif # ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y)
-
$(call strip_quotes,$(CONFIG_FSP_M_CBFS))-options := -b $(CONFIG_FSP_M_ADDR)
cpu_microcode_bins += $(wildcard 3rdparty/amd_blobs/picasso/PSP/UcodePatch_*.bin)