Skip to content

Commit d5e9789

Browse files
mstasiaknordicmagp-nordic
authored andcommitted
[nrf fromlist] modules: hal_nordic: remove WDT symbols
Removed Kconfig symbols for each WDT instance which are no longer needed. Upstream PR #: 96776 Signed-off-by: Michał Stasiak <[email protected]>
1 parent 395e5a2 commit d5e9789

File tree

4 files changed

+1
-108
lines changed

4 files changed

+1
-108
lines changed

drivers/watchdog/Kconfig.nrfx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,7 @@ config WDT_NRFX
77
bool "nRF WDT nrfx driver"
88
default y
99
depends on DT_HAS_NORDIC_NRF_WDT_ENABLED
10-
select NRFX_WDT0 if HAS_HW_NRF_WDT0
11-
select NRFX_WDT1 if HAS_HW_NRF_WDT1
12-
select NRFX_WDT30 if HAS_HW_NRF_WDT30
13-
select NRFX_WDT31 if HAS_HW_NRF_WDT31
14-
select NRFX_WDT010 if HAS_HW_NRF_WDT010
15-
select NRFX_WDT011 if HAS_HW_NRF_WDT011
16-
select NRFX_WDT130 if HAS_HW_NRF_WDT130
17-
select NRFX_WDT131 if HAS_HW_NRF_WDT131
18-
select NRFX_WDT132 if HAS_HW_NRF_WDT132
10+
select NRFX_WDT
1911
help
2012
Enable support for nrfx WDT driver for nRF MCU series.
2113

modules/hal_nordic/nrfx/Kconfig

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,51 +1013,6 @@ config NRFX_USBREG
10131013
config NRFX_WDT
10141014
bool
10151015

1016-
config NRFX_WDT0
1017-
bool "WDT0 driver instance"
1018-
depends on $(dt_nodelabel_exists,wdt0)
1019-
select NRFX_WDT
1020-
1021-
config NRFX_WDT1
1022-
bool "WDT1 driver instance"
1023-
depends on $(dt_nodelabel_exists,wdt1)
1024-
select NRFX_WDT
1025-
1026-
config NRFX_WDT30
1027-
bool "WDT30 driver instance"
1028-
depends on $(dt_nodelabel_exists,wdt30)
1029-
select NRFX_WDT
1030-
1031-
config NRFX_WDT31
1032-
bool "WDT31 driver instance"
1033-
depends on $(dt_nodelabel_exists,wdt31)
1034-
select NRFX_WDT
1035-
1036-
config NRFX_WDT010
1037-
bool "WDT010 driver instance"
1038-
depends on $(dt_nodelabel_exists,wdt010)
1039-
select NRFX_WDT
1040-
1041-
config NRFX_WDT011
1042-
bool "WDT011 driver instance"
1043-
depends on $(dt_nodelabel_exists,wdt011)
1044-
select NRFX_WDT
1045-
1046-
config NRFX_WDT130
1047-
bool "WDT130 driver instance"
1048-
depends on $(dt_nodelabel_exists,wdt130)
1049-
select NRFX_WDT
1050-
1051-
config NRFX_WDT131
1052-
bool "WDT131 driver instance"
1053-
depends on $(dt_nodelabel_exists,wdt131)
1054-
select NRFX_WDT
1055-
1056-
config NRFX_WDT132
1057-
bool "WDT132 driver instance"
1058-
depends on $(dt_nodelabel_exists,wdt132)
1059-
select NRFX_WDT
1060-
10611016
menu "Peripheral Resource Sharing module"
10621017

10631018
config NRFX_PRS

modules/hal_nordic/nrfx/nrfx_kconfig.h

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -857,33 +857,6 @@
857857
#ifdef CONFIG_NRFX_WDT_LOG
858858
#define NRFX_WDT_CONFIG_LOG_ENABLED 1
859859
#endif
860-
#ifdef CONFIG_NRFX_WDT0
861-
#define NRFX_WDT0_ENABLED 1
862-
#endif
863-
#ifdef CONFIG_NRFX_WDT1
864-
#define NRFX_WDT1_ENABLED 1
865-
#endif
866-
#ifdef CONFIG_NRFX_WDT30
867-
#define NRFX_WDT30_ENABLED 1
868-
#endif
869-
#ifdef CONFIG_NRFX_WDT31
870-
#define NRFX_WDT31_ENABLED 1
871-
#endif
872-
#ifdef CONFIG_NRFX_WDT010
873-
#define NRFX_WDT010_ENABLED 1
874-
#endif
875-
#ifdef CONFIG_NRFX_WDT011
876-
#define NRFX_WDT011_ENABLED 1
877-
#endif
878-
#ifdef CONFIG_NRFX_WDT130
879-
#define NRFX_WDT130_ENABLED 1
880-
#endif
881-
#ifdef CONFIG_NRFX_WDT131
882-
#define NRFX_WDT131_ENABLED 1
883-
#endif
884-
#ifdef CONFIG_NRFX_WDT132
885-
#define NRFX_WDT132_ENABLED 1
886-
#endif
887860

888861
#ifdef CONFIG_NRF52_ANOMALY_109_WORKAROUND
889862
#define NRF52_ERRATA_109_ENABLE_WORKAROUND 1

soc/nordic/common/Kconfig.peripherals

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -551,30 +551,3 @@ config HAS_HW_NRF_USBREG
551551

552552
config HAS_HW_NRF_VMC
553553
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_VMC))
554-
555-
config HAS_HW_NRF_WDT0
556-
def_bool $(dt_nodelabel_enabled_with_compat,wdt0,$(DT_COMPAT_NORDIC_NRF_WDT))
557-
558-
config HAS_HW_NRF_WDT1
559-
def_bool $(dt_nodelabel_enabled_with_compat,wdt1,$(DT_COMPAT_NORDIC_NRF_WDT))
560-
561-
config HAS_HW_NRF_WDT30
562-
def_bool $(dt_nodelabel_enabled_with_compat,wdt30,$(DT_COMPAT_NORDIC_NRF_WDT))
563-
564-
config HAS_HW_NRF_WDT31
565-
def_bool $(dt_nodelabel_enabled_with_compat,wdt31,$(DT_COMPAT_NORDIC_NRF_WDT))
566-
567-
config HAS_HW_NRF_WDT010
568-
def_bool $(dt_nodelabel_enabled_with_compat,wdt010,$(DT_COMPAT_NORDIC_NRF_WDT))
569-
570-
config HAS_HW_NRF_WDT011
571-
def_bool $(dt_nodelabel_enabled_with_compat,wdt011,$(DT_COMPAT_NORDIC_NRF_WDT))
572-
573-
config HAS_HW_NRF_WDT130
574-
def_bool $(dt_nodelabel_enabled_with_compat,wdt130,$(DT_COMPAT_NORDIC_NRF_WDT))
575-
576-
config HAS_HW_NRF_WDT131
577-
def_bool $(dt_nodelabel_enabled_with_compat,wdt131,$(DT_COMPAT_NORDIC_NRF_WDT))
578-
579-
config HAS_HW_NRF_WDT132
580-
def_bool $(dt_nodelabel_enabled_with_compat,wdt132,$(DT_COMPAT_NORDIC_NRF_WDT))

0 commit comments

Comments
 (0)