diff options
author | Jack Rosenthal <jrosenth@chromium.org> | 2021-11-04 12:11:58 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-11-05 04:22:34 +0000 |
commit | 252457d4b21f46889eebad61d4c0a65331919cec (patch) | |
tree | 01856c4d31d710b20e85a74c8d7b5836e35c3b98 /zephyr/Kconfig.watchdog | |
parent | 08f5a1e6fc2c9467230444ac9b582dcf4d9f0068 (diff) | |
download | chrome-ec-stabilize-voshyr-14637.B-ish.tar.gz |
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>
Diffstat (limited to 'zephyr/Kconfig.watchdog')
-rw-r--r-- | zephyr/Kconfig.watchdog | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/zephyr/Kconfig.watchdog b/zephyr/Kconfig.watchdog deleted file mode 100644 index 7d5860ce34..0000000000 --- a/zephyr/Kconfig.watchdog +++ /dev/null @@ -1,29 +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_WATCHDOG - -config PLATFORM_EC_WATCHDOG_PERIOD_MS - int "Watchdog timeout in ms" - default 1600 - help - Set the timeout of the watchdog timer. The watchdog timer reboots - the system if no one reloads the watchdog timer before the timeout. - -config PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS - int "Leading time of the watchdog warning timer in ms" - default 500 - depends on !WDT_NPCX && !WDT_ITE_IT8XXX2 - help - Set the leading time of the watchdog warning timer. Chromium EC system - uses an auxiliary timer to handle the system warning event. The - auxiliary timer period (CONFIG_AUX_TIMER_PERIOD_MS) is set to - PLATFORM_EC_WATCHDOG_PERIOD_MS - - PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS. - - For the NPCX chip, use WDT_NPCX_DELAY_CYCLES instead of this config. - For the ITE chip, use CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS instead - of this config. - -endif # PLATFORM_EC_WATCHDOG |