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

diff --git a/test/entropy.c b/test/entropy.c
deleted file mode 100644
index fb066a6c5b..0000000000
--- a/test/entropy.c
+++ /dev/null
@@ -1,92 +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.
- *
- * Tests entropy source.
- */
-
-#include "console.h"
-#include "common.h"
-#include "rollback.h"
-#include "test_util.h"
-#include "timer.h"
-#include "util.h"
-#include "watchdog.h"
-
-static int buckets[256];
-
-static const int log2_mult = 2;
-
-/*
- * log2 (multiplied by 2). For non-power of 2, this rounds to the closest
- * half-integer, otherwise the value is exact.
- */
-uint32_t log2(int32_t val)
-{
-	int val1 = 31 - __builtin_clz(val);
-	int val2 = 32 - __builtin_clz(val - 1);
-
-	return log2_mult * (val1 + val2)/2;
-}
-
-void run_test(int argc, char **argv)
-{
-	const int loopcount = 512;
-
-	uint8_t buffer[32];
-	timestamp_t t0, t1;
-	int i, j;
-	uint32_t entropy;
-	const int totalcount = loopcount * sizeof(buffer);
-	const int log2totalcount = log2(totalcount);
-
-	memset(buckets, 0, sizeof(buckets));
-
-	for (i = 0; i < loopcount; i++) {
-		t0 = get_time();
-		if (!board_get_entropy(buffer, sizeof(buffer))) {
-			ccprintf("Cannot get entropy\n");
-			test_fail();
-			return;
-		}
-		t1 = get_time();
-		if (i == 0)
-			ccprintf("Got %zd bytes in %" PRId64 " us\n",
-				sizeof(buffer), t1.val - t0.val);
-
-		for (j = 0; j < sizeof(buffer); j++)
-			buckets[buffer[j]]++;
-
-		watchdog_reload();
-	}
-
-	ccprintf("Total count: %d\n", totalcount);
-	ccprintf("Buckets: ");
-	entropy = 0;
-	for (j = 0; j < 256; j++) {
-		/*
-		 * Shannon entropy (base 2) is sum of -p[j] * log_2(p[j]).
-		 * p[j] = buckets[j]/totalcount
-		 * -p[j] * log_2(p[j])
-		 *  = -(buckets[j]/totalcount) * log_2(buckets[j]/totalcount)
-		 *  = buckets[j] * (log_2(totalcount) - log_2(buckets[j]))
-		 *                                               / totalcount
-		 * Our log2() function is scaled by log2_mult, and we defer the
-		 * division by totalcount until we get the total sum, so we need
-		 * to divide by (log2_mult * totalcount) at the end.
-		 */
-		entropy += buckets[j] * (log2totalcount - log2(buckets[j]));
-		ccprintf("%d;", buckets[j]);
-		cflush();
-	}
-	ccprintf("\n");
-
-	ccprintf("Entropy: %u/1000 bits\n",
-		entropy * 1000 / (log2_mult * totalcount));
-
-	/* We want at least 2 bits of entropy (out of a maximum of 8) */
-	if ((entropy / (log2_mult * totalcount)) >= 2)
-		test_pass();
-	else
-		test_fail();
-}