Skip to content

Commit 33f5b33

Browse files
mib1-nordicjaz1-nordic
authored andcommitted
[nrf fromlist] modules: hal_nordic: remove TIMER config symbols
Remove TIMER config symbols to align to changes in nrfx driver. Upstream PR #: 96858 Signed-off-by: Michał Bainczyk <[email protected]>
1 parent 2c4d747 commit 33f5b33

File tree

2 files changed

+2
-207
lines changed

2 files changed

+2
-207
lines changed

modules/hal_nordic/nrfx/Kconfig

Lines changed: 2 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,7 @@ config NRFX_MRAMC
269269
config NRFX_NFCT
270270
bool "NFCT driver"
271271
depends on $(dt_nodelabel_exists,nfct)
272-
select NRFX_TIMER4 if SOC_SERIES_NRF52X
273-
select NRFX_TIMER2 if SOC_SERIES_NRF53X
274-
select NRFX_TIMER24 if SOC_SERIES_NRF54LX
272+
select NRFX_TIMER
275273

276274
config NRFX_NVMC
277275
bool "NVMC driver"
@@ -490,132 +488,7 @@ config NRFX_TEMP
490488
depends on $(dt_nodelabel_exists,temp)
491489

492490
config NRFX_TIMER
493-
bool
494-
495-
config NRFX_TIMER0
496-
bool "TIMER0 driver instance"
497-
depends on $(dt_nodelabel_exists,timer0)
498-
select NRFX_TIMER
499-
500-
config NRFX_TIMER1
501-
bool "TIMER1 driver instance"
502-
depends on $(dt_nodelabel_exists,timer1)
503-
select NRFX_TIMER
504-
505-
config NRFX_TIMER2
506-
bool "TIMER2 driver instance"
507-
depends on $(dt_nodelabel_exists,timer2)
508-
select NRFX_TIMER
509-
510-
config NRFX_TIMER3
511-
bool "TIMER3 driver instance"
512-
depends on $(dt_nodelabel_exists,timer3)
513-
select NRFX_TIMER
514-
515-
config NRFX_TIMER4
516-
bool "TIMER4 driver instance"
517-
depends on $(dt_nodelabel_exists,timer4)
518-
select NRFX_TIMER
519-
520-
config NRFX_TIMER00
521-
bool "TIMER00 driver instance"
522-
depends on $(dt_nodelabel_exists,timer00)
523-
select NRFX_TIMER
524-
525-
config NRFX_TIMER10
526-
bool "TIMER10 driver instance"
527-
depends on $(dt_nodelabel_exists,timer10)
528-
select NRFX_TIMER
529-
530-
config NRFX_TIMER20
531-
bool "TIMER20 driver instance"
532-
depends on $(dt_nodelabel_exists,timer20)
533-
select NRFX_TIMER
534-
535-
config NRFX_TIMER21
536-
bool "TIMER21 driver instance"
537-
depends on $(dt_nodelabel_exists,timer21)
538-
select NRFX_TIMER
539-
540-
config NRFX_TIMER22
541-
bool "TIMER22 driver instance"
542-
depends on $(dt_nodelabel_exists,timer22)
543-
select NRFX_TIMER
544-
545-
config NRFX_TIMER23
546-
bool "TIMER23 driver instance"
547-
depends on $(dt_nodelabel_exists,timer23)
548-
select NRFX_TIMER
549-
550-
config NRFX_TIMER24
551-
bool "TIMER24 driver instance"
552-
depends on $(dt_nodelabel_exists,timer24)
553-
select NRFX_TIMER
554-
555-
config NRFX_TIMER020
556-
bool "TIMER020 driver instance"
557-
depends on $(dt_nodelabel_exists,timer020)
558-
select NRFX_TIMER
559-
560-
config NRFX_TIMER021
561-
bool "TIMER021 driver instance"
562-
depends on $(dt_nodelabel_exists,timer021)
563-
select NRFX_TIMER
564-
565-
config NRFX_TIMER022
566-
bool "TIMER022 driver instance"
567-
depends on $(dt_nodelabel_exists,timer022)
568-
select NRFX_TIMER
569-
570-
config NRFX_TIMER120
571-
bool "TIMER120 driver instance"
572-
depends on $(dt_nodelabel_exists,timer120)
573-
select NRFX_TIMER
574-
575-
config NRFX_TIMER121
576-
bool "TIMER121 driver instance"
577-
depends on $(dt_nodelabel_exists,timer121)
578-
select NRFX_TIMER
579-
580-
config NRFX_TIMER130
581-
bool "TIMER130 driver instance"
582-
depends on $(dt_nodelabel_exists,timer130)
583-
select NRFX_TIMER
584-
585-
config NRFX_TIMER131
586-
bool "TIMER131 driver instance"
587-
depends on $(dt_nodelabel_exists,timer131)
588-
select NRFX_TIMER
589-
590-
config NRFX_TIMER132
591-
bool "TIMER132 driver instance"
592-
depends on $(dt_nodelabel_exists,timer132)
593-
select NRFX_TIMER
594-
595-
config NRFX_TIMER133
596-
bool "TIMER133 driver instance"
597-
depends on $(dt_nodelabel_exists,timer133)
598-
select NRFX_TIMER
599-
600-
config NRFX_TIMER134
601-
bool "TIMER134 driver instance"
602-
depends on $(dt_nodelabel_exists,timer134)
603-
select NRFX_TIMER
604-
605-
config NRFX_TIMER135
606-
bool "TIMER135 driver instance"
607-
depends on $(dt_nodelabel_exists,timer135)
608-
select NRFX_TIMER
609-
610-
config NRFX_TIMER136
611-
bool "TIMER136 driver instance"
612-
depends on $(dt_nodelabel_exists,timer136)
613-
select NRFX_TIMER
614-
615-
config NRFX_TIMER137
616-
bool "TIMER137 driver instance"
617-
depends on $(dt_nodelabel_exists,timer137)
618-
select NRFX_TIMER
491+
bool "TIMER driver"
619492

