Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17070
-gerrit
commit e639a0a93423faeac8c2681299dc4b44a00d4acf Author: Martin Roth martinroth@chromium.org Date: Thu Oct 20 09:10:35 2016 -0600
Makefile.inc: Don't share amdfwtool between platforms
amdfwtool currently gets built for a specific size of rom chip. This should be updated to be passed in on the amdfwtool command line, but until that's done, stop sharing the tool between builds.
This caused a problem for abuild when we tried changing the default rom to one that used a 256KB rom chip. That wasn't large enough for all of the files included by amdfwtool on several platforms, causing build failures.
Change-Id: Ib08f3283e5be956f995a4a416a70b12a32462882 Signed-off-by: Martin Roth martinroth@chromium.org --- Makefile.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc index 127f372..f5b7c4c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -421,7 +421,7 @@ ADAFLAGS_common += -Os endif
additional-dirs := $(objutil)/cbfstool $(objutil)/romcc $(objutil)/ifdtool \ - $(objutil)/ifdfake $(objutil)/options $(objutil)/amdfwtool \ + $(objutil)/ifdfake $(objutil)/options $(obj)/amdfwtool \ $(objutil)/cbootimage $(objutil)/bimgtool
####################################################################### @@ -484,7 +484,8 @@ $(IFDFAKE): $(top)/util/ifdfake/ifdfake.c @printf " HOSTCC $(subst $(obj)/,,$(@))\n" $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
-AMDFWTOOL:=$(objutil)/amdfwtool/amdfwtool +#TODO: update amdfwtool to pass in size of rom +AMDFWTOOL:=$(obj)/amdfwtool/amdfwtool $(AMDFWTOOL): $(top)/util/amdfwtool/amdfwtool.c @printf " HOSTCC $(subst $(obj)/,,$(@))\n" $(HOSTCC) $(HOSTCFLAGS) -DCONFIG_ROM_SIZE=$(CONFIG_ROM_SIZE) -o $@ $<