summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Menzel <paulepanter@users.sourceforge.net>2015-02-19 19:35:58 +0100
committerDavid Hendricks <dhendrix@chromium.org>2015-02-20 20:45:41 +0100
commit1cc77e0f896d0230b6f031b7ccc8bc83be7520b6 (patch)
tree98b4e45e8dd5039b99f9a02e3eb150d1a6ddf461
parentc5163ed83b478a8f4f499a5a0230b1ce50111f71 (diff)
util/board_status/board_status.sh: Move comment to right position
Fix up commit 1b6e7a67 (Updates to the board status script) adding this comment before running `cbfstool` by moving it to a more appropriate place. Change-Id: Iff79ed44e8e5ced55f2345407d1668858098ebe4 Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-on: http://review.coreboot.org/8491 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix@chromium.org>
-rwxr-xr-xutil/board_status/board_status.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh
index 49d2c73725..2cb4e5c792 100755
--- a/util/board_status/board_status.sh
+++ b/util/board_status/board_status.sh
@@ -213,8 +213,6 @@ fi
# If the user does not wish to upload, results will remain in /tmp.
tmpdir=$(mktemp -d --tmpdir coreboot_board_status.XXXXXXXX)
-# Obtain board and revision info to form the directory structure:
-# <vendor>/<board>/<revision>/<timestamp>
cbfstool_cmd="build/cbfstool"
if test ! -x build/cbfstool; then
make -C util/cbfstool/ && cp util/cbfstool/cbfstool build/cbfstool
@@ -222,6 +220,9 @@ 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
+
+# Obtain board and revision info to form the directory structure:
+# <vendor>/<board>/<revision>/<timestamp>
mainboard_dir="$(grep CONFIG_MAINBOARD_DIR ${tmpdir}/config.txt | awk -F '"' '{ print $2 }')"
vendor=$(echo "$mainboard_dir" | awk -F '/' '{ print $1 }')
mainboard=$(echo "$mainboard_dir" | awk -F '/' '{ print $2 }')