[coreboot-gerrit] Patch set updated for coreboot: southbridge/amd: update for amdfwtool size on command line

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17327

-gerrit

commit 4be308a4d9ff4c3e5687680f5596e98c33e3d8dc
Author: Martin Roth <martinroth at chromium.org>
Date:   Tue Nov 8 11:49:58 2016 -0700

    southbridge/amd: update for amdfwtool size on command line
    
    amdfwtool was getting the ROM size as a #define when it was built.
    It has been updated to pass it in as a command line parameter, so
    now it can be built just once for abuild as a shared tool.
    
    Update the calls to amdfwtool to pass the ROM size.
    
    All platforms using amdfwtool had the output verified using
    a binary compare.
    
    This reverts commit 0529236ed22f1a28d29f2054674004c4f7a056e7
    (Makefile.inc: Don't share amdfwtool between platforms)
    
    Change-Id: I188b34e08249f2d00bd48957ced750b21f1ec348
    Signed-off-by: Martin Roth <martinroth at chromium.org>
---
 Makefile.inc                                  | 5 ++---
 src/southbridge/amd/agesa/hudson/Makefile.inc | 1 +
 src/southbridge/amd/pi/hudson/Makefile.inc    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 84efc71..cb0b21c 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -425,7 +425,7 @@ ADAFLAGS_common += -gnata
 endif
 
 additional-dirs := $(objutil)/cbfstool $(objutil)/romcc $(objutil)/ifdtool \
-		   $(objutil)/ifdfake $(objutil)/options $(obj)/amdfwtool \
+		   $(objutil)/ifdfake $(objutil)/options $(objutil)/amdfwtool \
 		   $(objutil)/cbootimage $(objutil)/bimgtool
 
 #######################################################################
@@ -488,8 +488,7 @@ $(IFDFAKE): $(top)/util/ifdfake/ifdfake.c
 	@printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
 
-#TODO: update amdfwtool to pass in size of rom
-AMDFWTOOL:=$(obj)/amdfwtool/amdfwtool
+AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool
 $(AMDFWTOOL): $(top)/util/amdfwtool/amdfwtool.c
 	@printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
 	$(HOSTCC) $(HOSTCFLAGS) -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $<
diff --git a/src/southbridge/amd/agesa/hudson/Makefile.inc b/src/southbridge/amd/agesa/hudson/Makefile.inc
index 3877e60..2e8b13b 100644
--- a/src/southbridge/amd/agesa/hudson/Makefile.inc
+++ b/src/southbridge/amd/agesa/hudson/Makefile.inc
@@ -62,6 +62,7 @@ $(obj)/amdfw.rom:	$(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \
 		$(OPT_HUDSON_XHCI_FWM_FILE) \
 		$(OPT_HUDSON_IMC_FWM_FILE) \
 		$(OPT_HUDSON_GEC_FWM_FILE) \
+		--flashsize $(CONFIG_ROM_SIZE) \
 		--output	$@
 
 cbfs-files-y += apu/amdfw
diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index 731e25e..300e936 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -291,6 +291,7 @@ $(obj)/amdfw.rom:	$(call strip_quotes, $(CONFIG_HUDSON_XHCI_FWM_FILE)) \
 		$(OPT_2TRUSTLETKEY_FILE) \
 		$(OPT_2SMUFIRMWARE2_FILE) \
 		$(OPT_2SMUSCS_FILE) \
+		--flashsize $(CONFIG_ROM_SIZE) \
 		--output	$@
 
 cbfs-files-y += apu/amdfw