From: Mark Salter msalter@redhat.com
redhat/configs: enable HP_WATCHDOG for aarch64
HP watchdog is now supported on some HP aarch64 platforms, so enable it.
Also delete redhat/configs/pending-ark/generic/CONFIG_HP_WATCHDOG which was automatically added when ARM64 was added to HP_WATCHDOG supported arches. This had the unintended side effect of turning off HP_WATCHDOG for x86.
Signed-off-by: Mark Salter msalter@redhat.com
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_HP_WATCHDOG b/redhat/configs/common/generic/arm/aarch64/CONFIG_HP_WATCHDOG new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_HP_WATCHDOG @@ -0,0 +1 @@ +CONFIG_HP_WATCHDOG=m diff --git a/redhat/configs/pending-ark/generic/CONFIG_HP_WATCHDOG b/redhat/configs/pending-ark/generic/CONFIG_HP_WATCHDOG deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_HP_WATCHDOG +++ /dev/null @@ -1,14 +0,0 @@ -# Symbol: HP_WATCHDOG [=n] -# Type : tristate -# Defined at drivers/watchdog/Kconfig:1326 -# Prompt: HP ProLiant iLO2+ Hardware Watchdog Timer -# Depends on: WATCHDOG [=y] && (ARM64 [=y] || X86) && PCI [=y] -# Location: -# Main menu -# -> Device Drivers -# -> Watchdog Timer Support (WATCHDOG [=y]) -# Selects: WATCHDOG_CORE [=y] -# -# -# -# CONFIG_HP_WATCHDOG is not set
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2140