Skip to content

Commit c505e58

Browse files
[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 27b51c1 commit c505e58

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
@@ -1233,51 +1233,6 @@ config NRFX_USBREG
12331233
config NRFX_WDT
12341234
bool
12351235

1236-
config NRFX_WDT0
1237-
bool "WDT0 driver instance"
1238-
depends on $(dt_nodelabel_exists,wdt0)
1239-
select NRFX_WDT
1240-
1241-
config NRFX_WDT1
1242-
bool "WDT1 driver instance"
1243-
depends on $(dt_nodelabel_exists,wdt1)
1244-
select NRFX_WDT
1245-
1246-
config NRFX_WDT30
1247-
bool "WDT30 driver instance"
1248-
depends on $(dt_nodelabel_exists,wdt30)
1249-
select NRFX_WDT
1250-
1251-
config NRFX_WDT31
1252-
bool "WDT31 driver instance"
1253-
depends on $(dt_nodelabel_exists,wdt31)
1254-
select NRFX_WDT
1255-
1256-
config NRFX_WDT010
1257-
bool "WDT010 driver instance"
1258-
depends on $(dt_nodelabel_exists,wdt010)
1259-
select NRFX_WDT
1260-
1261-
config NRFX_WDT011
1262-
bool "WDT011 driver instance"
1263-
depends on $(dt_nodelabel_exists,wdt011)
1264-
select NRFX_WDT
1265-
1266-
config NRFX_WDT130
1267-
bool "WDT130 driver instance"
1268-
depends on $(dt_nodelabel_exists,wdt130)
1269-
select NRFX_WDT
1270-
1271-
config NRFX_WDT131
1272-
bool "WDT131 driver instance"
1273-
depends on $(dt_nodelabel_exists,wdt131)
1274-
select NRFX_WDT
1275-
1276-
config NRFX_WDT132
1277-
bool "WDT132 driver instance"
1278-
depends on $(dt_nodelabel_exists,wdt132)
1279-
select NRFX_WDT
1280-
12811236
menu "Peripheral Resource Sharing module"
12821237

12831238
config NRFX_PRS

modules/hal_nordic/nrfx/nrfx_kconfig.h

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -987,33 +987,6 @@
987987
#ifdef CONFIG_NRFX_WDT_LOG
988988
#define NRFX_WDT_CONFIG_LOG_ENABLED 1
989989
#endif
990-
#ifdef CONFIG_NRFX_WDT0
991-
#define NRFX_WDT0_ENABLED 1
992-
#endif
993-
#ifdef CONFIG_NRFX_WDT1
994-
#define NRFX_WDT1_ENABLED 1
995-
#endif
996-
#ifdef CONFIG_NRFX_WDT30
997-
#define NRFX_WDT30_ENABLED 1
998-
#endif
999-
#ifdef CONFIG_NRFX_WDT31
1000-
#define NRFX_WDT31_ENABLED 1
1001-
#endif
1002-
#ifdef CONFIG_NRFX_WDT010
1003-
#define NRFX_WDT010_ENABLED 1
1004-
#endif
1005-
#ifdef CONFIG_NRFX_WDT011
1006-
#define NRFX_WDT011_ENABLED 1
1007-
#endif
1008-
#ifdef CONFIG_NRFX_WDT130
1009-
#define NRFX_WDT130_ENABLED 1
1010-
#endif
1011-
#ifdef CONFIG_NRFX_WDT131
1012-
#define NRFX_WDT131_ENABLED 1
1013-
#endif
1014-
#ifdef CONFIG_NRFX_WDT132
1015-
#define NRFX_WDT132_ENABLED 1
1016-
#endif
1017990

1018991
#ifdef CONFIG_NRF52_ANOMALY_109_WORKAROUND
1019992
#define NRFX_SPIM_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1

soc/nordic/common/Kconfig.peripherals

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

684684
config HAS_HW_NRF_VMC
685685
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_VMC))
686-
687-
config HAS_HW_NRF_WDT0
688-
def_bool $(dt_nodelabel_enabled_with_compat,wdt0,$(DT_COMPAT_NORDIC_NRF_WDT))
689-
690-
config HAS_HW_NRF_WDT1
691-
def_bool $(dt_nodelabel_enabled_with_compat,wdt1,$(DT_COMPAT_NORDIC_NRF_WDT))
692-
693-
config HAS_HW_NRF_WDT30
694-
def_bool $(dt_nodelabel_enabled_with_compat,wdt30,$(DT_COMPAT_NORDIC_NRF_WDT))
695-
696-
config HAS_HW_NRF_WDT31
697-
def_bool $(dt_nodelabel_enabled_with_compat,wdt31,$(DT_COMPAT_NORDIC_NRF_WDT))
698-
699-
config HAS_HW_NRF_WDT010
700-
def_bool $(dt_nodelabel_enabled_with_compat,wdt010,$(DT_COMPAT_NORDIC_NRF_WDT))
701-
702-
config HAS_HW_NRF_WDT011
703-
def_bool $(dt_nodelabel_enabled_with_compat,wdt011,$(DT_COMPAT_NORDIC_NRF_WDT))
704-
705-
config HAS_HW_NRF_WDT130
706-
def_bool $(dt_nodelabel_enabled_with_compat,wdt130,$(DT_COMPAT_NORDIC_NRF_WDT))
707-
708-
config HAS_HW_NRF_WDT131
709-
def_bool $(dt_nodelabel_enabled_with_compat,wdt131,$(DT_COMPAT_NORDIC_NRF_WDT))
710-
711-
config HAS_HW_NRF_WDT132
712-
def_bool $(dt_nodelabel_enabled_with_compat,wdt132,$(DT_COMPAT_NORDIC_NRF_WDT))

0 commit comments

Comments
 (0)