summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIdwer Vollering <vidwer@gmail.com>2014-07-16 22:22:59 +0200
committerIdwer Vollering <vidwer@gmail.com>2014-07-28 23:18:56 +0200
commitb37ee1ee7c69836cfb333c13f787a1c3ba580b8f (patch)
tree2b01146d3c7078ff85f5dae0c6367372a6a7de1a
parent6e3712f9e11582f98630d404ce48a538716d8fee (diff)
downloadcoreboot-b37ee1ee7c69836cfb333c13f787a1c3ba580b8f.tar.xz
util/board_status: use the right location of cbfstool
The cbfstool binary in util/ doesn't exist as often as build/cbfstool does. Since cbfstool obtains details from coreboot.rom, use the binary in build/ Change-Id: Id7d5632f4e5cbd5ede58cd136c37b0dacee9ff93 Signed-off-by: Idwer Vollering <vidwer@gmail.com> Reviewed-on: http://review.coreboot.org/6299 Reviewed-by: David Hendricks <dhendrix@chromium.org> Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Martin Roth <gaumless@gmail.com>
-rwxr-xr-xutil/board_status/board_status.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh
index 373f8e3070..7389478614 100755
--- a/util/board_status/board_status.sh
+++ b/util/board_status/board_status.sh
@@ -215,7 +215,10 @@ tmpdir=$(mktemp -d --tmpdir coreboot_board_status.XXXXXXXX)
# Obtain board and revision info to form the directory structure:
# <vendor>/<board>/<revision>/<timestamp>
-cbfstool_cmd="util/cbfstool/cbfstool"
+cbfstool_cmd="build/cbfstool"
+if test ! -x build/cbfstool; then
+ make -C util/cbfstool/ && cp util/cbfstool/cbfstool build/cbfstool
+fi
test_cmd $LOCAL "$cbfstool_cmd"
$cbfstool_cmd build/coreboot.rom extract -n config -f ${tmpdir}/config.txt
$cbfstool_cmd build/coreboot.rom print > ${tmpdir}/cbfs.txt