Skip to content

Commit ef0988b

Browse files
committed
[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 067b173 commit ef0988b

File tree

2 files changed

+2
-206
lines changed

2 files changed

+2
-206
lines changed

modules/hal_nordic/nrfx/Kconfig

Lines changed: 2 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,7 @@ config NRFX_MRAMC
279279
config NRFX_NFCT
280280
bool "NFCT driver"
281281
depends on $(dt_nodelabel_exists,nfct)
282-
select NRFX_TIMER4 if SOC_SERIES_NRF52X
283-
select NRFX_TIMER2 if SOC_SERIES_NRF53X
282+
select NRFX_TIMER
284283

285284
config NRFX_NVMC
286285
bool "NVMC driver"
@@ -764,132 +763,7 @@ config NRFX_TEMP
764763
depends on $(dt_nodelabel_exists,temp)
765764

766765
config NRFX_TIMER
767-
bool
768-
769-
config NRFX_TIMER0
770-
bool "TIMER0 driver instance"
771-
depends on $(dt_nodelabel_exists,timer0)
772-
select NRFX_TIMER
773-
774-
config NRFX_TIMER1
775-
bool "TIMER1 driver instance"
776-
depends on $(dt_nodelabel_exists,timer1)
777-
select NRFX_TIMER
778-
779-
config NRFX_TIMER2
780-
bool "TIMER2 driver instance"
781-
depends on $(dt_nodelabel_exists,timer2)
782-
select NRFX_TIMER
783-
784-
config NRFX_TIMER3
785-
bool "TIMER3 driver instance"
786-
depends on $(dt_nodelabel_exists,timer3)
787-
select NRFX_TIMER
788-
789-
config NRFX_TIMER4
790-
bool "TIMER4 driver instance"
791-
depends on $(dt_nodelabel_exists,timer4)
792-
select NRFX_TIMER
793-
794-
config NRFX_TIMER00
795-
bool "TIMER00 driver instance"
796-
depends on $(dt_nodelabel_exists,timer00)
797-
select NRFX_TIMER
798-
799-
config NRFX_TIMER10
800-
bool "TIMER10 driver instance"
801-
depends on $(dt_nodelabel_exists,timer10)
802-
select NRFX_TIMER
803-
804-
config NRFX_TIMER20
805-
bool "TIMER20 driver instance"
806-
depends on $(dt_nodelabel_exists,timer20)
807-
select NRFX_TIMER
808-
809-
config NRFX_TIMER21
810-
bool "TIMER21 driver instance"
811-
depends on $(dt_nodelabel_exists,timer21)
812-
select NRFX_TIMER
813-
814-
config NRFX_TIMER22
815-
bool "TIMER22 driver instance"
816-
depends on $(dt_nodelabel_exists,timer22)
817-
select NRFX_TIMER
818-
819-
config NRFX_TIMER23
820-
bool "TIMER23 driver instance"
821-
depends on $(dt_nodelabel_exists,timer23)
822-
select NRFX_TIMER
823-
824-
config NRFX_TIMER24
825-
bool "TIMER24 driver instance"
826-
depends on $(dt_nodelabel_exists,timer24)
827-
select NRFX_TIMER
828-
829-
config NRFX_TIMER020
830-
bool "TIMER020 driver instance"
831-
depends on $(dt_nodelabel_exists,timer020)
832-
select NRFX_TIMER
833-
834-
config NRFX_TIMER021
835-
bool "TIMER021 driver instance"
836-
depends on $(dt_nodelabel_exists,timer021)
837-
select NRFX_TIMER
838-
839-
config NRFX_TIMER022
840-
bool "TIMER022 driver instance"
841-
depends on $(dt_nodelabel_exists,timer022)
842-
select NRFX_TIMER
843-
844-
config NRFX_TIMER120
845-
bool "TIMER120 driver instance"
846-
depends on $(dt_nodelabel_exists,timer120)
847-
select NRFX_TIMER
848-
849-
config NRFX_TIMER121
850-
bool "TIMER121 driver instance"
851-
depends on $(dt_nodelabel_exists,timer121)
852-
select NRFX_TIMER
853-
854-
config NRFX_TIMER130
855-
bool "TIMER130 driver instance"
856-
depends on $(dt_nodelabel_exists,timer130)
857-
select NRFX_TIMER
858-
859-
config NRFX_TIMER131
860-
bool "TIMER131 driver instance"
861-
depends on $(dt_nodelabel_exists,timer131)
862-
select NRFX_TIMER
863-
864-
config NRFX_TIMER132
865-
bool "TIMER132 driver instance"
866-
depends on $(dt_nodelabel_exists,timer132)
867-
select NRFX_TIMER
868-
869-
config NRFX_TIMER133
870-
bool "TIMER133 driver instance"
871-
depends on $(dt_nodelabel_exists,timer133)
872-
select NRFX_TIMER
873-
874-
config NRFX_TIMER134
875-
bool "TIMER134 driver instance"
876-
depends on $(dt_nodelabel_exists,timer134)
877-
select NRFX_TIMER
878-
879-
config NRFX_TIMER135
880-
bool "TIMER135 driver instance"
881-
depends on $(dt_nodelabel_exists,timer135)
882-
select NRFX_TIMER
883-
884-
config NRFX_TIMER136
885-
bool "TIMER136 driver instance"
886-
depends on $(dt_nodelabel_exists,timer136)
887-
select NRFX_TIMER
888-
889-
config NRFX_TIMER137
890-
bool "TIMER137 driver instance"
891-
depends on $(dt_nodelabel_exists,timer137)
892-
select NRFX_TIMER
766+
bool "TIMER driver"
893767

894768
config NRFX_TWI
895769
bool

modules/hal_nordic/nrfx/nrfx_kconfig.h

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -659,84 +659,6 @@
659659
#ifdef CONFIG_NRFX_TIMER
660660
#define NRFX_TIMER_ENABLED 1
661661
#endif
662-
#ifdef CONFIG_NRFX_TIMER_LOG
663-
#define NRFX_TIMER_CONFIG_LOG_ENABLED 1
664-
#endif
665-
#ifdef CONFIG_NRFX_TIMER0
666-
#define NRFX_TIMER0_ENABLED 1
667-
#endif
668-
#ifdef CONFIG_NRFX_TIMER1
669-
#define NRFX_TIMER1_ENABLED 1
670-
#endif
671-
#ifdef CONFIG_NRFX_TIMER2
672-
#define NRFX_TIMER2_ENABLED 1
673-
#endif
674-
#ifdef CONFIG_NRFX_TIMER3
675-
#define NRFX_TIMER3_ENABLED 1
676-
#endif
677-
#ifdef CONFIG_NRFX_TIMER4
678-
#define NRFX_TIMER4_ENABLED 1
679-
#endif
680-
#ifdef CONFIG_NRFX_TIMER00
681-
#define NRFX_TIMER00_ENABLED 1
682-
#endif
683-
#ifdef CONFIG_NRFX_TIMER10
684-
#define NRFX_TIMER10_ENABLED 1
685-
#endif
686-
#ifdef CONFIG_NRFX_TIMER20
687-
#define NRFX_TIMER20_ENABLED 1
688-
#endif
689-
#ifdef CONFIG_NRFX_TIMER21
690-
#define NRFX_TIMER21_ENABLED 1
691-
#endif
692-
#ifdef CONFIG_NRFX_TIMER22
693-
#define NRFX_TIMER22_ENABLED 1
694-
#endif
695-
#ifdef CONFIG_NRFX_TIMER23
696-
#define NRFX_TIMER23_ENABLED 1
697-
#endif
698-
#ifdef CONFIG_NRFX_TIMER24
699-
#define NRFX_TIMER24_ENABLED 1
700-
#endif
701-
#ifdef CONFIG_NRFX_TIMER020
702-
#define NRFX_TIMER020_ENABLED 1
703-
#endif
704-
#ifdef CONFIG_NRFX_TIMER021
705-
#define NRFX_TIMER021_ENABLED 1
706-
#endif
707-
#ifdef CONFIG_NRFX_TIMER022
708-
#define NRFX_TIMER022_ENABLED 1
709-
#endif
710-
#ifdef CONFIG_NRFX_TIMER120
711-
#define NRFX_TIMER120_ENABLED 1
712-
#endif
713-
#ifdef CONFIG_NRFX_TIMER121
714-
#define NRFX_TIMER121_ENABLED 1
715-
#endif
716-
#ifdef CONFIG_NRFX_TIMER130
717-
#define NRFX_TIMER130_ENABLED 1
718-
#endif
719-
#ifdef CONFIG_NRFX_TIMER131
720-
#define NRFX_TIMER131_ENABLED 1
721-
#endif
722-
#ifdef CONFIG_NRFX_TIMER132
723-
#define NRFX_TIMER132_ENABLED 1
724-
#endif
725-
#ifdef CONFIG_NRFX_TIMER133
726-
#define NRFX_TIMER133_ENABLED 1
727-
#endif
728-
#ifdef CONFIG_NRFX_TIMER134
729-
#define NRFX_TIMER134_ENABLED 1
730-
#endif
731-
#ifdef CONFIG_NRFX_TIMER135
732-
#define NRFX_TIMER135_ENABLED 1
733-
#endif
734-
#ifdef CONFIG_NRFX_TIMER136
735-
#define NRFX_TIMER136_ENABLED 1
736-
#endif
737-
#ifdef CONFIG_NRFX_TIMER137
738-
#define NRFX_TIMER137_ENABLED 1
739-
#endif
740662

741663
#ifdef CONFIG_NRFX_TWI
742664
#define NRFX_TWI_ENABLED 1

0 commit comments

Comments
 (0)