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>

10 files changed, 0 insertions, 409 deletions

diff --git a/zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml b/zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml
deleted file mode 100644
index 007a73b17b..0000000000
--- a/zephyr/dts/bindings/emul/cros,bb-retimer-emul.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 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.
-
-description: Zephyr BB retimer Emulator
-
-compatible: "cros,bb-retimer-emul"
-
-include: base.yaml
-
-properties:
-    vendor:
-        type: string
-        required: true
-        enum:
-          - BB_RETIMER_VENDOR_ID_1
-          - BB_RETIMER_VENDOR_ID_2
-        description: Vendor ID used by device that is emulated.
-
-    error-on-ro-write:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when read only register
-          is being written.
-
-    error-on-reserved-bit-write:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when reserved bit
-          is being written.
diff --git a/zephyr/dts/bindings/emul/cros,i2c-mock.yaml b/zephyr/dts/bindings/emul/cros,i2c-mock.yaml
deleted file mode 100644
index 7da69028bd..0000000000
--- a/zephyr/dts/bindings/emul/cros,i2c-mock.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 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.
-
-description: A generic I2C mock
-
-compatible: "cros,i2c-mock"
-
-include: base.yaml
-properties:
-   reg:
-     required: true
diff --git a/zephyr/dts/bindings/emul/cros,lis2dw12-emul.yaml b/zephyr/dts/bindings/emul/cros,lis2dw12-emul.yaml
deleted file mode 100644
index 44c29fbe56..0000000000
--- a/zephyr/dts/bindings/emul/cros,lis2dw12-emul.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2021 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.
-
-description: CROS implementation of the LIS2DW12 emulator
-
-compatible: "cros,lis2dw12-emul"
-
-include: base.yaml
-properties:
-  reg:
-    required: true
diff --git a/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml b/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml
deleted file mode 100644
index 811f77206f..0000000000
--- a/zephyr/dts/bindings/emul/cros,ln9310-emul.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2021 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.
-
-description: Cros LN9310 Emulator
-
-compatible: "cros,ln9310-emul"
-
-include: base.yaml
-
-properties:
-  reg:
-    required: true
diff --git a/zephyr/dts/bindings/emul/zephyr,bma255.yaml b/zephyr/dts/bindings/emul/zephyr,bma255.yaml
deleted file mode 100644
index 40750196c1..0000000000
--- a/zephyr/dts/bindings/emul/zephyr,bma255.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2021 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.
-
-description: Zephyr BMA255 Emulator
-
-compatible: "zephyr,bma255"
-
-include: base.yaml
-
-properties:
-    nvm-off-x:
-        type: int
-        required: false
-        default: 0
-        description: Accelerometer offset of x axis stored in NVM.
-
-    nvm-off-y:
-        type: int
-        required: false
-        default: 0
-        description: Accelerometer offset of y axis stored in NVM.
-
-    nvm-off-z:
-        type: int
-        required: false
-        default: 0
-        description: Accelerometer offset of z axis stored in NVM.
-
-    nvm-gp0:
-        type: int
-        required: false
-        default: 0
-        description: GP0 value stored in NVM.
-
-    nvm-gp1:
-        type: int
-        required: false
-        default: 0
-        description: GP1 value stored in NVM.
-
-    nvm-acc-x:
-        type: int
-        required: false
-        default: 0
-        description: Accelerometer value of x axis used until new value is set.
-
-    nvm-acc-y:
-        type: int
-        required: false
-        default: 0
-        description: Accelerometer value of y axis used until new value is set.
-
-    nvm-acc-z:
-        type: int
-        required: false
-        default: 0
-        description: Accelerometer value of z axis used until new value is set.
-
-    error-on-compensation-not-ready:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when fast compensation
-          is started when not ready bit is set.
-
-    error-on-ro-write:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when read only register
-          is being written.
-
-    error-on-reserved-bit-write:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when reserved bit
-          is being written.
-
-    error-on-msb-first-access:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when MSB register of
-          accelerometer value is accessed before LSB and shadowing is enabled
-          at the same time.
diff --git a/zephyr/dts/bindings/emul/zephyr,bmi.yaml b/zephyr/dts/bindings/emul/zephyr,bmi.yaml
deleted file mode 100644
index a754287bcc..0000000000
--- a/zephyr/dts/bindings/emul/zephyr,bmi.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021 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.
-
-description: Zephyr BMI Emulator
-
-compatible: "zephyr,bmi"
-
-include: base.yaml
-
-properties:
-    device-model:
-        type: string
-        required: true
-        enum:
-          - BMI_EMUL_160
-          - BMI_EMUL_260
-        description: Model of device that is emulated.
-
-    error-on-ro-write:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when read only register
-          is being written.
-
-    error-on-wo-read:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when write only register
-          is being read.
-
-    error-on-reserved-bit-write:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when reserved bit
-          is being written.
-
-    simulate-command-exec-time:
-        type: boolean
-        description:
-          Flag indicating if emulator should wait the same amount of time before
-          finishing command as real device would.
diff --git a/zephyr/dts/bindings/emul/zephyr,pi3usb9201.yaml b/zephyr/dts/bindings/emul/zephyr,pi3usb9201.yaml
deleted file mode 100644
index 856703e9d7..0000000000
--- a/zephyr/dts/bindings/emul/zephyr,pi3usb9201.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 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.
-
-description: Zephyr pi3usb9201 Emulator
-
-compatible: "zephyr,pi3usb9201-emul"
-
-include: base.yaml
diff --git a/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml b/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml
deleted file mode 100644
index cc1d2f368d..0000000000
--- a/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 2021 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.
-
-description: Zephyr Smart Battery Emulator
-
-compatible: "zephyr,smart-battery"
-
-include: base.yaml
-
-properties:
-    mf-access:
-        type: int
-        required: false
-        default: 0
-        description: Word returned on manufacturer access command.
-
-    at-rate-full-mw-support:
-        type: boolean
-        description:
-          Flag indicating if AT_RATE_TIME_TO_FULL command supports mW capacity
-          mode.
-
-    version:
-        type: string
-        required: false
-        enum:
-          - BATTERY_SPEC_VER_1_0
-          - BATTERY_SPEC_VER_1_1
-          - BATTERY_SPEC_VER_1_1_WITH_PEC
-        default: BATTERY_SPEC_VER_1_1_WITH_PEC
-        description: Version of Smart Battery.
-
-    vscale:
-        type: int
-        required: false
-        default: 0
-        description: Scaling of voltage.
-
-    ipscale:
-        type: int
-        required: false
-        default: 0
-        description: Scaling of current.
-
-    int-charge-controller:
-        type: boolean
-        description: Flag indicating if internal charge controller is supported.
-
-    primary-battery:
-        type: boolean
-        description:
-          Flag indicating if primary battery role selection is supported.
-
-    design-mv:
-        type: int
-        required: false
-        default: 5000
-        description: Design battery voltage in mV.
-
-    design-cap:
-        type: int
-        required: false
-        default: 5000
-        description: Design battery capacity in mAh.
-
-    temperature:
-        type: int
-        required: false
-        default: 2930
-        description: Battery temperature in 0.1 Kelvins.
-
-    volt:
-        type: int
-        required: false
-        default: 5000
-        description: Battery voltage in mV.
-
-    cur:
-        type: int
-        required: false
-        default: 1000
-        description: Current charging (> 0) or discharging (< 0) battery in mA.
-
-    avg-cur:
-        type: int
-        required: false
-        default: 1000
-        description: Average current from 1 minute.
-
-    max-error:
-        type: int
-        required: false
-        default: 0
-        description: Maximum error of commands return value in percent.
-
-    cap:
-        type: int
-        required: false
-        default: 2000
-        description: Capacity of the battery in mAh.
-
-    full-cap:
-        type: int
-        required: false
-        default: 4000
-        description: Full capacity of the battery in mAh.
-
-    desired-charg-cur:
-        type: int
-        required: false
-        default: 2000
-        description: Charging current requested by battery.
-
-    desired-charg-volt:
-        type: int
-        required: false
-        default: 7000
-        description: Charging voltage requested by battery.
-
-    cycle-count:
-        type: int
-        required: false
-        default: 125
-        description: Number of cycles.
-
-    serial-number:
-        type: int
-        required: false
-        default: 7
-        description: Serial number of battery.
-
-    mf-name:
-        type: string
-        required: false
-        default: "zephyr"
-        description: Manufacturer name. Length has to be smaller than 32 bytes.
-
-    dev-name:
-        type: string
-        required: false
-        default: "smartbat"
-        description: Device name. Length has to be smaller than 32 bytes.
-
-    dev-chem:
-        type: string
-        required: false
-        default: "LION"
-        description: Device chemistry. Length has to be smaller than 32 bytes.
-
-    mf-data:
-        type: string
-        required: false
-        default: "LION"
-        description: Manufacturer data. Length has to be smaller than 32 bytes.
diff --git a/zephyr/dts/bindings/emul/zephyr,syv682x.yaml b/zephyr/dts/bindings/emul/zephyr,syv682x.yaml
deleted file mode 100644
index 75de7cf743..0000000000
--- a/zephyr/dts/bindings/emul/zephyr,syv682x.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2021 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.
-
-description: Zephyr SYV682X Emulator
-
-compatible: "zephyr,syv682x-emul"
-
-include: base.yaml
diff --git a/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml b/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml
deleted file mode 100644
index a4474ec279..0000000000
--- a/zephyr/dts/bindings/emul/zephyr,tcs3400.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021 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.
-
-description: Zephyr ALS TCS3400 light sensor i2c emulator
-
-compatible: "zephyr,tcs3400"
-
-include: base.yaml
-
-properties:
-    device-id:
-        type: string
-        required: false
-        enum:
-          - TCS340015_DEVICE_ID
-          - TCS340037_DEVICE_ID
-        default: TCS340015_DEVICE_ID
-        description: Device ID that is set in the register.
-
-    revision:
-        type: int
-        required: false
-        default: 0
-        description: Wafer die revision level that is set in the register.
-
-    error-on-ro-write:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when read only register
-          is being written.
-
-    error-on-reserved-bit-write:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when reserved bit
-          is being written.
-
-    error-on-msb-first-access:
-        type: boolean
-        description:
-          Flag indicating if error should be generated when MSB register of
-          accelerometer value is accessed before LSB and shadowing is enabled
-          at the same time.