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

diff --git a/board/host/charger.c b/board/host/charger.c
deleted file mode 100644
index 4db1f44351..0000000000
--- a/board/host/charger.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Copyright 2012 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.
- *
- * Mock battery charger driver.
- */
-
-#include "battery_smart.h"
-#include "charger.h"
-#include "console.h"
-#include "common.h"
-#include "util.h"
-
-static const struct charger_info mock_charger_info = {
-	.name         = "MockCharger",
-	.voltage_max  = 19200,
-	.voltage_min  = 1024,
-	.voltage_step = 16,
-	.current_max  = 8192,
-	.current_min  = 128,
-	.current_step = 128,
-	.input_current_max  = 8064,
-	.input_current_min  = 128,
-	.input_current_step = 128,
-};
-
-#define OPTION_CHARGE_INHIBIT BIT(0)
-
-static uint32_t mock_option;
-static uint32_t mock_mode;
-static uint32_t mock_current;
-static uint32_t mock_voltage;
-static uint32_t mock_input_current;
-
-static const struct charger_info *mock_get_info(int chgnum)
-{
-	return &mock_charger_info;
-}
-
-
-static enum ec_error_list mock_get_status(int chgnum, int *status)
-{
-	*status = CHARGER_LEVEL_2;
-	if (mock_mode & CHARGE_FLAG_INHIBIT_CHARGE)
-		*status |= CHARGER_CHARGE_INHIBITED;
-
-	return EC_SUCCESS;
-}
-
-
-static enum ec_error_list mock_set_mode(int chgnum, int mode)
-{
-	if (mode & CHARGE_FLAG_INHIBIT_CHARGE)
-		mock_mode |= OPTION_CHARGE_INHIBIT;
-	else
-		mock_mode &= ~OPTION_CHARGE_INHIBIT;
-	return EC_SUCCESS;
-}
-
-
-static enum ec_error_list mock_get_current(int chgnum, int *current)
-{
-	*current = mock_current;
-	return EC_SUCCESS;
-}
-
-
-static enum ec_error_list mock_set_current(int chgnum, int current)
-{
-	const struct charger_info *info = mock_get_info(chgnum);
-
-	if (current > 0 && current < info->current_min)
-		current = info->current_min;
-	if (current > info->current_max)
-		current = info->current_max;
-
-	if (mock_current != current)
-		ccprintf("Charger set current: %d\n", current);
-	mock_current = current;
-	return EC_SUCCESS;
-}
-
-static enum ec_error_list mock_get_voltage(int chgnum, int *voltage)
-{
-	*voltage = mock_voltage;
-	return EC_SUCCESS;
-}
-
-
-static enum ec_error_list mock_set_voltage(int chgnum, int voltage)
-{
-	mock_voltage = voltage;
-	ccprintf("Charger set voltage: %d\n", voltage);
-	return EC_SUCCESS;
-}
-
-
-static enum ec_error_list mock_get_option(int chgnum, int *option)
-{
-	*option = mock_option;
-	return EC_SUCCESS;
-}
-
-
-static enum ec_error_list mock_set_option(int chgnum, int option)
-{
-	mock_option = option;
-	return EC_SUCCESS;
-}
-
-
-static enum ec_error_list mock_manufacturer_id(int chgnum, int *id)
-{
-	return EC_SUCCESS;
-}
-
-
-static enum ec_error_list mock_device_id(int chgnum, int *id)
-{
-	return EC_SUCCESS;
-}
-
-static enum ec_error_list mock_get_input_current_limit(int chgnum,
-						       int *input_current)
-{
-	*input_current = mock_input_current;
-	return EC_SUCCESS;
-}
-
-
-static enum ec_error_list mock_set_input_current_limit(int chgnum, int current)
-{
-	const struct charger_info *info = mock_get_info(chgnum);
-
-	if (current < info->input_current_min)
-		current = info->input_current_min;
-	if (current > info->input_current_max)
-		current = info->input_current_max;
-
-	if (mock_input_current != current)
-		ccprintf("Charger set input current: %d\n", current);
-
-	mock_input_current = current;
-	return EC_SUCCESS;
-}
-
-
-static enum ec_error_list mock_post_init(int chgnum)
-{
-	mock_current = mock_input_current = CONFIG_CHARGER_INPUT_CURRENT;
-	return EC_SUCCESS;
-}
-
-const struct charger_drv mock_drv = {
-	.post_init = &mock_post_init,
-	.get_info = &mock_get_info,
-	.get_status = &mock_get_status,
-	.set_mode = &mock_set_mode,
-	.get_current = &mock_get_current,
-	.set_current = &mock_set_current,
-	.get_voltage = &mock_get_voltage,
-	.set_voltage = &mock_set_voltage,
-	.set_input_current_limit = &mock_set_input_current_limit,
-	.get_input_current_limit = &mock_get_input_current_limit,
-	.manufacturer_id = &mock_manufacturer_id,
-	.device_id = &mock_device_id,
-	.get_option = &mock_get_option,
-	.set_option = &mock_set_option,
-};
-
-const struct charger_config_t chg_chips[] = {
-	{
-		.drv = &mock_drv,
-	},
-};