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/board/chronicler/vif_override.xml b/board/chronicler/vif_override.xml
deleted file mode 100644
index f871a543e3..0000000000
--- a/board/chronicler/vif_override.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VIF xmlns="http://usb.org/VendorInfoFile.xsd">
-  <Model_Part_Number>Volteer RT1715</Model_Part_Number>
-  <Product_Revision>0</Product_Revision>
-  <TID>0</TID>
-  <Product>
-    <!-- Information about TGL USB4 provided by Intel. See b/172963736 -->
-    <USB4_Num_Internal_Host_Controllers value="1" />
-    <USB4_Num_PCIe_DN_Bridges value="0" />
-    <USB4RouterList>
-      <Usb4Router>
-        <USB4_Router_ID value="1" />
-        <USB4_Silicon_VID value="32903">8087</USB4_Silicon_VID>
-        <USB4_Num_Lane_Adapters value="4" />
-        <USB4_Num_USB3_DN_Adapters value="1" />
-        <USB4_Num_DP_IN_Adapters value="1" />
-        <USB4_Num_DP_OUT_Adapters value="0" />
-        <USB4_Num_PCIe_DN_Adapters value="4" />
-        <USB4_TBT3_Not_Supported value="0">TBT3 Compatible</USB4_TBT3_Not_Supported>
-        <USB4_PCIe_Wake_Supported value="true" />
-        <USB4_USB3_Wake_Supported value="false" />
-        <USB4_Num_Unused_Adapters value="0" />
-        <USB4_TBT3_VID value="32903">8087</USB4_TBT3_VID>
-        <USB4_PCIe_Switch_Vendor_ID value="32902">8086</USB4_PCIe_Switch_Vendor_ID>
-        <USB4_PCIe_Switch_Device_ID value="39451">9A1B</USB4_PCIe_Switch_Device_ID>
-      </Usb4Router>
-      <Usb4Router>
-        <USB4_Router_ID value="0" />
-        <USB4_Silicon_VID value="32903">8087</USB4_Silicon_VID>
-        <USB4_Num_Lane_Adapters value="2" />
-        <USB4_Num_USB3_DN_Adapters value="1" />
-        <USB4_Num_DP_IN_Adapters value="0" />
-        <USB4_Num_DP_OUT_Adapters value="0" />
-        <USB4_Num_PCIe_DN_Adapters value="0" />
-        <USB4_TBT3_Not_Supported value="1">Not TBT3-Compatible</USB4_TBT3_Not_Supported>
-        <USB4_PCIe_Wake_Supported value="false" />
-        <USB4_USB3_Wake_Supported value="false" />
-        <USB4_Num_Unused_Adapters value="0" />
-      </Usb4Router>
-    </USB4RouterList>
-  </Product>
-  <Component>
-    <!-- Port 0 is USB3-only. -->
-    <USB4_Supported value="false">NO</USB4_Supported>
-    <Host_Truncates_DP_For_tDHPResponse value="false" />
-    <SrcPdoList>
-      <SrcPDO>
-        <!-- Add in missing fields for SrcPdo0, derived from SYV682B datasheet. -->
-        <Src_PD_OCP_OC_Debounce value="50">50 msec</Src_PD_OCP_OC_Debounce>
-        <Src_PD_OCP_OC_Threshold value="360">3600 mA</Src_PD_OCP_OC_Threshold>
-      </SrcPDO>
-    </SrcPdoList>
-    <DFP_VDO_Port_Number value="0" />
-    <Modal_Operation_Supported_SOP value="false" />
-  </Component>
-  <Component>
-    <USB4_Max_Speed value="1">Gen 3 (40Gb)</USB4_Max_Speed>
-    <USB4_DFP_Supported value="true" />
-    <USB4_UFP_Supported value="false" />
-    <USB4_USB3_Tunneling_Supported value="true" />
-    <USB4_DP_Tunneling_Supported value="true" />
-    <USB4_PCIe_Tunneling_Supported value="true" />
-    <USB4_TBT3_Compatibility_Supported value="true" />
-    <USB4_CL1_State_Supported value="true" />
-    <USB4_CL2_State_Supported value="true" />
-    <USB4_Num_Retimers value="1" />
-    <USB4_DP_Bit_Rate value="3">HBR3</USB4_DP_Bit_Rate>
-    <USB4_Num_DP_Lanes value="4">4 Lanes</USB4_Num_DP_Lanes>
-    <USB4_Lane_0_Adapter value="1" />
-    <Host_Supports_USB_Data value="true" />
-    <Host_Speed value="2">USB 3.2 Gen 2x1</Host_Speed>
-    <Host_Contains_Captive_Retimer value="true" />
-    <Host_Truncates_DP_For_tDHPResponse value="false" />
-    <Host_Suspend_Supported value="true" />
-    <Is_DFP_On_Hub value="false" />
-    <USB_Suspend_May_Be_Cleared value="true" />
-    <FR_Swap_Type_C_Current_Capability_As_Initial_Sink value="3">3A @ 5V</FR_Swap_Type_C_Current_Capability_As_Initial_Sink>
-    <FR_Swap_Supported_As_Initial_Sink value="true" />
-    <SrcPdoList>
-      <SrcPDO>
-        <!-- Add in missing fields for SrcPdo0, derived from SYV682B datasheet. -->
-        <Src_PD_OCP_OC_Debounce value="50">50 msec</Src_PD_OCP_OC_Debounce>
-        <Src_PD_OCP_OC_Threshold value="360">3600 mA</Src_PD_OCP_OC_Threshold>
-      </SrcPDO>
-    </SrcPdoList>
-    <Data_Capable_As_USB_Host_SOP value="true" />
-    <Data_Capable_As_USB_Device_SOP value="false" />
-    <!-- TODO(b/173028252): Figure out the appropriate Discover Identity ACK for
-         Volteer and update the EC and VIF accordingly. -->
-    <Product_Type_UFP_SOP value="3">PSD</Product_Type_UFP_SOP>
-    <Product_Type_DFP_SOP value="4">Alternate Mode Controller (AMC)</Product_Type_DFP_SOP>
-    <DFP_VDO_Port_Number value="1" />
-    <Modal_Operation_Supported_SOP value="true" />
-    <USB_VID_SOP value="6353">18D1</USB_VID_SOP>
-    <bcdDevice_SOP value="0">0000</bcdDevice_SOP>
-    <SVID_Fixed_SOP value="true" />
-    <Num_SVIDs_Min_SOP value="1" />
-    <Num_SVIDs_Max_SOP value="1" />
-    <SOPSVIDList>
-      <SOPSVID>
-        <SVID_SOP value="32903">8087</SVID_SOP>
-        <SVID_Modes_Fixed_SOP value="true" />
-        <SVID_Num_Modes_Min_SOP value="1" />
-        <SVID_Num_Modes_Max_SOP value="1" />
-        <SOPSVIDModeList>
-          <SOPSVIDMode>
-            <SVID_Mode_Enter_SOP value="true" />
-            <SVID_Mode_Recog_Value_SOP value="0">00000000</SVID_Mode_Recog_Value_SOP>
-          </SOPSVIDMode>
-        </SOPSVIDModeList>
-      </SOPSVID>
-    </SOPSVIDList>
-  </Component>
-</VIF>