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, 114 deletions

diff --git a/test/usb_tcpmv2_td_pd_vndi3_e3.c b/test/usb_tcpmv2_td_pd_vndi3_e3.c
deleted file mode 100644
index cbfc0d75e3..0000000000
--- a/test/usb_tcpmv2_td_pd_vndi3_e3.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright 2021 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"
-
-uint32_t vdo = VDO(USB_SID_PD, 1,
-		   VDO_SVDM_VERS(VDM_VER20) |
-		   CMD_DISCOVER_IDENT);
-
-
-/*****************************************************************************
- * TD.PD.VNDI3.E3.VDM Identity
- *
- * Description:
- *	This test verifies that the VDM Information is as specified in the
- *	vendor-supplied information.
- */
-static int td_pd_vndi3_e3(enum pd_data_role data_role)
-{
-	partner_set_pd_rev(PD_REV30);
-
-	TEST_EQ(tcpci_startup(), EC_SUCCESS, "%d");
-
-	/*
-	 * a) Run PROC.PD.E1 Bring-up according to the UUT role.
-	 */
-	TEST_EQ(proc_pd_e1(data_role, INITIAL_AND_ALREADY_ATTACHED),
-		EC_SUCCESS, "%d");
-
-	/*
-	 * Make sure we are idle. Reject everything that is pending
-	 */
-	TEST_EQ(handle_attach_expected_msgs(data_role), EC_SUCCESS, "%d");
-
-	/*
-	 * b) Tester executes a Discover Identity exchange
-	 */
-	partner_send_msg(TCPCI_MSG_SOP, PD_DATA_VENDOR_DEF,
-			 1, 0, &vdo);
-
-	/*
-	 * c) If the UUT is not a cable and if Responds_To_Discov_SOP is set to
-	 * No, the tester checks that the UUT replies Not_Supported.  The test
-	 * stops here in this case.
-	 */
-	TEST_EQ(verify_tcpci_transmit(TCPCI_MSG_SOP, PD_CTRL_NOT_SUPPORTED, 0),
-		EC_SUCCESS, "%d");
-	mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
-
-	/*
-	 * TODO: Items d)-i) could be verified if the unit tests are configured
-	 * to reply to Identity messages.
-	 *
-	 * d) For Cables, the Tester checks the consistency of
-	 * Specification_Revision
-	 *
-	 * e) For all devices, the Tester checks in the ID Header consistency
-	 * of:
-	 *	1. Product_Type(UFP)
-	 *	2. Product Type(Cable Plug)
-	 *	3. Product Type (DFP)
-	 *	4. USB_VID(_SOP)
-	 *	5. Modal_Operation_Supported(_SOP)
-	 *	6. Data_Capable_as_USB_Host(_SOP)
-	 *	7. Data_Capable_as_USB_Device(_SOP)
-	 *
-	 * f) For all devices, the Tester checks in the Cert Stat VDO
-	 * consistency of:
-	 *	1. XID(_SOP)
-	 *
-	 * g) For all devices, the Tester checks in the Product VDO consistency
-	 * of:
-	 *	1. PID(_SOP)
-	 *	2. bcdDevice(_SOP)
-	 *
-	 * h) For Cables, the Tester checks in the Cable VDO consistency of:
-	 *	1. Cable_HW_Vers
-	 *	2. Cable_FW_Vers
-	 *	3. Type_C_to_Type_C_Capt_Vdm_V2
-	 *	4. Cable_Latency
-	 *	5. Cable_Termination_Type
-	 *	6. Max_VBUS_Voltage_Vdm_V2
-	 *	7. Cable_VBUS_Current
-	 *	8. VBUS_through_cable
-	 *	9. Cable_SOP''_controller
-	 *	10. Cable_Superspeed_Support
-	 *
-	 * i) For Alt Mode Adapters, the Tester checks in the AMA VDO
-	 * consistency of:
-	 *	1. AMA_HW_Vers
-	 *	2. AMA_FW_Vers
-	 *	3. AMA_VCONN_power
-	 *	4. AMA_VCONN_reqd
-	 *	5. AMA_VBUS_reqd
-	 *	6. AMA_Superspeed_Support
-	 */
-	return EC_SUCCESS;
-}
-int test_td_pd_vndi3_e3_dfp(void)
-{
-	return td_pd_vndi3_e3(PD_ROLE_DFP);
-}
-int test_td_pd_vndi3_e3_ufp(void)
-{
-	return td_pd_vndi3_e3(PD_ROLE_UFP);
-}