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

diff --git a/test/flash_physical.c b/test/flash_physical.c
deleted file mode 100644
index 06dd495254..0000000000
--- a/test/flash_physical.c
+++ /dev/null
@@ -1,132 +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 "chip/stm32/flash-regs.h"
-#include "flash.h"
-#include "panic.h"
-#include "test_util.h"
-
-struct flash_info {
-	int num_flash_banks;
-	int write_protect_bank_offset;
-	int write_protect_bank_count;
-};
-
-#if defined(CHIP_VARIANT_STM32F412)
-struct flash_info flash_info = {
-	.num_flash_banks = 12,
-	.write_protect_bank_offset = 0,
-	.write_protect_bank_count = 5,
-};
-#elif defined(CHIP_VARIANT_STM32H7X3)
-struct flash_info flash_info = {
-	.num_flash_banks = 16,
-	.write_protect_bank_offset = 0,
-	.write_protect_bank_count = 6,
-};
-#else
-#error "Flash info not defined for this chip. Please add it."
-#endif
-
-
-test_static int test_lock_option_bytes(void)
-{
-	TEST_EQ(flash_option_bytes_locked(), true, "%d");
-
-	unlock_flash_option_bytes();
-
-	TEST_EQ(flash_option_bytes_locked(), false, "%d");
-
-	lock_flash_option_bytes();
-
-	TEST_EQ(flash_option_bytes_locked(), true, "%d");
-
-	unlock_flash_option_bytes();
-
-	TEST_EQ(flash_option_bytes_locked(), false, "%d");
-
-	return EC_SUCCESS;
-}
-
-test_static int test_disable_option_bytes(void)
-{
-	TEST_EQ(flash_option_bytes_locked(), false, "%d");
-
-	disable_flash_option_bytes();
-
-	TEST_EQ(flash_option_bytes_locked(), true, "%d");
-
-	/* Since we've disabled the option bytes we'll get a bus fault. */
-	ignore_bus_fault(1);
-
-	unlock_flash_option_bytes();
-
-	ignore_bus_fault(0);
-
-	/* Option bytes should still be locked. */
-	TEST_EQ(flash_option_bytes_locked(), true, "%d");
-
-	return EC_SUCCESS;
-}
-
-test_static int test_lock_flash_control_register(void)
-{
-	TEST_EQ(flash_control_register_locked(), true, "%d");
-
-	unlock_flash_control_register();
-
-	TEST_EQ(flash_control_register_locked(), false, "%d");
-
-	lock_flash_control_register();
-
-	TEST_EQ(flash_control_register_locked(), true, "%d");
-
-	unlock_flash_control_register();
-
-	TEST_EQ(flash_control_register_locked(), false, "%d");
-
-	return EC_SUCCESS;
-}
-
-test_static int test_disable_flash_control_register(void)
-{
-	TEST_EQ(flash_control_register_locked(), false, "%d");
-
-	disable_flash_control_register();
-
-	TEST_EQ(flash_control_register_locked(), true, "%d");
-
-	/* Since we've disabled the option bytes we'll get a bus fault. */
-	ignore_bus_fault(1);
-
-	unlock_flash_control_register();
-
-	ignore_bus_fault(0);
-
-	/* Control register should still be locked. */
-	TEST_EQ(flash_control_register_locked(), true, "%d");
-
-	return EC_SUCCESS;
-}
-
-test_static int test_flash_config(void)
-{
-	TEST_EQ(PHYSICAL_BANKS, flash_info.num_flash_banks, "%d");
-	TEST_EQ(WP_BANK_OFFSET, flash_info.write_protect_bank_offset, "%d");
-	TEST_EQ(WP_BANK_COUNT, flash_info.write_protect_bank_count, "%d");
-	return EC_SUCCESS;
-}
-
-void run_test(int argc, char **argv)
-{
-	ccprintf("Running flash physical test\n");
-	RUN_TEST(test_flash_config);
-
-	RUN_TEST(test_lock_option_bytes);
-	RUN_TEST(test_disable_option_bytes);
-	RUN_TEST(test_lock_flash_control_register);
-	RUN_TEST(test_disable_flash_control_register);
-	test_print_result();
-}