summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@chromium.org>2016-10-20 09:10:35 -0600
committerMartin Roth <martinroth@google.com>2016-10-21 19:38:39 +0200
commit0529236ed22f1a28d29f2054674004c4f7a056e7 (patch)
treec0cd54aa94b3e85da6275fa6a30beeed6caae3b8
parentde2918bd1a4af616ca60833e66850fda9340826e (diff)
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> Reviewed-on: https://review.coreboot.org/17070 Tested-by: build bot (Jenkins) Reviewed-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--Makefile.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 127f3722a6..f5b7c4cd79 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 $@ $<