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

diff --git a/zephyr/Kconfig.flash b/zephyr/Kconfig.flash
deleted file mode 100644
index f6a8b2d103..0000000000
--- a/zephyr/Kconfig.flash
+++ /dev/null
@@ -1,107 +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.
-
-if PLATFORM_EC_FLASH_CROS
-
-config PLATFORM_EC_SPI_FLASH_REGS
-	bool "Enable SPI flash registers"
-	default y if SOC_FAMILY_NPCX
-	help
-	  Enables flash registers for SPI flash (both internal and external).
-	  When enabled, two new functions will become available: (1) a function
-	  to compute the block write protection range from a set of status
-	  registers, and (2) the inverse function to set the status registers
-	  based on the desired protection offset/length.
-
-config PLATFORM_EC_CONSOLE_CMD_CHARGEN
-	bool "Console command: chargen"
-	depends on UART_INTERRUPT_DRIVEN
-	help
-	  Enables the "chargen" console command, which sends a continuous
-	  stream of characters to the EC console.
-
-	  This allows to create tests which validate console output by
-	  verifying that no characters in the received sequence were lost.
-
-config PLATFORM_EC_CONSOLE_CMD_FLASH
-	bool "Console commands: flasherase, flashread, flashwrite"
-	help
-	  Enables various console commands:
-
-	     flasherase - erase flash region
-	     flashread - read from flash to memory
-	     flashwrite - write memory to flash
-
-config PLATFORM_EC_CONSOLE_CMD_FLASHINFO
-	bool "Console commands: flashinfo"
-	default y
-	help
-	  Enables various console commands:
-
-	     flashinfo - displays information about the flash storage
-
-config PLATFORM_EC_CONSOLE_CMD_FLASH_WP
-	bool "Console commands: flashwp"
-	default y
-	help
-	  Enables various console commands:
-
-	     flashwp - change write-protection settings
-
-config PLATFORM_EC_CONSOLE_CMD_SYSJUMP
-	bool "Console command: sysjump"
-	default y
-	help
-	  Enables the sysjump console command used for testing and verifying
-	  that we're able to jump between images. Normally, in an EC build,
-	  there will exist 2 images (sometimes more): read-only (RO) and
-	  read-write (RW). This console command allows us to manually jump
-	  between the various images (or even to a random starting address) by
-	  copying the image data from flash to ram, then jumping to the image's
-	  entry point.
-
-choice PLATFORM_EC_STORAGE_TYPE
-       prompt "Code storage type"
-       default PLATFORM_EC_EXTERNAL_STORAGE if SOC_FAMILY_NPCX
-       default PLATFORM_EC_INTERNAL_STORAGE if SOC_FAMILY_RISCV_ITE
-       help
-         Sets the EC code storage type.
-
-config PLATFORM_EC_EXTERNAL_STORAGE
-	bool "Flash is stored external to the EC"
-	help
-	  This indicates that the EC's flash is stored separately and is it
-	  not possible execute directly from it. Code must be loaded from
-	  the flash into internal SRAM before it can be executed. It is still
-	  possible to read and write the flash.
-
-config PLATFORM_EC_INTERNAL_STORAGE
-	bool "Flash is stored internal to the EC"
-	help
-	  This indicates that the EC code can reside on internal storage.
-	  This option implies XIP(eXecute-In-Place) semantics.
-	  i.e. code is being fetched directly from storage media.
-
-endchoice
-
-config PLATFORM_EC_MAPPED_STORAGE
-	bool "Flash is mapped into the EC's address space"
-	default y if SOC_FAMILY_NPCX || SOC_FAMILY_RISCV_ITE
-	help
-	  This indicates that the EC's flash is directly mapped into
-	  its address space. This makes it easier to read and write the flash.
-	  If this is not defined, the flash driver must implement
-	  flash_physical_read().
-
-config PLATFORM_EC_FLASH_PSTATE
-	bool "Store persistent write protect for the flash inside"
-	default y if SOC_FAMILY_RISCV_ITE
-	help
-	  Store persistent write protect for the flash inside the flash data
-	  itself.  This allows ECs with internal flash to emulate something
-	  closer to a SPI flash write protect register.  If this is not
-	  defined, write protect state is maintained solely by the physical
-	  flash driver.
-
-endif # PLATFORM_EC_FLASH_CROS