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

diff --git a/test/flash_write_protect.c b/test/flash_write_protect.c
deleted file mode 100644
index df20ede3fd..0000000000
--- a/test/flash_write_protect.c
+++ /dev/null
@@ -1,143 +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 "flash.h"
-#include "gpio.h"
-#include "string.h"
-#include "system.h"
-#include "task.h"
-#include "test_util.h"
-
-test_static int check_image_and_hardware_write_protect(void)
-{
-	int wp;
-
-	if (system_get_image_copy() != EC_IMAGE_RO) {
-		ccprintf("This test is only works when running RO\n");
-		return EC_ERROR_UNKNOWN;
-	}
-
-#ifdef CONFIG_WP_ALWAYS
-        wp = 1;
-#elif defined(CONFIG_WP_ACTIVE_HIGH)
-        wp = gpio_get_level(GPIO_WP);
-#else
-	wp = !gpio_get_level(GPIO_WP_L);
-#endif
-
-	if (!wp) {
-		ccprintf("Hardware write protect (GPIO_WP) must be enabled\n");
-		return EC_ERROR_UNKNOWN;
-	}
-
-	return EC_SUCCESS;
-}
-
-test_static int test_flash_write_protect_enable(void)
-{
-	int rv;
-
-	TEST_EQ(check_image_and_hardware_write_protect(), EC_SUCCESS, "%d");
-
-	/* Equivalent of ectool --name=cros_fp flashprotect enable */
-	rv = crec_flash_set_protect(EC_FLASH_PROTECT_RO_AT_BOOT,
-				    EC_FLASH_PROTECT_RO_AT_BOOT);
-
-	return rv;
-}
-
-test_static int test_flash_write_protect_disable(void)
-{
-	int rv;
-
-	TEST_EQ(check_image_and_hardware_write_protect(), EC_SUCCESS, "%d");
-
-	/* Equivalent of ectool --name=cros_fp flashprotect disable */
-	rv = crec_flash_set_protect(EC_FLASH_PROTECT_RO_AT_BOOT, 0);
-	TEST_NE(rv, EC_SUCCESS, "%d");
-
-	return EC_SUCCESS;
-}
-
-test_static void run_test_step1(void)
-{
-	ccprintf("Step 1: Flash write protect test\n");
-	RUN_TEST(test_flash_write_protect_enable);
-
-	if (test_get_error_count())
-		test_reboot_to_next_step(TEST_STATE_FAILED);
-	else
-		test_reboot_to_next_step(TEST_STATE_STEP_2);
-}
-
-test_static void run_test_step2(void)
-{
-	ccprintf("Step 2: Flash write protect test\n");
-	RUN_TEST(test_flash_write_protect_disable);
-
-	if (test_get_error_count())
-		test_reboot_to_next_step(TEST_STATE_FAILED);
-	else if (IS_ENABLED(CONFIG_EEPROM_CBI_WP))
-		test_reboot_to_next_step(TEST_STATE_STEP_3);
-	else
-		test_reboot_to_next_step(TEST_STATE_PASSED);
-}
-
-#ifdef CONFIG_EEPROM_CBI_WP
-test_static int test_cbi_wb_asserted_immediately(void)
-{
-	int rv;
-
-	TEST_EQ(check_image_and_hardware_write_protect(), EC_SUCCESS, "%d");
-
-	/* Ensure that EC_CBI_WP is not asserted. */
-	TEST_EQ(gpio_get_level(GPIO_EC_CBI_WP), 0, "%d");
-
-	/* Equivalent of ectool --name=cros_fp flashprotect disable */
-	rv = crec_flash_set_protect(EC_FLASH_PROTECT_RO_NOW, 0);
-	TEST_EQ(rv, EC_SUCCESS, "%d");
-
-	/* Now make sure EC_CBI_WP is asserted immediately. */
-	TEST_EQ(gpio_get_level(GPIO_EC_CBI_WP), 1, "%d");
-
-
-	return EC_SUCCESS;
-}
-
-test_static void run_test_step3(void)
-{
-	ccprintf("Step 3: Flash write protect test\n");
-	RUN_TEST(test_cbi_wb_asserted_immediately);
-
-	if (test_get_error_count())
-		test_reboot_to_next_step(TEST_STATE_FAILED);
-	else
-		test_reboot_to_next_step(TEST_STATE_PASSED);
-}
-#endif /* CONFIG_EEPROM_CBI_WP */
-
-void test_run_step(uint32_t state)
-{
-	if (state & TEST_STATE_MASK(TEST_STATE_STEP_1))
-		run_test_step1();
-	else if (state & TEST_STATE_MASK(TEST_STATE_STEP_2))
-		run_test_step2();
-#ifdef CONFIG_EEPROM_CBI_WP
-	else if (state & TEST_STATE_MASK(TEST_STATE_STEP_3))
-		run_test_step3();
-#endif /* CONFIG_EEPROM_CBI_WP */
-}
-
-int task_test(void *unused)
-{
-	test_run_multistep();
-	return EC_SUCCESS;
-}
-
-void run_test(int argc, char **argv)
-{
-	msleep(30); /* Wait for TASK_ID_TEST to initialize */
-	task_wake(TASK_ID_TEST);
-}