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>

3 files changed, 0 insertions, 190 deletions

diff --git a/cts/hook/cts.testlist b/cts/hook/cts.testlist
deleted file mode 100644
index 97b25575d4..0000000000
--- a/cts/hook/cts.testlist
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2017 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.
- */
-
-/*
- * Test HOOK_INIT
- */
-CTS_TEST(test_init_hook,,,,)
-
-/*
- * Test HOOK_TICK and HOOK_SECOND
- */
-CTS_TEST(test_ticks,,,,)
-
-/*
- * Test hook priority
- */ 
-CTS_TEST(test_priority,,,,)
-
-/*
- * Test deferred calls
- */
-CTS_TEST(test_deferred,,,,)
\ No newline at end of file
diff --git a/cts/hook/dut.c b/cts/hook/dut.c
deleted file mode 100644
index f3a52ddaf4..0000000000
--- a/cts/hook/dut.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Copyright 2013 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.
- *
- * Test hooks.
- */
-
-#include "common.h"
-#include "console.h"
-#include "cts_common.h"
-#include "hooks.h"
-#include "task.h"
-#include "timer.h"
-#include "util.h"
-#include "watchdog.h"
-
-static int init_hook_count;
-static int tick_hook_count;
-static int tick2_hook_count;
-static int tick_count_seen_by_tick2;
-static timestamp_t tick_time[2];
-static int second_hook_count;
-static timestamp_t second_time[2];
-static int deferred_call_count;
-
-static void init_hook(void)
-{
-	init_hook_count++;
-}
-DECLARE_HOOK(HOOK_INIT, init_hook, HOOK_PRIO_DEFAULT);
-
-static void tick_hook(void)
-{
-	tick_hook_count++;
-	tick_time[0] = tick_time[1];
-	tick_time[1] = get_time();
-}
-DECLARE_HOOK(HOOK_TICK, tick_hook, HOOK_PRIO_DEFAULT);
-
-static void tick2_hook(void)
-{
-	tick2_hook_count++;
-	tick_count_seen_by_tick2 = tick_hook_count;
-}
-/* tick2_hook() prio means it should be called after tick_hook() */
-DECLARE_HOOK(HOOK_TICK, tick2_hook, HOOK_PRIO_DEFAULT + 1);
-
-static void second_hook(void)
-{
-	second_hook_count++;
-	second_time[0] = second_time[1];
-	second_time[1] = get_time();
-}
-DECLARE_HOOK(HOOK_SECOND, second_hook, HOOK_PRIO_DEFAULT);
-
-static void deferred_func(void)
-{
-	deferred_call_count++;
-}
-DECLARE_DEFERRED(deferred_func);
-
-static void invalid_deferred_func(void)
-{
-	deferred_call_count++;
-}
-
-static const struct deferred_data invalid_deferred_func_data = {
-	invalid_deferred_func
-};
-
-static enum cts_rc test_init_hook(void)
-{
-	if (init_hook_count != 1)
-		return CTS_RC_FAILURE;
-	return CTS_RC_SUCCESS;
-}
-
-static enum cts_rc test_ticks(void)
-{
-	int64_t interval;
-	int error_pct;
-
-	/*
-	 * HOOK_SECOND must have been fired at least once when HOOK
-	 * task starts. We only need to wait for just more than a second
-	 * to allow it fires for the second time.
-	 */
-	msleep(1300);
-
-	interval = tick_time[1].val - tick_time[0].val;
-	error_pct = (interval - HOOK_TICK_INTERVAL) * 100 /
-		    HOOK_TICK_INTERVAL;
-	if (error_pct < -10 || 10 < error_pct) {
-		CPRINTS("tick error=%d%% interval=%lld", error_pct, interval);
-		return CTS_RC_FAILURE;
-	}
-
-	interval = second_time[1].val - second_time[0].val;
-	error_pct = (interval - SECOND) * 100 / SECOND;
-	if (error_pct < -10 || 10 < error_pct) {
-		CPRINTS("second error=%d%% interval=%lld", error_pct, interval);
-		return CTS_RC_FAILURE;
-	}
-
-	return CTS_RC_SUCCESS;
-}
-
-static enum cts_rc test_priority(void)
-{
-	usleep(HOOK_TICK_INTERVAL);
-	if (tick_hook_count != tick2_hook_count)
-		return CTS_RC_FAILURE;
-	if (tick_hook_count != tick_count_seen_by_tick2)
-		return CTS_RC_FAILURE;
-	return CTS_RC_SUCCESS;
-}
-
-static enum cts_rc test_deferred(void)
-{
-	deferred_call_count = 0;
-	hook_call_deferred(&deferred_func_data, 50 * MSEC);
-	if (deferred_call_count != 0) {
-		CPRINTL("deferred_call_count=%d", deferred_call_count);
-		return CTS_RC_FAILURE;
-	}
-	msleep(100);
-	if (deferred_call_count != 1) {
-		CPRINTL("deferred_call_count=%d", deferred_call_count);
-		return CTS_RC_FAILURE;
-	}
-
-	/* Test cancellation */
-	deferred_call_count = 0;
-	hook_call_deferred(&deferred_func_data, 50 * MSEC);
-	msleep(25);
-	hook_call_deferred(&deferred_func_data, -1);
-	msleep(75);
-	if (deferred_call_count != 0) {
-		CPRINTL("deferred_call_count=%d", deferred_call_count);
-		return CTS_RC_FAILURE;
-	}
-
-	/* Invalid deferred function */
-	deferred_call_count = 0;
-	if (hook_call_deferred(&invalid_deferred_func_data, 50 * MSEC)
-			== EC_SUCCESS) {
-		CPRINTL("non_deferred_func_data");
-		return CTS_RC_FAILURE;
-	}
-	msleep(100);
-	if (deferred_call_count != 0) {
-		CPRINTL("deferred_call_count=%d", deferred_call_count);
-		return CTS_RC_FAILURE;
-	}
-
-	return CTS_RC_SUCCESS;
-}
-
-#include "cts_testlist.h"
-
-void cts_task(void)
-{
-	cts_main_loop(tests, "Hook");
-	task_wait_event(-1);
-}
diff --git a/cts/hook/th.c b/cts/hook/th.c
deleted file mode 120000
index 41eab28462..0000000000
--- a/cts/hook/th.c
+++ /dev/null
@@ -1 +0,0 @@
-dut.c
\ No newline at end of file