diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-09-15 21:30:58 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-09-16 14:11:25 +0000 |
| commit | 9b9d4b3a474a4be3e9fd62651258152cffde6c82 (patch) | |
| tree | 1bf6acc18b9b192e924fad6f3b4ab88f105e5e4e /Makefile.inc | |
| parent | 294ce854241db5c50af7ab012f5fdb23b033fabf (diff) | |
cbfstool: remove locate command
The locate command was previously being used for x86 romstage
linking as well as alignment handling of files. The add command
already supports alignment so there's no more users of the
locate command. Remove the command as well as the '-T' (top-aligned)
option.
BUG=chrome-os-partner:44827
BRANCH=None
TEST=Built rambi. Noted microcode being directly added.
Change-Id: I3b6647bd4cac04a113ab3592f345281fbcd681af
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11671
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'Makefile.inc')
| -rw-r--r-- | Makefile.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.inc b/Makefile.inc index c0beddace3..46d6eb2851 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -562,8 +562,7 @@ cbfs-add-cmd = \ ifneq ($(CONFIG_UPDATE_IMAGE),y) prebuild-files = \ $(foreach file,$(cbfs-files), \ - $(if $(call extract_nth,6,$(file)),$(CBFSTOOL) $@.tmp locate -f $(call extract_nth,1,$(file)) -n $(call extract_nth,2,$(file)) -a $(call extract_nth,6,$(file))|xargs -i \ - $(cbfs-add-cmd) -b {} &&,\ + $(if $(call extract_nth,6,$(file)),$(cbfs-add-cmd) -a $(call extract_nth,6,$(file)) &&, \ $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&)) prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) @@ -580,8 +579,7 @@ prebuild-files = \ $(foreach file,$(cbfs-files), \ $(if $(filter $(call strip_quotes, $(CONFIG_CBFS_PREFIX))/%,\ $(call extract_nth,2,$(file))), \ - $(if $(call extract_nth,6,$(file)),$(CBFSTOOL) $@.tmp locate -f $(call extract_nth,1,$(file)) -n $(call extract_nth,2,$(file)) -a $(call extract_nth,6,$(file))|xargs -i \ - $(cbfs-add-cmd) -b {} &&,\ + $(if $(call extract_nth,6,$(file)),$(cbfs-add-cmd) -a $(call extract_nth,6,$(file)) &&,\ $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&))) .PHONY: $(obj)/coreboot.pre1 |