summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@chromium.org>2016-11-08 11:49:58 -0700
committerMartin Roth <martinroth@google.com>2016-11-10 00:27:52 +0100
commitd61b5404dcdad67238904bebef60a392fbcd48fc (patch)
tree6f052913ff115b25f52b0260262ca0201e911671
parent31d95a2eb2cae1667ab89200d7c2887c3ef8076a (diff)
downloadcoreboot-d61b5404dcdad67238904bebef60a392fbcd48fc.tar.xz
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@chromium.org> Reviewed-on: https://review.coreboot.org/17327 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
-rw-r--r--Makefile.inc5
-rw-r--r--src/southbridge/amd/agesa/hudson/Makefile.inc1
-rw-r--r--src/southbridge/amd/pi/hudson/Makefile.inc1
3 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 84efc71f42..cb0b21cbb2 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 3877e606c2..2e8b13be6b 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 731e25e579..300e93642c 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