From: Fedora Kernel Team kernel-team@fedoraproject.org

Hi,

As part of the ongoing rebase effort, the following configuration options need to be reviewed.

As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy.

If the value for a file that is added should be changed, please reply with a better option.

CONFIG_ARM_SMC_WATCHDOG:

Say Y here to include support for a watchdog timer implemented by the EL3 Secure Monitor on ARM platforms. Requires firmware support. To compile this driver as a module, choose M here: the module will be called arm_smc_wdt.

Symbol: ARM_SMC_WATCHDOG [=n] Type : tristate Defined at drivers/watchdog/Kconfig:871 Prompt: ARM Secure Monitor Call based watchdog support Depends on: WATCHDOG [=y] && (ARM || ARM64 [=y]) && OF [=y] && HAVE_ARM_SMCCC [=y] Location: -> Device Drivers -> Watchdog Timer Support (WATCHDOG [=y]) Selects: WATCHDOG_CORE [=y]

---

Signed-off-by: Fedora Kernel Team kernel-team@fedoraproject.org --- .../common/generic/CONFIG_ARM_SMC_WATCHDOG | 1 + .../generic/CONFIG_ARM_SMC_WATCHDOG | 21 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) create mode 100644 redhat/configs/common/generic/CONFIG_ARM_SMC_WATCHDOG delete mode 100644 redhat/configs/pending-common/generic/CONFIG_ARM_SMC_WATCHDOG

diff --git a/redhat/configs/common/generic/CONFIG_ARM_SMC_WATCHDOG b/redhat/configs/common/generic/CONFIG_ARM_SMC_WATCHDOG new file mode 100644 index 000000000000..5292578ce994 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_ARM_SMC_WATCHDOG @@ -0,0 +1 @@ +# CONFIG_ARM_SMC_WATCHDOG is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_ARM_SMC_WATCHDOG b/redhat/configs/pending-common/generic/CONFIG_ARM_SMC_WATCHDOG deleted file mode 100644 index af24ce5fab9c..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_ARM_SMC_WATCHDOG +++ /dev/null @@ -1,21 +0,0 @@ -# CONFIG_ARM_SMC_WATCHDOG: -# -# Say Y here to include support for a watchdog timer -# implemented by the EL3 Secure Monitor on ARM platforms. -# Requires firmware support. -# To compile this driver as a module, choose M here: the -# module will be called arm_smc_wdt. -# -# Symbol: ARM_SMC_WATCHDOG [=n] -# Type : tristate -# Defined at drivers/watchdog/Kconfig:871 -# Prompt: ARM Secure Monitor Call based watchdog support -# Depends on: WATCHDOG [=y] && (ARM || ARM64 [=y]) && OF [=y] && HAVE_ARM_SMCCC [=y] -# Location: -# -> Device Drivers -# -> Watchdog Timer Support (WATCHDOG [=y]) -# Selects: WATCHDOG_CORE [=y] -# -# -# -# CONFIG_ARM_SMC_WATCHDOG is not set