From f09ac93aeabcab6e681128a6a186aa9b511bcab5 Mon Sep 17 00:00:00 2001
From: Wai-Hong Tam <waihong@google.com>
Date: Mon, 15 May 2017 16:31:31 -0700
Subject: [PATCH] flash_ec: Respect the raiden flag if no board given

In a lab servo, flash_ec is executed without the board flag. In this
case, don't check the board flag for raiden and simply respect the
raiden flag.

BRANCH=none
BUG=b:38319398
TEST=Ran the flash_ec script in a lab servo.

Change-Id: Ib3757a4b7b550fd77facffdf2009cc3317591888
Reviewed-on: https://chromium-review.googlesource.com/506461
Commit-Ready: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
---
 util/flash_ec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/flash_ec b/util/flash_ec
index 9254a21155..c387427329 100755
--- a/util/flash_ec
+++ b/util/flash_ec
@@ -288,7 +288,7 @@ on_servov3() {
 error_reported=  # Avoid double printing the error message.
 on_raiden() {
 	if [ -z "${BOARD}" ]; then
-		return 0
+		[ "${FLAGS_raiden}" = ${FLAGS_TRUE} ] && return 0 || return 1
 	fi
 	if [ "${FLAGS_raiden}" = ${FLAGS_TRUE} ]; then
 		if in_array "${BOARDS_RAIDEN[@]}" "${BOARD}"; then