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

diff --git a/extra/usb_power/powerlog.README.md b/extra/usb_power/powerlog.README.md
deleted file mode 100644
index 105516330a..0000000000
--- a/extra/usb_power/powerlog.README.md
+++ /dev/null
@@ -1,210 +0,0 @@
-# Sweetberry USB power monitoring
-
-This tool allows high speed monitoring of power rails via a special USB
-endpoint. Currently this is implemented for the Sweetberry board.
-
-To use on a board, you'll need two config files, one describing the board, a
-`.board` file, and one describing the particular rails you want to monitor in
-this session, a `.scenario` file.
-
-## Converting from servo_ina configs
-
--   Method 1 (not limited to chroot)
-
-    Many configs can be found for the servo_ina_board in `hdctools/servo/data/`.
-    Sweetberry is plug compatible with servo_ina headers, and config files can
-    be converted with the following tool:
-
-    ```
-    ./convert_servo_ina.py <board>_r0_loc.py
-    ```
-
-    This will generate `<board>_r0_loc.board` and `<board>_r0_loc.scenario`
-    locally, which can be used with `powerlog.py`.
-
--   Method 2 (recommended for Chrome OS developers, requires chroot)
-
-    If you are using `powerlog.py` within the chroot, copy `<board>_r0_loc.py`
-    to `src/third_party/hdctools/servo/data`, then add this line to file:
-
-    ```python
-    config_type = 'sweetberry'
-    ```
-
-    And run command in chroot:
-
-    ```
-    (Anywhere in chroot, just ONCE) cros_workon --host start dev-util/hdctools
-    ```
-
-    Then every time you make a change to `<board>_r0_loc.py`, run:
-
-    ```
-    (Anywhere in chroot) sudo emerge dev-util/hdctools
-    ```
-
-    The command will install the corresponding `.board` and `.scenario` file in
-    the chroot. To use `powerlog.py` use the command:
-
-    ```
-    (Anywhere in chroot) powerlog -b <board>_r0_loc.board -c <board>_r0_loc.scenario
-    ```
-
-    There is no need to specify the absolute path to the `.board` and
-    `.scenario` file, once they are installed into the chroot. If there is any
-    changes to `<board>_r0_loc.py`, you need to `sudo emerge dev-util/hdctools`
-    again.
-
-## Board files
-
-Board files contain a list of rails, supporting 48 channels each on up to two
-Sweetberries. For each rail you must specify a name, sense resistor value, and
-channel number. You can optionally list expected voltage and net name. The
-format is as follows, in json:
-
-example.board:
-
-```json
-[
-{ "name": "railname",
-  "rs": <sense resistor value in ohms>,
-  "sweetberry": <"A" for main Sweetberry, "B" for a secondary Sweetberry>,
-  "channel": <0-47 according to board schematic>,
-  "v": <optional expected bus voltage in volts>,
-  "net": <optional schematic net name>
-},
-{...}
-]
-```
-
-## Scenario files
-
-Scenario files contain the set of rails to monitor in this session. The file
-format is simply a list of rail names from the board file.
-
-Optionally, you can specify the type of measurement, from the set of `"POWER"`,
-`"BUSV"`, `"CURRENT"`, `"SHUNTV"`. If not specified, the default is power.
-
-example.scenario:
-
-```json
-[
-"railname",
-"another_railname",
-["railname", "BUSV"],
-["railname", "CURRENT"],
-...
-]
-```
-
-## Output
-
-`powerlog.py` will output a csv formatted log to stdout, at timing intervals
-specified on the command line. Currently values below `-t 10000` do not work
-reliably but further updates should allow faster updating.
-
-An example run of:
-
-```
-./powerlog.py -b board/marlin/marlin.board -c board/marlin/marlin_short.scenario -t 100000
-```
-
-Will result in: `ts:32976us, VBAT uW, VDD_MEM uW, VDD_CORE uW, VDD_GFX uW,
-VDD_1V8_PANEL uW 0.033004, 12207.03, 4882.81, 9155.27, 2441.41, 0.00 0.066008,
-12207.03, 3662.11, 9155.27, 2441.41, 0.00 0.099012, 12207.03, 3662.11, 9155.27,
-2441.41, 0.00 ...`
-
-The output format is as follows:
-
--   `ts:32976us`
-
-    Timestamps either zero based or synced to system clock, in seconds. The
-    column header indicates the selected sampling interval. Since the INA231 has
-    specific hardware defines sampling options, this will be the closest
-    supported option lower than the requested `-t` value on the command line.
-
--   `VBAT uW`
-
-    Microwatt reading from this rail, generated on the INA by integrating the
-    voltage/amperage on the sense resistor over the sampling time, and
-    multiplying by the sampled bus voltage.
-
--   `... uW`
-
-    Further microwatt entry columns for each rail specified in your scenario
-    file.
-
--   `... xX`
-
-    Measurement in uW, mW, mV, uA, uV as per config.
-
-## Calculate stats and store data and stats
-
-When appropriate flag is set, powerlog.py is capable of calculating statistics
-and storing statistics and raw data.
-
--   Example 1
-
-    ```
-    ./powerlog.py -b board/eve_dvt2_loc/eve_dvt2_loc.board -c board/eve_dvt2_loc/eve_dvt2_loc.scenario --save_stats [<directory>]
-    ```
-
-    If `<directory>` is specified, this will save stats as:
-    `<directory>/sweetberry<timestamp>/summary.txt`. If `<directory>` does not
-    exist, it will be created.
-
-    If `<directory>` is not specified but the flag is set, this will save stats
-    under the directory which `powerlog.py` is in: `<directory of
-    powerlog.py>/sweetberry<timestamp>/summary.txt`.
-
-    If `--save_stats` flag is not set, stats will not be saved.
-
--   Example 2
-
-    ```
-    ./powerlog.py -b board/eve_dvt2_loc/eve_dvt2_loc.board -c board/eve_dvt2_loc/eve_dvt2_loc.scenario --save_raw_data [<directory>]
-    ```
-
-    If `<directory>` is specified, this will save raw data in:
-    `<directory>/sweetberry<timestamp>/raw_data/`. If `<directory>` does not
-    exist, it will be created.
-
-    If `<directory>` is not specified but the flag is set, this will save raw
-    data under the directory which `powerlog.py` is in: `<directory of
-    powerlog.py>/sweetberry<timestamp>/raw_data/`.
-
-    If `--save_raw_data` flag is not set, raw data will not be saved.
-
--   Example 3:
-
-    ```
-    ./powerlog.py -b board/eve_dvt2_loc/eve_dvt2_loc.board -c board/eve_dvt2_loc/eve_dvt2_loc.scenario --save_stats_json [<directory>]
-    ```
-
-    If `<directory>` is specified, this will save MEANS in json as:
-    `<directory>/sweetberry<timestamp>/summary.json`. If `<directory>` does not
-    exist, it will be created.
-
-    If `<directory>` is not specified but the flag is set, this will save MEANS
-    in json under the directory which `powerlog.py` is in: `<directory of
-    powerlog.py>/sweetberry<timestamp>/summary.json`.
-
-    If `--save_stats` flag is not set, stats will not be saved.
-
-    `--save_stats_json` is designed for `power_telemetry_logger` for easy
-    reading and writing.
-
-## Making developer changes to `powerlog.py`
-
-`powerlog.py` is installed in chroot, and the developer can import `powerlog` or
-use `powerlog` directly anywhere within chroot. Anytime the developer makes a
-change to `powerlog.py`, the developer needs to re-install `powerlog.py` so that
-anything that imports `powerlog` does not break. The following is how the
-developer installs `powerlog.py` during development.
-
-Run command in chroot:
-
-```
-(Anywhere in chroot, just ONCE) cros_workon --host start chromeos-base/ec-devutils
-(Anywhere in chroot, every time powerlog.py is changed) sudo emerge chromeos-base/ec-devutils
-```