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

diff --git a/common/charger_profile_override.c b/common/charger_profile_override.c
deleted file mode 100644
index 2b691b9a5a..0000000000
--- a/common/charger_profile_override.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* Copyright 2016 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.
- *
- * Charger profile override for fast charging
- */
-
-#include "charger_profile_override.h"
-#include "console.h"
-#include "ec_commands.h"
-#include "util.h"
-
-#ifdef CONFIG_CMD_CHARGER_PROFILE_OVERRIDE_TEST
-static int fast_charge_test_on;
-static int test_flag_temp;
-static int test_flag_vtg;
-static int test_temp_c;
-static int test_vtg_mV = -1;
-#endif
-
-static int fast_charging_allowed = 1;
-
-int charger_profile_override_common(struct charge_state_data *curr,
-			const struct fast_charge_params *fast_chg_params,
-			const struct fast_charge_profile **prev_chg_prof_info,
-			int batt_vtg_max)
-{
-	int i, voltage_range;
-	/* temp in 0.1 deg C */
-	int temp_c = curr->batt.temperature - 2731;
-	int temp_ranges = fast_chg_params->total_temp_ranges;
-	const struct fast_charge_profile *chg_profile_info =
-				fast_chg_params->chg_profile_info;
-
-#ifdef CONFIG_CMD_CHARGER_PROFILE_OVERRIDE_TEST
-	if (fast_charge_test_on && test_vtg_mV != -1) {
-		temp_c = TEMPC_TENTHS_OF_DEG(test_temp_c);
-		curr->batt.voltage = test_vtg_mV;
-
-		if (test_flag_temp)
-			curr->batt.flags |= BATT_FLAG_BAD_TEMPERATURE;
-		else
-			curr->batt.flags &= BATT_FLAG_BAD_TEMPERATURE;
-
-		if (test_flag_vtg)
-			curr->batt.flags |= BATT_FLAG_BAD_VOLTAGE;
-		else
-			curr->batt.flags &= BATT_FLAG_BAD_VOLTAGE;
-	}
-#endif
-
-	/*
-	 * Determine temperature range.
-	 * If temp reading was bad, use last range.
-	 */
-	if (!(curr->batt.flags & BATT_FLAG_BAD_TEMPERATURE)) {
-		while (chg_profile_info && temp_ranges) {
-			if (temp_c <= chg_profile_info->temp_c) {
-				*prev_chg_prof_info = chg_profile_info;
-				break;
-			}
-			chg_profile_info++;
-			temp_ranges--;
-		}
-
-		/* Invalid charge profile selected */
-		if (!chg_profile_info || !temp_ranges)
-			return -1;
-	}
-
-	/*
-	 * If the battery voltage reading is bad or the battery voltage is
-	 * greater than or equal to the lower limit or the battery voltage is
-	 * not in the charger profile voltage range, consider battery has high
-	 * voltage range so that we charge at lower current limit.
-	 */
-	voltage_range = CONFIG_CHARGER_PROFILE_VOLTAGE_RANGES - 1;
-
-	if (!(curr->batt.flags & BATT_FLAG_BAD_VOLTAGE)) {
-		for (i = 0; i < CONFIG_CHARGER_PROFILE_VOLTAGE_RANGES - 1;
-			i++) {
-			if (curr->batt.voltage <
-					fast_chg_params->voltage_mV[i]) {
-				voltage_range = i;
-				break;
-			}
-		}
-	}
-
-	/*
-	 * If we are not charging or we aren't using fast charging profiles,
-	 * then do not override desired current and voltage.
-	 */
-	if (curr->state != ST_CHARGE || !fast_charging_allowed)
-		return 0;
-
-	/*
-	 * Okay, impose our custom will:
-	 */
-	curr->requested_current =
-			(*prev_chg_prof_info)->current_mA[voltage_range];
-	curr->requested_voltage = curr->requested_current ? batt_vtg_max : 0;
-
-#ifdef CONFIG_CMD_CHARGER_PROFILE_OVERRIDE_TEST
-	if (fast_charge_test_on)
-		ccprintf("Fast charge profile i=%dmA, v=%dmV\n",
-			curr->requested_current, curr->requested_voltage);
-#endif
-
-	return 0;
-}
-
-/* Customs options controllable by host command. */
-#define PARAM_FASTCHARGE (CS_PARAM_CUSTOM_PROFILE_MIN + 0)
-
-enum ec_status charger_profile_override_get_param(uint32_t param,
-						  uint32_t *value)
-{
-	if (param == PARAM_FASTCHARGE) {
-		*value = fast_charging_allowed;
-		return EC_RES_SUCCESS;
-	}
-	return EC_RES_INVALID_PARAM;
-}
-
-enum ec_status charger_profile_override_set_param(uint32_t param,
-						  uint32_t value)
-{
-	if (param == PARAM_FASTCHARGE) {
-		fast_charging_allowed = value;
-		return EC_RES_SUCCESS;
-	}
-	return EC_RES_INVALID_PARAM;
-}
-
-#ifdef CONFIG_CMD_CHARGER_PROFILE_OVERRIDE
-static int command_fastcharge(int argc, char **argv)
-{
-	if (argc > 1 && !parse_bool(argv[1], &fast_charging_allowed))
-		return EC_ERROR_PARAM1;
-
-	ccprintf("fastcharge %s\n", fast_charging_allowed ? "on" : "off");
-
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(fastcharge, command_fastcharge,
-			"[on|off]",
-			"Get or set fast charging profile");
-#endif
-
-/*
- * Manipulate the temperature and voltage values and check if the correct
- * fast charging profile is selected.
- */
-#ifdef CONFIG_CMD_CHARGER_PROFILE_OVERRIDE_TEST
-static int command_fastcharge_test(int argc, char **argv)
-{
-	char *e;
-	int test_on;
-
-	if (argc > 1 && !parse_bool(argv[1], &test_on))
-		return EC_ERROR_PARAM2;
-
-	/* Check if only tuurn printf message on / off */
-	if (argc == 2) {
-		fast_charge_test_on = test_on;
-		test_vtg_mV = -1;
-
-		return EC_SUCCESS;
-	}
-
-	/* Validate the input parameters */
-	if ((test_on && argc != 6) || !test_on)
-		return EC_ERROR_PARAM_COUNT;
-
-	test_flag_temp = strtoi(argv[2], &e, 0);
-	if (*e || test_flag_temp > 1 || test_flag_temp < 0)
-		return EC_ERROR_PARAM3;
-
-	test_flag_vtg = strtoi(argv[3], &e, 0);
-	if (*e || test_flag_vtg > 1 || test_flag_vtg < 0)
-		return EC_ERROR_PARAM4;
-
-	test_temp_c = strtoi(argv[4], &e, 0);
-	if (*e)
-		return EC_ERROR_PARAM5;
-
-	test_vtg_mV = strtoi(argv[5], &e, 0);
-	if (*e || test_vtg_mV < 0) {
-		test_vtg_mV = -1;
-		return EC_ERROR_PARAM6;
-	}
-
-	fast_charge_test_on = 1;
-
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(fastchgtest, command_fastcharge_test,
-			"off | on tempflag[1|0] vtgflag[1|0] temp_c vtg_mV",
-			"Check if fastcharge profile works");
-#endif