ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 107 deletions

diff --git a/test/usb_tcpmv2_td_pd_other.c b/test/usb_tcpmv2_td_pd_other.c
deleted file mode 100644
index 1882480150..0000000000
--- a/test/usb_tcpmv2_td_pd_other.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "mock/tcpci_i2c_mock.h"
-#include "task.h"
-#include "tcpm/tcpci.h"
-#include "test_util.h"
-#include "timer.h"
-#include "usb_tcpmv2_compliance.h"
-#include "usb_tc_sm.h"
-#include "usb_prl_sm.h"
-
-int test_connect_as_nonpd_sink(void)
-{
-	task_wait_event(10 * SECOND);
-
-	/* Simulate a non-PD power supply being plugged in. */
-	mock_set_cc(MOCK_CC_DUT_IS_SNK, MOCK_CC_SNK_OPEN, MOCK_CC_SNK_RP_3_0);
-	mock_set_alert(TCPC_REG_ALERT_CC_STATUS);
-
-	task_wait_event(50 * MSEC);
-
-	mock_tcpci_set_reg(TCPC_REG_POWER_STATUS,
-			   TCPC_REG_POWER_STATUS_VBUS_PRES);
-	mock_set_alert(TCPC_REG_ALERT_POWER_STATUS);
-
-	task_wait_event(10 * SECOND);
-	TEST_EQ(tc_is_attached_snk(PORT0), true, "%d");
-
-	return EC_SUCCESS;
-}
-
-int test_retry_count_sop(void)
-{
-	/* DRP auto-toggling with AP in S0, source enabled. */
-	TEST_EQ(tcpci_startup(), EC_SUCCESS, "%d");
-
-	/*
-	 * The test starts in a disconnected state.
-	 */
-	mock_tcpci_set_reg(TCPC_REG_EXT_STATUS, TCPC_REG_EXT_STATUS_SAFE0V);
-	mock_set_alert(TCPC_REG_ALERT_EXT_STATUS);
-	task_wait_event(10 * SECOND);
-
-	/*
-	 * The Tester applies Rd and waits for Vbus for tNoResponse max.
-	 */
-	mock_set_cc(MOCK_CC_DUT_IS_SRC, MOCK_CC_SRC_OPEN, MOCK_CC_SRC_RD);
-	mock_set_alert(TCPC_REG_ALERT_CC_STATUS);
-
-	/*
-	 * The Tester waits for Source_Capabilities for tNoResponse max.
-	 *
-	 * Source Caps is SOP message which should be retried at TCPC layer.
-	 * The retry count for PD3 should be 2.
-	 */
-	TEST_EQ(verify_tcpci_tx_retry_count(TCPCI_MSG_SOP, 0,
-				PD_DATA_SOURCE_CAP, 2),
-		EC_SUCCESS, "%d");
-	return EC_SUCCESS;
-}
-
-int test_retry_count_hard_reset(void)
-{
-	/* DRP auto-toggling with AP in S0, source enabled. */
-	TEST_EQ(tcpci_startup(), EC_SUCCESS, "%d");
-
-	/*
-	 * The test starts in a disconnected state.
-	 */
-	mock_tcpci_set_reg(TCPC_REG_EXT_STATUS, TCPC_REG_EXT_STATUS_SAFE0V);
-	mock_set_alert(TCPC_REG_ALERT_EXT_STATUS);
-	task_wait_event(10 * SECOND);
-
-	/*
-	 * The Tester applies Rd and waits for Vbus for tNoResponse max.
-	 */
-	mock_set_cc(MOCK_CC_DUT_IS_SRC, MOCK_CC_SRC_OPEN, MOCK_CC_SRC_RD);
-	mock_set_alert(TCPC_REG_ALERT_CC_STATUS);
-
-	/*
-	 * The Tester waits for Source_Capabilities for tNoResponse max.
-	 */
-	TEST_EQ(verify_tcpci_transmit(TCPCI_MSG_SOP, 0, PD_DATA_SOURCE_CAP),
-		EC_SUCCESS, "%d");
-	/*
-	 * The Tester replies GoodCrc on reception of the Source_Capabilities.
-	 */
-	mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
-	task_wait_event(10 * MSEC);
-
-	/*
-	 * Now that PRL is running since we are connected, we can send a hard
-	 * reset.
-	 */
-
-	/* Request that DUT send hard reset */
-	prl_execute_hard_reset(PORT0);
-
-	/* The retry count for hard resets should be 0 */
-	TEST_EQ(verify_tcpci_tx_retry_count(TCPCI_MSG_TX_HARD_RESET, 0, 0, 0),
-		EC_SUCCESS, "%d");
-
-	return EC_SUCCESS;
-}