[coreboot-gerrit] New patch to review for coreboot: amd/pi/hudson: Add alternate method for including amdfw

[Marc Jones (marc@marcjonesconsulting.com)]

Marc Jones (marc at marcjonesconsulting.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18435

-gerrit

commit ad2274456b992a514430389fef887ae3fecba809
Author: Marshall Dawson <marshalldawson3rd at gmail.com>
Date:   Sat Jan 7 18:17:32 2017 -0500

    amd/pi/hudson: Add alternate method for including amdfw
    
    For systems using Chrome OS, place the amdfw outside of cbfs control.
    The firmware must go to a fixed position at an offset of 0x20000 into
    the flash device.
    
    Potentially improve by adding a warning or error message for the
    condition when sizeof(amdfw) + sizeof(cbfs and metadata) > sizeof(flash).
    
    Original-Signed-off-by: Marshall Dawson <marshalldawson3rd at gmail.com>
    Original-Reviewed-by: Marc Jones <marcj303 at gmail.com>
    (cherry picked from commit 2d9d631b39d7850576438a5b0979936bd33893e1)
    
    Change-Id: I38029bc03e5db260424cca293b1a7bceea4d0d75
    Signed-off-by: Marc Jones <marcj303 at gmail.com>
---
 src/southbridge/amd/pi/hudson/Kconfig      |  7 +++++++
 src/southbridge/amd/pi/hudson/Makefile.inc | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig
index f6e3355..0afeeec 100644
--- a/src/southbridge/amd/pi/hudson/Kconfig
+++ b/src/southbridge/amd/pi/hudson/Kconfig
@@ -220,3 +220,10 @@ config HUDSON_UART
 	  controller 0 registers range from FEDC_6000h
 	  to FEDC_6FFFh. UART controller 1 registers
 	  range from FEDC_8000h to FEDC_8FFFh.
+
+config AMDFW_OUTSIDE_CBFS
+	def_bool n
+	help
+	  The AMDFW (PSP) is typically locatable in cbfs.  Select this
+	  option to manually attach the generated amdfw.rom at an
+	  offset of 0x20000 from the bottom of the coreboot ROM image.
diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index 24a757c..2153c62 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -264,7 +264,20 @@ $(obj)/amdfw.rom:	$(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \
 		--flashsize $(CONFIG_ROM_SIZE) \
 		--output	$@
 
+ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y)
+PHONY+=add_amdfw
+INTERMEDIATE+=add_amdfw
+
+add_amdfw: $(obj)/coreboot.pre $(obj)/amdfw.rom
+	printf "    DD         Adding AMD Firmware\n"
+	dd if=$(obj)/amdfw.rom \
+		of=$(obj)/coreboot.pre conv=notrunc bs=1 seek=131072 >/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 := $(HUDSON_FWM_POSITION)
 apu/amdfw-type := raw
+
+endif # ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y)