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

diff --git a/core/nds32/switch.S b/core/nds32/switch.S
deleted file mode 100644
index 631b0e0fe2..0000000000
--- a/core/nds32/switch.S
+++ /dev/null
@@ -1,109 +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.
- *
- * Context switching
- */
-
-#include "config.h"
-#include "cpu.h"
-
-.section .ram_code
-
-/**
- * Task context switching
- *
- * Change the task scheduled after returning from an interruption.
- *
- * This function must be called in interrupt context.
- *
- * Save the registers of the current task below the interrupt context on
- * its task, then restore the live registers of the next task and set the
- * process stack pointer to the new stack.
- *
- * $r0: pointer to the task to switch from
- * $r1: pointer to the task to switch to
- * $r2: pointer to the stack where the interrupt entry context is saved
- *
- * the structure of the saved context on the stack is :
- * (top to bottom)
- *  sp, lp, fp, r15, r5, r4, r3, r2, r1, r0, r10, r9, r8, r7, r6, ipc, ipsw
- *       interrupt entry frame            <|>
- */
-.global __switch_task
-__switch_task:
-	/* get the (new) highest priority task pointer in r0 */
-	jal next_sched_task
-	movi55 $r3, 0
-	/* pointer to the current task (which are switching from) */
-	lwi.gp  $r1, [ + current_task]
-	/* reset the re-scheduling request */
-	swi.gp  $r3, [ + need_resched]
-	/* Nothing to do: let's return to keep the same task scheduled */
-	beq $r1, $r0, 1f
-	/* save our new scheduled task  */
-	swi.gp  $r0, [ + current_task]
-	/* get the program status word saved at exception entry */
-	mfsr $r4, $IPSW /* to save SP_ADJ bit */
-	/* get the task program counter saved at exception entry */
-	mfsr $r5, $IPC
-	/* get the new scheduled task stack pointer */
-	lw   $r3, [$r0]
-	/* save ipsw, ipc, r6, r7, r8, r9, r10 on the current process stack */
-	smw.adm $r4, [$fp], $r10, 0
-	/* restore ipsw, ipc, r6, r7, r8, r9, r10 from the next stack context */
-	lmw.bim $r4, [$r3], $r10, 0
-	/* set the program status word to restore SP_ADJ bit */
-	mtsr $r4, $IPSW
-	/* set the task program counter to restore at exception exit */
-	mtsr $r5, $IPC
-	/* save the task stack pointer in its context */
-	sw   $fp, [$r1]
-	/* barrier: ensure IPC is taken into account before IRET */
-	dsb
-	/* exception frame pointer for the new task */
-	mov55 $fp, $r3
-1:      /* un-pile the interruption entry context */
-	/* isr exit */
-	jal end_irq_handler
-	/* restore r0-r5 */
-	lmw.bim $r0, [$fp], $r5, 0
-	/* restore r15, fp, lp and sp */
-	lmw.bi $r15, [$fp], $r15, 0xb
-	/* restore PC and PSW */
-	iret
-
-.text
-/**
- * Start the task scheduling.
- *
- * $r0 is a pointer to task_stack_ready, which is set to 1 after
- * the task stack is set up.
- */
-.global __task_start
-__task_start:
-	/*
-	 * Disable global interrupt here to ensure below sequence won't be
-	 * broken. The "iret" instruction of ISR will enable GIE again.
-	 */
-	setgie.d
-	/* area used as thread stack for the first switch */
-	la $r3, scratchpad
-
-	movi55 $r4, 1
-	movi55 $r2, 0    /* syscall 3rd parameter : not an IRQ emulation */
-	movi55 $r1, 0    /* syscall 2nd parameter : re-schedule nothing */
-	movi55 $r0, 0    /* syscall 1st parameter : de-schedule nothing */
-
-	/* put the stack pointer at the top of the stack in scratchpad */
-	addi $sp, $r3, 4 * TASK_SCRATCHPAD_SIZE
-	/* we are ready to re-schedule */
-	swi.gp  $r4, [ + need_resched]
-	swi.gp  $r4, [ + start_called]
-
-	/* trigger scheduling to execute the task with the highest priority */
-	syscall 0
-	/* we should never return here: set code to EC_ERROR_UNKNOWN */
-	movi55 $r0, 0x1
-	ret5   $lp
-