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

diff --git a/cts/mutex/th.c b/cts/mutex/th.c
deleted file mode 100644
index 9cbbd8badb..0000000000
--- a/cts/mutex/th.c
+++ /dev/null
@@ -1,116 +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.
- * Copyright 2011 Google Inc.
- *
- * Tasks for mutexes basic tests.
- */
-
-#include "console.h"
-#include "common.h"
-#include "cts_common.h"
-#include "task.h"
-#include "test_util.h"
-#include "timer.h"
-#include "util.h"
-
-static struct mutex mtx;
-
-/* period between 50us and 3.2ms */
-#define PERIOD_US(num) (((num % 64) + 1) * 50)
-/* one of the 3 MTX3x tasks */
-#define RANDOM_TASK(num) (TASK_ID_MTX3C + (num % 3))
-
-int mutex_random_task(void *unused)
-{
-	char letter = 'A'+(TASK_ID_MTX3A - task_get_current());
-	/* wait to be activated */
-
-	while (1) {
-		task_wait_event(0);
-		ccprintf("%c+\n", letter);
-		mutex_lock(&mtx);
-		ccprintf("%c=\n", letter);
-		task_wait_event(0);
-		ccprintf("%c-\n", letter);
-		mutex_unlock(&mtx);
-	}
-
-	task_wait_event(0);
-
-	return EC_SUCCESS;
-}
-
-int mutex_second_task(void *unused)
-{
-	task_id_t id = task_get_current();
-
-	ccprintf("\n[Mutex second task %d]\n", id);
-
-	task_wait_event(0);
-	ccprintf("MTX2: locking...");
-	mutex_lock(&mtx);
-	ccprintf("done\n");
-	task_wake(TASK_ID_CTS);
-	ccprintf("MTX2: unlocking...\n");
-	mutex_unlock(&mtx);
-
-	task_wait_event(0);
-
-	return EC_SUCCESS;
-}
-
-static enum cts_rc lock_unlock_test(void)
-{
-	task_id_t id = task_get_current();
-	uint32_t rdelay = (uint32_t)0x0bad1dea;
-	uint32_t rtask = (uint32_t)0x1a4e1dea;
-	int i;
-
-	ccprintf("\n[Mutex main task %d]\n", id);
-
-	/* --- Lock/Unlock without contention --- */
-	ccprintf("No contention :");
-	mutex_lock(&mtx);
-	mutex_unlock(&mtx);
-	mutex_lock(&mtx);
-	mutex_unlock(&mtx);
-	mutex_lock(&mtx);
-	mutex_unlock(&mtx);
-	ccprintf("done.\n");
-
-	/* --- Serialization to test simple contention --- */
-	ccprintf("Simple contention :\n");
-	/* lock the mutex from the other task */
-	task_set_event(TASK_ID_MTX2, TASK_EVENT_WAKE);
-	task_wait_event(0);
-	/* block on the mutex */
-	ccprintf("MTX1: blocking...\n");
-	mutex_lock(&mtx);
-	ccprintf("MTX1: get lock\n");
-	mutex_unlock(&mtx);
-
-	/* --- mass lock-unlocking from several tasks --- */
-	ccprintf("Massive locking/unlocking :\n");
-	for (i = 0; i < 500; i++) {
-		/* Wake up a random task */
-		task_wake(RANDOM_TASK(rtask));
-		/* next pseudo random delay */
-		rtask = prng(rtask);
-		/* Wait for a "random" period */
-		task_wait_event(PERIOD_US(rdelay));
-		/* next pseudo random delay */
-		rdelay = prng(rdelay);
-	}
-
-	return EC_SUCCESS;
-}
-
-#include "cts_testlist.h"
-
-void cts_task(void)
-{
-	wait_for_task_started();
-	cts_main_loop(tests, "Mutex");
-	task_wait_event(-1);
-}