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/include/i8042_protocol.h b/include/i8042_protocol.h
deleted file mode 100644
index 7e554fc03e..0000000000
--- a/include/i8042_protocol.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2012 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.
- *
- * i8042 keyboard protocol constants
- */
-
-#ifndef __CROS_EC_I8042_PROTOCOL_H
-#define __CROS_EC_I8042_PROTOCOL_H
-
-/* Some commands appear more than once.  Why? */
-
-/* port 0x60 */
-#define I8042_CMD_MOUSE_1_1     0xe6
-#define I8042_CMD_MOUSE_2_1     0xe7
-#define I8042_CMD_MOUSE_RES     0xe8
-#define I8042_CMD_OK_GETID      0xe8
-#define I8042_CMD_GET_MOUSE     0xe9
-#define I8042_CMD_EX_ENABLE     0xea
-#define I8042_CMD_EX_SETLEDS    0xeb
-#define I8042_CMD_SETLEDS       0xed
-#define I8042_CMD_DIAG_ECHO     0xee
-#define I8042_CMD_GSCANSET      0xf0
-#define I8042_CMD_SSCANSET      0xf0
-#define I8042_CMD_GETID         0xf2
-#define I8042_CMD_SETREP        0xf3
-#define I8042_CMD_ENABLE        0xf4
-#define I8042_CMD_RESET_DIS     0xf5
-#define I8042_CMD_RESET_DEF     0xf6
-#define I8042_CMD_ALL_TYPEM     0xf7
-#define I8042_CMD_SETALL_MB     0xf8
-#define I8042_CMD_SETALL_MBR    0xfa
-#define I8042_CMD_SET_A_KEY_T   0xfb
-#define I8042_CMD_SET_A_KEY_MR  0xfc
-#define I8042_CMD_SET_A_KEY_M   0xfd
-#define I8042_CMD_RESET         0xff
-#define I8042_CMD_RESEND        0xfe
-
-/* port 0x64 */
-#define I8042_READ_CMD_BYTE     0x20
-#define I8042_READ_CTL_RAM      0x21
-#define I8042_READ_CTL_RAM_END  0x3f
-#define I8042_WRITE_CMD_BYTE    0x60  /* expect a byte on port 0x60 */
-#define I8042_WRITE_CTL_RAM     0x61
-#define I8042_WRITE_CTL_RAM_END 0x7f
-#define I8042_ROUTE_AUX0        0x90
-#define I8042_ROUTE_AUX1        0x91
-#define I8042_ROUTE_AUX2        0x92
-#define I8042_ROUTE_AUX3        0x93
-#define I8042_ENA_PASSWORD      0xa6
-#define I8042_DIS_MOUSE         0xa7
-#define I8042_ENA_MOUSE         0xa8
-#define I8042_TEST_MOUSE        0xa9
-#define I8042_RESET_SELF_TEST   0xaa
-#define I8042_TEST_KB_PORT      0xab
-#define I8042_DIS_KB            0xad
-#define I8042_ENA_KB            0xae
-#define I8042_READ_OUTPUT_PORT  0xd0
-#define I8042_WRITE_OUTPUT_PORT 0xd1
-#define I8042_ECHO_MOUSE        0xd3  /* expect a byte on port 0x60 */
-#define I8042_SEND_TO_MOUSE     0xd4  /* expect a byte on port 0x60 */
-#define I8042_DISABLE_A20       0xdd
-#define I8042_ENABLE_A20        0xdf
-#define I8042_PULSE_START       0xf0
-#define I8042_SYSTEM_RESET      0xfe
-#define I8042_PULSE_END         0xff
-
-/* port 0x60 return value */
-#define I8042_RET_EMUL0         0xe0
-#define I8042_RET_EMUL1         0xe1
-#define I8042_RET_ECHO          0xee
-#define I8042_RET_RELEASE       0xf0
-#define I8042_RET_HANJA         0xf1
-#define I8042_RET_HANGEUL       0xf2
-#define I8042_RET_ACK           0xfa
-#define I8042_RET_TEST_FAIL     0xfc
-#define I8042_RET_INTERNAL_FAIL 0xfd
-#define I8042_RET_NAK           0xfe
-#define I8042_RET_ERR           0xff
-
-/* port 64 - command byte bits */
-#define I8042_XLATE             BIT(6)
-#define I8042_AUX_DIS           BIT(5)
-#define I8042_KBD_DIS           BIT(4)
-#define I8042_SYS_FLAG          BIT(2)
-#define I8042_ENIRQ12           BIT(1)
-#define I8042_ENIRQ1            BIT(0)
-
-/* Status Flags */
-#define I8042_AUX_DATA		BIT(5)
-
-#endif /* __CROS_EC_I8042_PROTOCOL_H */