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

diff --git a/baseboard/guybrush/cbi.c b/baseboard/guybrush/cbi.c
deleted file mode 100644
index 6d66b826dc..0000000000
--- a/baseboard/guybrush/cbi.c
+++ /dev/null
@@ -1,96 +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.
- */
-
-/* Guybrush CrOS Board Info(CBI) utilities */
-
-#include "base_fw_config.h"
-#include "console.h"
-#include "common.h"
-#include "cros_board_info.h"
-#include "hooks.h"
-
-uint32_t get_sku_id(void)
-{
-	static uint32_t sku_id;
-
-	if (sku_id == 0) {
-		uint32_t val;
-
-		if (cbi_get_sku_id(&val) != EC_SUCCESS)
-			return 0;
-		sku_id = val;
-	}
-	return sku_id;
-}
-
-uint32_t get_board_version(void)
-{
-	static uint32_t board_version;
-
-	if (board_version == 0) {
-		uint32_t val;
-
-		if (cbi_get_board_version(&val) != EC_SUCCESS)
-			return -1;
-		board_version = val;
-	}
-	return board_version;
-}
-
-uint32_t get_fw_config(void)
-{
-	static uint32_t fw_config = UNINITIALIZED_FW_CONFIG;
-
-	if (fw_config == UNINITIALIZED_FW_CONFIG) {
-		uint32_t val;
-
-		if (cbi_get_fw_config(&val) != EC_SUCCESS)
-			return UNINITIALIZED_FW_CONFIG;
-		fw_config = val;
-	}
-	return  fw_config;
-}
-
-
-int get_fw_config_field(uint8_t offset, uint8_t width)
-{
-	uint32_t fw_config = get_fw_config();
-
-	if (fw_config == UNINITIALIZED_FW_CONFIG)
-		return -1;
-
-	return (fw_config >> offset) & ((1 << width) - 1);
-}
-
-
-__overridable void board_cbi_init(void)
-{
-}
-
-static void cbi_init(void)
-{
-	uint32_t board_ver = get_board_version();
-	uint32_t sku_id = get_sku_id();
-	uint32_t fw_config = get_fw_config();
-
-	if (board_ver != 0)
-		ccprints("Board Version: %d (0x%x)", board_ver, board_ver);
-	else
-		ccprints("Board Version: not set in cbi");
-
-	if (sku_id != 0)
-		ccprints("SKU ID: %d (0x%x)", sku_id, sku_id);
-	else
-		ccprints("SKU ID: not set in cbi");
-
-	if (fw_config != UNINITIALIZED_FW_CONFIG)
-		ccprints("FW Config: %d (0x%x)", fw_config, fw_config);
-	else
-		ccprints("FW Config: not set in cbi");
-
-	/* Allow the board project to make runtime changes based on CBI data */
-	board_cbi_init();
-}
-DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1);