Skip to content

Commit 6de10a3

Browse files
mstasiaknordicmasz-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 0f86922 commit 6de10a3

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
@@ -959,51 +959,6 @@ config NRFX_USBREG
959959
config NRFX_WDT
960960
bool
961961

962-
config NRFX_WDT0
963-
bool "WDT0 driver instance"
964-
depends on $(dt_nodelabel_exists,wdt0)
965-
select NRFX_WDT
966-
967-
config NRFX_WDT1
968-
bool "WDT1 driver instance"
969-
depends on $(dt_nodelabel_exists,wdt1)
970-
select NRFX_WDT
971-
972-
config NRFX_WDT30
973-
bool "WDT30 driver instance"
974-
depends on $(dt_nodelabel_exists,wdt30)
975-
select NRFX_WDT
976-
977-
config NRFX_WDT31
978-
bool "WDT31 driver instance"
979-
depends on $(dt_nodelabel_exists,wdt31)
980-
select NRFX_WDT
981-
982-
config NRFX_WDT010
983-
bool "WDT010 driver instance"
984-
depends on $(dt_nodelabel_exists,wdt010)
985-
select NRFX_WDT
986-
987-
config NRFX_WDT011
988-
bool "WDT011 driver instance"
989-
depends on $(dt_nodelabel_exists,wdt011)
990-
select NRFX_WDT
991-
992-
config NRFX_WDT130
993-
bool "WDT130 driver instance"
994-
depends on $(dt_nodelabel_exists,wdt130)
995-
select NRFX_WDT
996-
997-
config NRFX_WDT131
998-
bool "WDT131 driver instance"
999-
depends on $(dt_nodelabel_exists,wdt131)
1000-
select NRFX_WDT
1001-
1002-
config NRFX_WDT132
1003-
bool "WDT132 driver instance"
1004-
depends on $(dt_nodelabel_exists,wdt132)
1005-
select NRFX_WDT
1006-
1007962
menu "Peripheral Resource Sharing module"
1008963

1009964
config NRFX_PRS

modules/hal_nordic/nrfx/nrfx_kconfig.h

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -824,33 +824,6 @@
824824
#ifdef CONFIG_NRFX_WDT_LOG
825825
#define NRFX_WDT_CONFIG_LOG_ENABLED 1
826826
#endif
827-
#ifdef CONFIG_NRFX_WDT0
828-
#define NRFX_WDT0_ENABLED 1
829-
#endif
830-
#ifdef CONFIG_NRFX_WDT1
831-
#define NRFX_WDT1_ENABLED 1
832-
#endif
833-
#ifdef CONFIG_NRFX_WDT30
834-
#define NRFX_WDT30_ENABLED 1
835-
#endif
836-
#ifdef CONFIG_NRFX_WDT31
837-
#define NRFX_WDT31_ENABLED 1
838-
#endif
839-
#ifdef CONFIG_NRFX_WDT010
840-
#define NRFX_WDT010_ENABLED 1
841-
#endif
842-
#ifdef CONFIG_NRFX_WDT011
843-
#define NRFX_WDT011_ENABLED 1
844-
#endif
845-
#ifdef CONFIG_NRFX_WDT130
846-
#define NRFX_WDT130_ENABLED 1
847-
#endif
848-
#ifdef CONFIG_NRFX_WDT131
849-
#define NRFX_WDT131_ENABLED 1
850-
#endif
851-
#ifdef CONFIG_NRFX_WDT132
852-
#define NRFX_WDT132_ENABLED 1
853-
#endif
854827

855828
#ifdef CONFIG_NRF52_ANOMALY_109_WORKAROUND
856829
#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
@@ -518,30 +518,3 @@ config HAS_HW_NRF_USBREG
518518

519519
config HAS_HW_NRF_VMC
520520
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_VMC))
521-
522-
config HAS_HW_NRF_WDT0
523-
def_bool $(dt_nodelabel_enabled_with_compat,wdt0,$(DT_COMPAT_NORDIC_NRF_WDT))
524-
525-
config HAS_HW_NRF_WDT1
526-
def_bool $(dt_nodelabel_enabled_with_compat,wdt1,$(DT_COMPAT_NORDIC_NRF_WDT))
527-
528-
config HAS_HW_NRF_WDT30
529-
def_bool $(dt_nodelabel_enabled_with_compat,wdt30,$(DT_COMPAT_NORDIC_NRF_WDT))
530-
531-
config HAS_HW_NRF_WDT31
532-
def_bool $(dt_nodelabel_enabled_with_compat,wdt31,$(DT_COMPAT_NORDIC_NRF_WDT))
533-
534-
config HAS_HW_NRF_WDT010
535-
def_bool $(dt_nodelabel_enabled_with_compat,wdt010,$(DT_COMPAT_NORDIC_NRF_WDT))
536-
537-
config HAS_HW_NRF_WDT011
538-
def_bool $(dt_nodelabel_enabled_with_compat,wdt011,$(DT_COMPAT_NORDIC_NRF_WDT))
539-
540-
config HAS_HW_NRF_WDT130
541-
def_bool $(dt_nodelabel_enabled_with_compat,wdt130,$(DT_COMPAT_NORDIC_NRF_WDT))
542-
543-
config HAS_HW_NRF_WDT131
544-
def_bool $(dt_nodelabel_enabled_with_compat,wdt131,$(DT_COMPAT_NORDIC_NRF_WDT))
545-
546-
config HAS_HW_NRF_WDT132
547-
def_bool $(dt_nodelabel_enabled_with_compat,wdt132,$(DT_COMPAT_NORDIC_NRF_WDT))

0 commit comments

Comments
 (0)