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

diff --git a/common/usbc/usb_pd_console.c b/common/usbc/usb_pd_console.c
deleted file mode 100644
index bbee776611..0000000000
--- a/common/usbc/usb_pd_console.c
+++ /dev/null
@@ -1,212 +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 "common.h"
-#include "console.h"
-#include "usb_common.h"
-#include "usb_pd_timer.h"
-#include "usb_pe_sm.h"
-#include "usb_prl_sm.h"
-#include "usb_tc_sm.h"
-#include "usb_pd.h"
-#include "util.h"
-
-test_export_static int command_pd(int argc, char **argv)
-{
-	int port;
-	char *e;
-
-	if (argc < 2)
-		return EC_ERROR_PARAM_COUNT;
-
-	if (!strcasecmp(argv[1], "dump")) {
-		if (argc >= 3) {
-			int level = strtoi(argv[2], &e, 10);
-
-			if (*e)
-				return EC_ERROR_PARAM2;
-
-			if (level < DEBUG_DISABLE)
-				level = DEBUG_DISABLE;
-			else if (level > DEBUG_LEVEL_MAX)
-				level = DEBUG_LEVEL_MAX;
-
-			prl_set_debug_level(level);
-			pe_set_debug_level(level);
-			tc_set_debug_level(level);
-			ccprintf("debug=%d\n", level);
-			return EC_SUCCESS;
-		}
-	} else if (IS_ENABLED(CONFIG_USB_PD_TRY_SRC) &&
-				!strcasecmp(argv[1], "trysrc")) {
-		enum try_src_override_t ov = tc_get_try_src_override();
-
-		if (argc >= 3) {
-			ov = strtoi(argv[2], &e, 10);
-			if (*e || ov > TRY_SRC_NO_OVERRIDE)
-				return EC_ERROR_PARAM3;
-			tc_try_src_override(ov);
-		}
-
-		if (ov == TRY_SRC_NO_OVERRIDE)
-			ccprintf("Try.SRC System controlled\n");
-		else
-			ccprintf("Try.SRC Forced %s\n", ov ? "ON" : "OFF");
-
-		return EC_SUCCESS;
-	} else if (!strcasecmp(argv[1], "version")) {
-		ccprintf("%d\n", PD_STACK_VERSION);
-		return EC_SUCCESS;
-	}
-
-	/* command: pd <port> <subcmd> [args] */
-	port = strtoi(argv[1], &e, 10);
-	if (argc < 3)
-		return EC_ERROR_PARAM_COUNT;
-
-	if (*e || port >= CONFIG_USB_PD_PORT_MAX_COUNT)
-		return EC_ERROR_PARAM2;
-
-	if (IS_ENABLED(CONFIG_USB_PD_DUAL_ROLE)) {
-		if (!strcasecmp(argv[2], "tx")) {
-			pd_dpm_request(port, DPM_REQUEST_SNK_STARTUP);
-		} else if (!strcasecmp(argv[2], "charger")) {
-			pd_dpm_request(port, DPM_REQUEST_SRC_STARTUP);
-		} else if (!strcasecmp(argv[2], "dev")) {
-			int max_volt;
-
-			if (argc >= 4) {
-				max_volt = strtoi(argv[3], &e, 10) * 1000;
-				if (*e)
-					return EC_ERROR_PARAM3;
-			} else {
-				max_volt = pd_get_max_voltage();
-			}
-			pd_request_source_voltage(port, max_volt);
-			pd_dpm_request(port, DPM_REQUEST_NEW_POWER_LEVEL);
-			ccprintf("max req: %dmV\n", max_volt);
-		} else if (!strcasecmp(argv[2], "disable")) {
-			pd_comm_enable(port, 0);
-			ccprintf("Port C%d disable\n", port);
-			return EC_SUCCESS;
-		} else if (!strcasecmp(argv[2], "enable")) {
-			pd_comm_enable(port, 1);
-			ccprintf("Port C%d enabled\n", port);
-			return EC_SUCCESS;
-		} else if (!strcasecmp(argv[2], "hard")) {
-			pd_dpm_request(port, DPM_REQUEST_HARD_RESET_SEND);
-		} else if (!strcasecmp(argv[2], "soft")) {
-			pd_dpm_request(port, DPM_REQUEST_SOFT_RESET_SEND);
-		} else if (!strcasecmp(argv[2], "swap")) {
-			if (argc < 4)
-				return EC_ERROR_PARAM_COUNT;
-
-			if (!strcasecmp(argv[3], "power"))
-				pd_dpm_request(port, DPM_REQUEST_PR_SWAP);
-			else if (!strcasecmp(argv[3], "data"))
-				pd_dpm_request(port, DPM_REQUEST_DR_SWAP);
-			else if (IS_ENABLED(CONFIG_USBC_VCONN_SWAP) &&
-					!strcasecmp(argv[3], "vconn"))
-				pd_dpm_request(port, DPM_REQUEST_VCONN_SWAP);
-			else
-				return EC_ERROR_PARAM3;
-		} else if (!strcasecmp(argv[2], "dualrole")) {
-			if (argc < 4) {
-				cflush();
-				ccprintf("dual-role toggling: ");
-				switch (pd_get_dual_role(port)) {
-				case PD_DRP_TOGGLE_ON:
-					ccprintf("on\n");
-					break;
-				case PD_DRP_TOGGLE_OFF:
-					ccprintf("off\n");
-					break;
-				case PD_DRP_FREEZE:
-					ccprintf("freeze\n");
-					break;
-				case PD_DRP_FORCE_SINK:
-					ccprintf("force sink\n");
-					break;
-				case PD_DRP_FORCE_SOURCE:
-					ccprintf("force source\n");
-					break;
-				cflush();
-				}
-			} else {
-				if (!strcasecmp(argv[3], "on"))
-					pd_set_dual_role(port,
-							PD_DRP_TOGGLE_ON);
-				else if (!strcasecmp(argv[3], "off"))
-					pd_set_dual_role(port,
-							PD_DRP_TOGGLE_OFF);
-				else if (!strcasecmp(argv[3], "freeze"))
-					pd_set_dual_role(port, PD_DRP_FREEZE);
-				else if (!strcasecmp(argv[3], "sink"))
-					pd_set_dual_role(port,
-							PD_DRP_FORCE_SINK);
-				else if (!strcasecmp(argv[3], "source"))
-					pd_set_dual_role(port,
-							PD_DRP_FORCE_SOURCE);
-				else
-					return EC_ERROR_PARAM4;
-			}
-			return EC_SUCCESS;
-		}
-	}
-
-	if (!strcasecmp(argv[2], "state")) {
-		cflush();
-		ccprintf("Port C%d CC%d, %s - Role: %s-%s",
-		port, pd_get_polarity(port) + 1,
-		pd_comm_is_enabled(port) ? "Enable" : "Disable",
-		pd_get_power_role(port) ==
-					PD_ROLE_SOURCE ? "SRC" : "SNK",
-		pd_get_data_role(port) == PD_ROLE_DFP ? "DFP" : "UFP");
-
-		if (IS_ENABLED(CONFIG_USBC_VCONN))
-			ccprintf("%s ", tc_is_vconn_src(port) ? "-VC" : "");
-
-		ccprintf("TC State: %s, Flags: 0x%04x",
-			tc_get_current_state(port),
-			tc_get_flags(port));
-
-		if (IS_ENABLED(CONFIG_USB_PE_SM))
-			ccprintf(" PE State: %s, Flags: 0x%04x\n",
-				pe_get_current_state(port),
-				pe_get_flags(port));
-		else
-			ccprintf("\n");
-
-		cflush();
-	} else if (!strcasecmp(argv[2], "srccaps")) {
-		pd_srccaps_dump(port);
-	}
-
-	if (IS_ENABLED(CONFIG_CMD_PD_TIMER) &&
-	    !strcasecmp(argv[2], "timer")) {
-		pd_timer_dump(port);
-	}
-
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(pd, command_pd,
-	 "version"
-	 "\ndump [0|1|2|3]"
-#ifdef CONFIG_USB_PD_TRY_SRC
-	"\ntrysrc [0|1|2]"
-#endif
-	"\n\t<port> state"
-	"\n\t<port> srccaps"
-#ifdef CONFIG_CMD_PD_TIMER
-	"\n\t<port> timer"
-#endif /* CONFIG_CMD_PD_TIMER */
-#ifdef CONFIG_USB_PD_DUAL_ROLE
-	"|tx|charger|dev"
-	"\n\t<port> disable|enable|soft|hard"
-	"\n\t<port> dualrole [on|off|freeze|sink|source]"
-	"\n\t<port> swap [power|data|vconn]"
-#endif /* CONFIG_USB_PD_DUAL_ROLE */
-	,
-	"USB PD");