new_variant_fulltest: remove remnants of volteer
The 'volteer' reference board is no longer supported. The test
script already rejects 'volteer' as an option, but there is some
code to check for 'volteer' that should also be removed.
BUG=None
TEST=None
Change-Id: I1b5d212c42685162335bcd59922b6c433b1405c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3258090
Tested-by: Paul Fagerburg <pfagerburg@chromium.org>
Auto-Submit: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
diff --git a/contrib/variant/testdata/new_variant_fulltest.sh b/contrib/variant/testdata/new_variant_fulltest.sh
index 54eaca9..0e1d6de 100755
--- a/contrib/variant/testdata/new_variant_fulltest.sh
+++ b/contrib/variant/testdata/new_variant_fulltest.sh
@@ -190,7 +190,7 @@
rm -f "fitimage-${NEW}.bin" "fitimage-${NEW}-versions.txt"
rm -f "me_rw-${NEW}.bin"
# Clean up the extra Volteer fitimage files, too.
- if [[ "${REFERENCE}" == "volteer" || "${REFERENCE}" == "volteer2" ]] ; then
+ if [[ "${REFERENCE}" == "volteer2" ]] ; then
rm -f "fit-${NEW}.log"
popd
pushd "${FITIMAGE_FILES_DIR}/blobs"
@@ -276,13 +276,11 @@
# variant, and there are other blobs that are customized to the
# variant and have names to reflect it. Volteer also does not use
# fitimage-${VARIANT}.bin.
- if [[ "${REFERENCE}" == "volteer" || "${REFERENCE}" == "volteer2" ]] ; then
+ if [[ "${REFERENCE}" == "volteer2" ]] ; then
pushd "${FITIMAGE_FILES_DIR}/blobs"
cp "csme-${FITIMAGE}.bin" "csme-${NEW}.bin"
cp "descriptor-${FITIMAGE}.bin" "descriptor-${NEW}.bin"
- # me_rw-volteer.bin does not exist, and since the fitmage isn't being used
- # on an actual board, it's OK to just use volteer2 for either reference.
- cp "me_rw-volteer2.bin" "me_rw-${NEW}.bin"
+ cp "me_rw-${FITIMAGE}.bin" "me_rw-${NEW}.bin"
popd
pushd "${FITIMAGE_FILES_DIR}/versions"
cp "fitimage-${REFERENCE}-versions.txt" "fitimage-${NEW}-versions.txt"
