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

diff --git a/core/cortex-m0/mula.S b/core/cortex-m0/mula.S
deleted file mode 100644
index 02e617c328..0000000000
--- a/core/cortex-m0/mula.S
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2018 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.
- *
- * Cortex-M0 multiply-accumulate[-accumulate] functions
- */
-
-	.syntax unified
-	.text
-	.thumb
-
-@ uint64_t mula32(uint32_t a, uint32_t b, uint32_t c)
-@
-@ Multiply a (r0) and b (r1), add c (r2) and return the product in r1:r0
-@
-	.thumb_func
-	.section .text.mula32
-	.global mula32
-mula32:
-
-	push	{r4, r5}
-	uxth	r4, r0		/* r4 = a.lo16 */
-	uxth	r5, r1		/* r5 = b.lo16 */
-	uxth	r3, r2		/* r3 = c.lo16 */
-	muls	r4, r5		/* r4 = a.lo16 * b.lo16 */
-	adds	r4, r3		/* r4 = a.lo16 * b.lo16 + c.lo16 == r.lo32 */
-	lsrs	r3, r0, 16	/* r3 = a.hi16 */
-	lsrs	r2, r2, 16	/* r2 = c.hi16 */
-	muls	r5, r3		/* r5 = a.hi16 * b.lo16 */
-	adds	r5, r2		/* r5 = a.hi16 * b.lo16 + c.hi16 == r.mid32.1 */
-	uxth	r2, r0		/* r2 = a.lo16 */
-	lsrs	r1, r1, 16	/* r1 = b.hi16 */
-	muls	r2, r1		/* r2 = a.lo16 * b.hi16 == r.mid32.2 */
-	muls	r1, r3		/* r1 = b.hi16 * a.hi16 == r.hi32 */
-	movs	r3, 0		/* r3 = 0 */
-	adds	r5, r2		/* r5 = (r.mid32.1 + r.mid32.2).lo32 == r.mid.lo32 */
-	adcs	r3, r3		/* r3 = (r.mid32.1 + r.mid32.2).hi32 == r.mid.hi32 */
-	lsls	r0, r5, 16	/* r0 = r.mid.lo32.lo16 << 16 == r.mid.inpos.lo32 */
-	lsrs	r5, r5, 16	/* r5 = r.mid.lo32.hi16 >> 16 */
-	lsls	r3, r3, 16	/* r3 = r.mid.hi.lo16 << 16 */
-	adds	r3, r5		/* r3 = r5 + r3 = r.mid.inpos.hi32 */
-	adds	r0, r4		/* r0 = r.lo32 */
-	adcs	r1, r3		/* r1 = r.hi32 */
-	pop	{r4, r5}
-	bx	lr
-
-@ uint64_t mulaa32(uint32_t a, uint32_t b, uint32_t c, uint32_t d)
-@
-@ Multiply a (r0) and b (r1), add c (r2), add d (r3) and return the product in
-@ r1:r0
-	.thumb_func
-	.section .text.mulaa32
-	.global mulaa32
-mulaa32:
-
-	push	{r4, r5, r6}
-	uxth	r5, r0		/* r5 = a.lo16 */
-	uxth	r6, r1		/* r6 = b.lo16 */
-	uxth	r4, r2		/* r4 = c.lo16 */
-	muls	r5, r6		/* r5 = a.lo16 * b.lo16 */
-	adds	r5, r4		/* r5 = a.lo16 * b.lo16 + c.lo16 == r.lo32 */
-	lsrs	r4, r0, 16	/* r4 = a.hi16 */
-	lsrs	r2, r2, 16	/* r2 = c.hi16 */
-	muls	r6, r4		/* r6 = a.hi16 * b.lo16 */
-	adds	r6, r2		/* r6 = a.hi16 * b.lo16 + c.hi16 == r.mid32.1 */
-	uxth	r2, r0		/* r2 = a.lo16 */
-	lsrs	r1, r1, 16	/* r1 = b.hi16 */
-	muls	r2, r1		/* r2 = a.lo16 * b.hi16 == r.mid32.2 */
-	muls	r1, r4		/* r1 = b.hi16 * a.hi16 == r.hi32 */
-	movs	r4, 0		/* r4 = 0 */
-	adds	r6, r2		/* r6 = (r.mid32.1 + r.mid32.2).lo32 == r.mid.lo32 */
-	adcs	r4, r4		/* r4 = (r.mid32.1 + r.mid32.2).hi32 == r.mid.hi32 */
-	lsls	r0, r6, 16	/* r0 = r.mid.lo32.lo16 << 16 == r.mid.inpos.lo32 */
-	lsrs	r6, r6, 16	/* r6 = r.mid.lo32.hi16 >> 16 */
-	lsls	r4, r4, 16	/* r4 = r.mid.hi.lo16 << 16 */
-	adds	r0, r3		/* r0 = r.mid.inposition.lo32 + d */
-	adcs	r4, r6		/* r4 = r6 + r4 + carry = r.mid.inpos.hi32 */
-	adds	r0, r5		/* r0 = r.lo32 */
-	adcs	r1, r4		/* r1 = r.hi32 */
-	pop	{r4, r5, r6}
-	bx	lr