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>

9 files changed, 0 insertions, 299 deletions

diff --git a/board/nucleo-dartmonkey/board.c b/board/nucleo-dartmonkey/board.c
deleted file mode 100644
index a7851ec00b..0000000000
--- a/board/nucleo-dartmonkey/board.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Copyright 2020 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.
- */
-
-#include "common.h"
-#include "console.h"
-#include "fpsensor_detect.h"
-#include "gpio.h"
-#include "hooks.h"
-#include "registers.h"
-#include "spi.h"
-#include "system.h"
-#include "task.h"
-#include "util.h"
-
-/**
- * Disable restricted commands when the system is locked.
- *
- * @see console.h system.c
- */
-int console_is_restricted(void)
-{
-	return system_is_locked();
-}
-
-static void ap_deferred(void)
-{
-	/*
-	 * Behavior:
-	 * AP Active  (ex. Intel S0):   SLP_L is 1
-	 * AP Suspend (ex. Intel S0ix): SLP_L is 0
-	 * The alternative SLP_ALT_L should be pulled high at all the times.
-	 *
-	 * Legacy Intel behavior:
-	 * in S3:   SLP_ALT_L is 0 and SLP_L is X.
-	 * in S0ix: SLP_ALT_L is X and SLP_L is 0.
-	 * in S0:   SLP_ALT_L is 1 and SLP_L is 1.
-	 * in S5/G3, the FP MCU should not be running.
-	 */
-	int running = gpio_get_level(GPIO_SLP_ALT_L)
-			&& gpio_get_level(GPIO_SLP_L);
-
-	if (running) { /* S0 */
-		disable_sleep(SLEEP_MASK_AP_RUN);
-		hook_notify(HOOK_CHIPSET_RESUME);
-	} else { /* S0ix/S3 */
-		hook_notify(HOOK_CHIPSET_SUSPEND);
-		enable_sleep(SLEEP_MASK_AP_RUN);
-	}
-}
-DECLARE_DEFERRED(ap_deferred);
-
-/* PCH power state changes */
-static void slp_event(enum gpio_signal signal)
-{
-	hook_call_deferred(&ap_deferred_data, 0);
-}
-
-#ifndef HAS_TASK_FPSENSOR
-void fps_event(enum gpio_signal signal)
-{
-}
-#endif
-
-#include "gpio_list.h"
-
-/* SPI devices */
-struct spi_device_t spi_devices[] = {
-	/* Fingerprint sensor (SCLK at 4Mhz) */
-	{ .port = CONFIG_SPI_FP_PORT, .div = 3, .gpio_cs = GPIO_SPI4_NSS }
-};
-const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices);
-
-static void spi_configure(void)
-{
-	/* Configure SPI GPIOs */
-	gpio_config_module(MODULE_SPI_CONTROLLER, 1);
-	/* Set all SPI master signal pins to very high speed: pins E2/4/5/6 */
-	STM32_GPIO_OSPEEDR(GPIO_E) |= 0x00003f30;
-	/* Enable clocks to SPI4 module (master) */
-	STM32_RCC_APB2ENR |= STM32_RCC_PB2_SPI4;
-
-	spi_enable(&spi_devices[0], 1);
-}
-
-/* Initialize board. */
-static void board_init(void)
-{
-	spi_configure();
-
-	ccprints("TRANSPORT_SEL: %s",
-		fp_transport_type_to_str(get_fp_transport_type()));
-
-	/* Enable interrupt on PCH power signals */
-	gpio_enable_interrupt(GPIO_SLP_ALT_L);
-	gpio_enable_interrupt(GPIO_SLP_L);
-
-	/*
-	 * Enable the SPI slave interface if the PCH is up.
-	 * Do not use hook_call_deferred(), because ap_deferred() will be
-	 * called after tasks with priority higher than HOOK task (very late).
-	 */
-	ap_deferred();
-}
-DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
diff --git a/board/nucleo-dartmonkey/board.h b/board/nucleo-dartmonkey/board.h
deleted file mode 100644
index 9e220db7dc..0000000000
--- a/board/nucleo-dartmonkey/board.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2020 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.
- */
-
-/*
- * STM32H743 + FPC 1145 Fingerprint MCU configuration
- *
- * This board is designed to have nucleo-h743zi support (uart+btn+leds) with
- * dartmonkey configuration (fingerprint support).
- * This allows for proxy testing of dartmonkey on the Nucleo-H743ZI.
- */
-
-#ifndef __BOARD_H
-#define __BOARD_H
-
-/* Baseboard features */
-#include "base-board.h"
-
-#undef CONFIG_SYSTEM_UNLOCKED
-
-/*
- * These allow console commands to be flagged as restricted.
- * Restricted commands will only be permitted to run when
- * console_is_restricted() returns false.
- * See console_is_restricted's definition in board.c.
- */
-#define CONFIG_CONSOLE_COMMAND_FLAGS
-#define CONFIG_RESTRICTED_CONSOLE_COMMANDS
-
-/* Fingerprint needs to store a secrect in the anti-rollback block */
-#define CONFIG_ROLLBACK_SECRET_SIZE 32
-
-/* SPI configuration for the fingerprint sensor */
-#define CONFIG_SPI_CONTROLLER
-#define CONFIG_SPI_FP_PORT  2 /* SPI4: third master config */
-
-#define CONFIG_FINGERPRINT_MCU
-
-#ifdef SECTION_IS_RW
-	/* Select fingerprint sensor */
-#	define CONFIG_FP_SENSOR_FPC1145
-#	define CONFIG_CMD_FPSENSOR_DEBUG
-	/* Special memory regions to store large arrays */
-#	define FP_FRAME_SECTION    __SECTION(ahb4)
-#	define FP_TEMPLATE_SECTION __SECTION(ahb)
-	/*
-	 * Use the malloc code only in the RW section (for the private library),
-	 * we cannot enable it in RO since it is not compatible with the RW
-	 * verification (shared_mem_init done too late).
-	 */
-#	define CONFIG_MALLOC
-#endif /* SECTION_IS_RW */
-
-#ifndef __ASSEMBLER__
-	void fps_event(enum gpio_signal signal);
-#endif /* !__ASSEMBLER__ */
-
-#endif /* __BOARD_H */
diff --git a/board/nucleo-dartmonkey/build.mk b/board/nucleo-dartmonkey/build.mk
deleted file mode 100644
index 4bc677e7e0..0000000000
--- a/board/nucleo-dartmonkey/build.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 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.
-#
-# Board specific files build
-
-BASEBOARD:=nucleo-h743zi
-
-board-y=board.o
-board-y+=fpsensor_detect.o
-
-# Enable on device tests
-test-list-y=\
-       aes \
-       cec \
-       compile_time_macros \
-       crc \
-       flash_physical \
-       flash_write_protect \
-       fpsensor \
-       fpsensor_hw \
-       mpu \
-       mutex \
-       pingpong \
-       printf \
-       queue \
-       rollback \
-       rollback_entropy \
-       rsa3 \
-       rtc \
-       scratchpad \
-       sha256 \
-       sha256_unrolled \
-       static_if \
-       timer_dos \
-       utils \
-       utils_str \
diff --git a/board/nucleo-dartmonkey/dev_key.pem b/board/nucleo-dartmonkey/dev_key.pem
deleted file mode 100644
index 5b3a7ab290..0000000000
--- a/board/nucleo-dartmonkey/dev_key.pem
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/board/nucleo-dartmonkey/ec.tasklist b/board/nucleo-dartmonkey/ec.tasklist
deleted file mode 100644
index 80e226637b..0000000000
--- a/board/nucleo-dartmonkey/ec.tasklist
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright 2020 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.
- */
-
- #include "base-ec.tasklist"
-
-/**
- * See CONFIG_TASK_LIST in config.h for details.
- */
-#define CONFIG_TASK_LIST BASEBOARD_CONFIG_TASK_LIST \
-	TASK_ALWAYS_RW(FPSENSOR, fp_task, NULL, 4096)
diff --git a/board/nucleo-dartmonkey/fpsensor_detect.c b/board/nucleo-dartmonkey/fpsensor_detect.c
deleted file mode 100644
index 72b9b89e11..0000000000
--- a/board/nucleo-dartmonkey/fpsensor_detect.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 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.
- */
-
-#include "fpsensor_detect.h"
-
-enum fp_sensor_type get_fp_sensor_type(void)
-{
-	return FP_SENSOR_TYPE_FPC;
-}
-
-enum fp_transport_type get_fp_transport_type(void)
-{
-	return FP_TRANSPORT_TYPE_SPI;
-}
diff --git a/board/nucleo-dartmonkey/gpio.inc b/board/nucleo-dartmonkey/gpio.inc
deleted file mode 100644
index 11709fe738..0000000000
--- a/board/nucleo-dartmonkey/gpio.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2020 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.
- */
-
-/*
- * Note that these pins map to the Nucleo-H743ZI V2 and are only slightly
- * compatible with the original version.
- *
- * The V2 is denoted by "Nucleo-H743ZI2" vs. "Nucleo-H743ZI".
- */
-
-#include "base-gpio.inc"
-
-/* Interrupts */
-GPIO_INT(SLP_L,           PIN(D, 13), GPIO_INT_BOTH, slp_event)
-GPIO_INT(SLP_ALT_L,       PIN(A, 11), GPIO_INT_BOTH, slp_event)
-
-/* Output for User Presence */
-GPIO(USER_PRES_L,         PIN(C, 5),  GPIO_ODR_HIGH)
-
-/* Fingerprint Sensor */
-GPIO_INT(FPS_INT,         PIN(A, 0),  GPIO_INT_RISING, fps_event)
-GPIO(FP_RST_ODL,          PIN(E, 0),  GPIO_OUT_HIGH)
-GPIO(SPI4_NSS,            PIN(E, 4),  GPIO_OUT_HIGH)
-/* SPI4 master to sensor: PE2/5/6 (CLK/MISO/MOSI) */
-ALTERNATE(PIN_MASK(E, 0x0064), GPIO_ALT_SPI, MODULE_SPI_CONTROLLER,  0)
diff --git a/board/nucleo-dartmonkey/openocd-flash.cfg b/board/nucleo-dartmonkey/openocd-flash.cfg
deleted file mode 120000
index 904ee459ab..0000000000
--- a/board/nucleo-dartmonkey/openocd-flash.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../baseboard/nucleo-h743zi/openocd-flash.cfg
\ No newline at end of file
diff --git a/board/nucleo-dartmonkey/openocd.cfg b/board/nucleo-dartmonkey/openocd.cfg
deleted file mode 120000
index b3fc5796c5..0000000000
--- a/board/nucleo-dartmonkey/openocd.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../baseboard/nucleo-h743zi/openocd.cfg
\ No newline at end of file