620493
config NRFX_TWI
621494
bool

modules/hal_nordic/nrfx/nrfx_kconfig.h

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -496,84 +496,6 @@
496496
#ifdef CONFIG_NRFX_TIMER
497497
#define NRFX_TIMER_ENABLED 1
498498
#endif
499-
#ifdef CONFIG_NRFX_TIMER_LOG
500-
#define NRFX_TIMER_CONFIG_LOG_ENABLED 1
501-
#endif
502-
#ifdef CONFIG_NRFX_TIMER0
503-
#define NRFX_TIMER0_ENABLED 1
504-
#endif
505-
#ifdef CONFIG_NRFX_TIMER1
506-
#define NRFX_TIMER1_ENABLED 1
507-
#endif
508-
#ifdef CONFIG_NRFX_TIMER2
509-
#define NRFX_TIMER2_ENABLED 1
510-
#endif
511-
#ifdef CONFIG_NRFX_TIMER3
512-
#define NRFX_TIMER3_ENABLED 1
513-
#endif
514-
#ifdef CONFIG_NRFX_TIMER4
515-
#define NRFX_TIMER4_ENABLED 1
516-
#endif
517-
#ifdef CONFIG_NRFX_TIMER00
518-
#define NRFX_TIMER00_ENABLED 1
519-
#endif
520-
#ifdef CONFIG_NRFX_TIMER10
521-
#define NRFX_TIMER10_ENABLED 1
522-
#endif
523-
#ifdef CONFIG_NRFX_TIMER20
524-
#define NRFX_TIMER20_ENABLED 1
525-
#endif
526-
#ifdef CONFIG_NRFX_TIMER21
527-
#define NRFX_TIMER21_ENABLED 1
528-
#endif
529-
#ifdef CONFIG_NRFX_TIMER22
530-
#define NRFX_TIMER22_ENABLED 1
531-
#endif
532-
#ifdef CONFIG_NRFX_TIMER23
533-
#define NRFX_TIMER23_ENABLED 1
534-
#endif
535-
#ifdef CONFIG_NRFX_TIMER24
536-
#define NRFX_TIMER24_ENABLED 1
537-
#endif
538-
#ifdef CONFIG_NRFX_TIMER020
539-
#define NRFX_TIMER020_ENABLED 1
540-
#endif
541-
#ifdef CONFIG_NRFX_TIMER021
542-
#define NRFX_TIMER021_ENABLED 1
543-
#endif
544-
#ifdef CONFIG_NRFX_TIMER022
545-
#define NRFX_TIMER022_ENABLED 1
546-
#endif
547-
#ifdef CONFIG_NRFX_TIMER120
548-
#define NRFX_TIMER120_ENABLED 1
549-
#endif
550-
#ifdef CONFIG_NRFX_TIMER121
551-
#define NRFX_TIMER121_ENABLED 1
552-
#endif
553-
#ifdef CONFIG_NRFX_TIMER130
554-
#define NRFX_TIMER130_ENABLED 1
555-
#endif
556-
#ifdef CONFIG_NRFX_TIMER131
557-
#define NRFX_TIMER131_ENABLED 1
558-
#endif
559-
#ifdef CONFIG_NRFX_TIMER132
560-
#define NRFX_TIMER132_ENABLED 1
561-
#endif
562-
#ifdef CONFIG_NRFX_TIMER133
563-
#define NRFX_TIMER133_ENABLED 1
564-
#endif
565-
#ifdef CONFIG_NRFX_TIMER134
566-
#define NRFX_TIMER134_ENABLED 1
567-
#endif
568-
#ifdef CONFIG_NRFX_TIMER135
569-
#define NRFX_TIMER135_ENABLED 1
570-
#endif
571-
#ifdef CONFIG_NRFX_TIMER136
572-
#define NRFX_TIMER136_ENABLED 1
573-
#endif
574-
#ifdef CONFIG_NRFX_TIMER137
575-
#define NRFX_TIMER137_ENABLED 1
576-
#endif
577499

578500
#ifdef CONFIG_NRFX_TWI
579501
#define NRFX_TWI_ENABLED 1

0 commit comments

Comments
 (0)