Skip to content

Commit a8e2115

Browse files
mstasiaknordicmstasiaknordic
committed
[nrf fromlist] modules: hal_nordic: remove SPIM symbols
Removed Kconfig symbols for each SPIM instance which are no longer needed. Upstream PR #: 96792 Signed-off-by: Michał Stasiak <[email protected]>
1 parent dcd5934 commit a8e2115

File tree

5 files changed

+2
-278
lines changed

5 files changed

+2
-278
lines changed

‎drivers/spi/Kconfig.nrfx‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,7 @@ config SPI_NRFX_SPI
2222
config SPI_NRFX_SPIM
2323
def_bool y
2424
depends on DT_HAS_NORDIC_NRF_SPIM_ENABLED
25-
select NRFX_SPIM0 if HAS_HW_NRF_SPIM0
26-
select NRFX_SPIM1 if HAS_HW_NRF_SPIM1
27-
select NRFX_SPIM2 if HAS_HW_NRF_SPIM2
28-
select NRFX_SPIM3 if HAS_HW_NRF_SPIM3
29-
select NRFX_SPIM4 if HAS_HW_NRF_SPIM4
30-
select NRFX_SPIM00 if HAS_HW_NRF_SPIM00
31-
select NRFX_SPIM01 if HAS_HW_NRF_SPIM01
32-
select NRFX_SPIM20 if HAS_HW_NRF_SPIM20
33-
select NRFX_SPIM21 if HAS_HW_NRF_SPIM21
34-
select NRFX_SPIM22 if HAS_HW_NRF_SPIM22
35-
select NRFX_SPIM23 if HAS_HW_NRF_SPIM23
36-
select NRFX_SPIM24 if HAS_HW_NRF_SPIM24
37-
select NRFX_SPIM30 if HAS_HW_NRF_SPIM30
38-
select NRFX_SPIM120 if HAS_HW_NRF_SPIM120
39-
select NRFX_SPIM121 if HAS_HW_NRF_SPIM121
40-
select NRFX_SPIM130 if HAS_HW_NRF_SPIM130
41-
select NRFX_SPIM131 if HAS_HW_NRF_SPIM131
42-
select NRFX_SPIM132 if HAS_HW_NRF_SPIM132
43-
select NRFX_SPIM133 if HAS_HW_NRF_SPIM133
44-
select NRFX_SPIM134 if HAS_HW_NRF_SPIM134
45-
select NRFX_SPIM135 if HAS_HW_NRF_SPIM135
46-
select NRFX_SPIM136 if HAS_HW_NRF_SPIM136
47-
select NRFX_SPIM137 if HAS_HW_NRF_SPIM137
25+
select NRFX_SPIM
4826

4927
config SPI_NRFX_SPIS
5028
def_bool y

‎modules/hal_nordic/nrfx/Kconfig‎

Lines changed: 0 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -528,121 +528,6 @@ config NRFX_SPI2
528528
config NRFX_SPIM
529529
bool
530530

531-
config NRFX_SPIM0
532-
bool "SPIM0 driver instance"
533-
depends on $(dt_nodelabel_exists,spi0) && !SOC_SERIES_NRF51X
534-
select NRFX_SPIM
535-
536-
config NRFX_SPIM1
537-
bool "SPIM1 driver instance"
538-
depends on $(dt_nodelabel_exists,spi1) && !SOC_SERIES_NRF51X
539-
select NRFX_SPIM
540-
541-
config NRFX_SPIM2
542-
bool "SPIM2 driver instance"
543-
depends on $(dt_nodelabel_exists,spi2)
544-
select NRFX_SPIM
545-
546-
config NRFX_SPIM3
547-
bool "SPIM3 driver instance"
548-
depends on $(dt_nodelabel_exists,spi3)
549-
select NRFX_SPIM
550-
551-
config NRFX_SPIM4
552-
bool "SPIM4 driver instance"
553-
depends on $(dt_nodelabel_exists,spi4)
554-
select NRFX_SPIM
555-
556-
config NRFX_SPIM00
557-
bool "SPIM00 driver instance"
558-
depends on $(dt_nodelabel_exists,spi00)
559-
select NRFX_SPIM
560-
561-
config NRFX_SPIM01
562-
bool "SPIM01 driver instance"
563-
depends on $(dt_nodelabel_exists,spi01)
564-
select NRFX_SPIM
565-
566-
config NRFX_SPIM20
567-
bool "SPIM20 driver instance"
568-
depends on $(dt_nodelabel_exists,spi20)
569-
select NRFX_SPIM
570-
571-
config NRFX_SPIM21
572-
bool "SPIM21 driver instance"
573-
depends on $(dt_nodelabel_exists,spi21)
574-
select NRFX_SPIM
575-
576-
config NRFX_SPIM22
577-
bool "SPIM22 driver instance"
578-
depends on $(dt_nodelabel_exists,spi22)
579-
select NRFX_SPIM
580-
581-
config NRFX_SPIM23
582-
bool "SPIM23 driver instance"
583-
depends on $(dt_nodelabel_exists,spi23)
584-
select NRFX_SPIM
585-
586-
config NRFX_SPIM24
587-
bool "SPIM24 driver instance"
588-
depends on $(dt_nodelabel_exists,spi24)
589-
select NRFX_SPIM
590-
591-
config NRFX_SPIM30
592-
bool "SPIM30 driver instance"
593-
depends on $(dt_nodelabel_exists,spi30)
594-
select NRFX_SPIM
595-
596-
config NRFX_SPIM120
597-
bool "SPIM120 driver instance"
598-
depends on $(dt_nodelabel_exists,spi120)
599-
select NRFX_SPIM
600-
601-
config NRFX_SPIM121
602-
bool "SPIM121 driver instance"
603-
depends on $(dt_nodelabel_exists,spi121)
604-
select NRFX_SPIM
605-
606-
config NRFX_SPIM130
607-
bool "SPIM130 driver instance"
608-
depends on $(dt_nodelabel_exists,spi130)
609-
select NRFX_SPIM
610-
611-
config NRFX_SPIM131
612-
bool "SPIM131 driver instance"
613-
depends on $(dt_nodelabel_exists,spi131)
614-
select NRFX_SPIM
615-
616-
config NRFX_SPIM132
617-
bool "SPIM132 driver instance"
618-
depends on $(dt_nodelabel_exists,spi132)
619-
select NRFX_SPIM
620-
621-
config NRFX_SPIM133
622-
bool "SPIM133 driver instance"
623-
depends on $(dt_nodelabel_exists,spi133)
624-
select NRFX_SPIM
625-
626-
config NRFX_SPIM134
627-
bool "SPIM134 driver instance"
628-
depends on $(dt_nodelabel_exists,spi134)
629-
select NRFX_SPIM
630-
631-
config NRFX_SPIM135
632-
bool "SPIM135 driver instance"
633-
depends on $(dt_nodelabel_exists,spi135)
634-
select NRFX_SPIM
635-
636-
config NRFX_SPIM136
637-
bool "SPIM136 driver instance"
638-
depends on $(dt_nodelabel_exists,spi136)
639-
select NRFX_SPIM
640-
641-
config NRFX_SPIM137
642-
bool "SPIM137 driver instance"
643-
depends on $(dt_nodelabel_exists,spi137)
644-
select NRFX_SPIM
645-
646531
config NRFX_SPIS
647532
bool
648533

‎modules/hal_nordic/nrfx/nrfx_kconfig.h‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -486,24 +486,9 @@
486486
#ifdef CONFIG_NRFX_SPIM_LOG
487487
#define NRFX_SPIM_CONFIG_LOG_ENABLED 1
488488
#endif
489-
#ifdef CONFIG_NRFX_SPIM0
490-
#define NRFX_SPIM0_ENABLED 1
491-
#endif
492-
#ifdef CONFIG_NRFX_SPIM1
493-
#define NRFX_SPIM1_ENABLED 1
494-
#endif
495-
#ifdef CONFIG_NRFX_SPIM2
496-
#define NRFX_SPIM2_ENABLED 1
497-
#endif
498-
#ifdef CONFIG_NRFX_SPIM3
499-
#define NRFX_SPIM3_ENABLED 1
500489
#ifdef CONFIG_NRF52_ANOMALY_198_WORKAROUND
501490
#define NRFX_SPIM3_NRF52840_ANOMALY_198_WORKAROUND_ENABLED 1
502491
#endif
503-
#endif
504-
#ifdef CONFIG_NRFX_SPIM4
505-
#define NRFX_SPIM4_ENABLED 1
506-
#endif
507492

508493
#define NRFX_SPIM_DT_HAS_RX_DELAY(node) DT_PROP(node, rx_delay_supported) +
509494

@@ -513,61 +498,6 @@
513498
#endif
514499
#endif
515500

516-
#ifdef CONFIG_NRFX_SPIM00
517-
#define NRFX_SPIM00_ENABLED 1
518-
#endif
519-
#ifdef CONFIG_NRFX_SPIM01
520-
#define NRFX_SPIM01_ENABLED 1
521-
#endif
522-
#ifdef CONFIG_NRFX_SPIM20
523-
#define NRFX_SPIM20_ENABLED 1
524-
#endif
525-
#ifdef CONFIG_NRFX_SPIM21
526-
#define NRFX_SPIM21_ENABLED 1
527-
#endif
528-
#ifdef CONFIG_NRFX_SPIM22
529-
#define NRFX_SPIM22_ENABLED 1
530-
#endif
531-
#ifdef CONFIG_NRFX_SPIM23
532-
#define NRFX_SPIM23_ENABLED 1
533-
#endif
534-
#ifdef CONFIG_NRFX_SPIM24
535-
#define NRFX_SPIM24_ENABLED 1
536-
#endif
537-
#ifdef CONFIG_NRFX_SPIM30
538-
#define NRFX_SPIM30_ENABLED 1
539-
#endif
540-
#ifdef CONFIG_NRFX_SPIM120
541-
#define NRFX_SPIM120_ENABLED 1
542-
#endif
543-
#ifdef CONFIG_NRFX_SPIM121
544-
#define NRFX_SPIM121_ENABLED 1
545-
#endif
546-
#ifdef CONFIG_NRFX_SPIM130
547-
#define NRFX_SPIM130_ENABLED 1
548-
#endif
549-
#ifdef CONFIG_NRFX_SPIM131
550-
#define NRFX_SPIM131_ENABLED 1
551-
#endif
552-
#ifdef CONFIG_NRFX_SPIM132
553-
#define NRFX_SPIM132_ENABLED 1
554-
#endif
555-
#ifdef CONFIG_NRFX_SPIM133
556-
#define NRFX_SPIM133_ENABLED 1
557-
#endif
558-
#ifdef CONFIG_NRFX_SPIM134
559-
#define NRFX_SPIM134_ENABLED 1
560-
#endif
561-
#ifdef CONFIG_NRFX_SPIM135
562-
#define NRFX_SPIM135_ENABLED 1
563-
#endif
564-
#ifdef CONFIG_NRFX_SPIM136
565-
#define NRFX_SPIM136_ENABLED 1
566-
#endif
567-
#ifdef CONFIG_NRFX_SPIM137
568-
#define NRFX_SPIM137_ENABLED 1
569-
#endif
570-
571501
#ifdef CONFIG_NRFX_SPIS
572502
#define NRFX_SPIS_ENABLED 1
573503
#endif

‎soc/nordic/common/Kconfig.peripherals‎

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -255,75 +255,6 @@ config HAS_HW_NRF_SPI1
255255
config HAS_HW_NRF_SPI2
256256
def_bool $(dt_nodelabel_enabled_with_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPI))
257257

258-
config HAS_HW_NRF_SPIM0
259-
def_bool $(dt_nodelabel_enabled_with_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIM))
260-
261-
config HAS_HW_NRF_SPIM1
262-
def_bool $(dt_nodelabel_enabled_with_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIM))
263-
264-
config HAS_HW_NRF_SPIM2
265-
def_bool $(dt_nodelabel_enabled_with_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIM))
266-
267-
config HAS_HW_NRF_SPIM3
268-
def_bool $(dt_nodelabel_enabled_with_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIM))
269-
270-
config HAS_HW_NRF_SPIM4
271-
def_bool $(dt_nodelabel_enabled_with_compat,spi4,$(DT_COMPAT_NORDIC_NRF_SPIM))
272-
273-
config HAS_HW_NRF_SPIM00
274-
def_bool $(dt_nodelabel_enabled_with_compat,spi00,$(DT_COMPAT_NORDIC_NRF_SPIM))
275-
276-
config HAS_HW_NRF_SPIM01
277-
def_bool $(dt_nodelabel_enabled_with_compat,spi01,$(DT_COMPAT_NORDIC_NRF_SPIM))
278-
279-
config HAS_HW_NRF_SPIM20
280-
def_bool $(dt_nodelabel_enabled_with_compat,spi20,$(DT_COMPAT_NORDIC_NRF_SPIM))
281-
282-
config HAS_HW_NRF_SPIM21
283-
def_bool $(dt_nodelabel_enabled_with_compat,spi21,$(DT_COMPAT_NORDIC_NRF_SPIM))
284-
285-
config HAS_HW_NRF_SPIM22
286-
def_bool $(dt_nodelabel_enabled_with_compat,spi22,$(DT_COMPAT_NORDIC_NRF_SPIM))
287-
288-
config HAS_HW_NRF_SPIM23
289-
def_bool $(dt_nodelabel_enabled_with_compat,spi23,$(DT_COMPAT_NORDIC_NRF_SPIM))
290-
291-
config HAS_HW_NRF_SPIM24
292-
def_bool $(dt_nodelabel_enabled_with_compat,spi24,$(DT_COMPAT_NORDIC_NRF_SPIM))
293-
294-
config HAS_HW_NRF_SPIM30
295-
def_bool $(dt_nodelabel_enabled_with_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIM))
296-
297-
config HAS_HW_NRF_SPIM120
298-
def_bool $(dt_nodelabel_enabled_with_compat,spi120,$(DT_COMPAT_NORDIC_NRF_SPIM))
299-
300-
config HAS_HW_NRF_SPIM121
301-
def_bool $(dt_nodelabel_enabled_with_compat,spi121,$(DT_COMPAT_NORDIC_NRF_SPIM))
302-
303-
config HAS_HW_NRF_SPIM130
304-
def_bool $(dt_nodelabel_enabled_with_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIM))
305-
306-
config HAS_HW_NRF_SPIM131
307-
def_bool $(dt_nodelabel_enabled_with_compat,spi131,$(DT_COMPAT_NORDIC_NRF_SPIM))
308-
309-
config HAS_HW_NRF_SPIM132
310-
def_bool $(dt_nodelabel_enabled_with_compat,spi132,$(DT_COMPAT_NORDIC_NRF_SPIM))
311-
312-
config HAS_HW_NRF_SPIM133
313-
def_bool $(dt_nodelabel_enabled_with_compat,spi133,$(DT_COMPAT_NORDIC_NRF_SPIM))
314-
315-
config HAS_HW_NRF_SPIM134
316-
def_bool $(dt_nodelabel_enabled_with_compat,spi134,$(DT_COMPAT_NORDIC_NRF_SPIM))
317-
318-
config HAS_HW_NRF_SPIM135
319-
def_bool $(dt_nodelabel_enabled_with_compat,spi135,$(DT_COMPAT_NORDIC_NRF_SPIM))
320-
321-
config HAS_HW_NRF_SPIM136
322-
def_bool $(dt_nodelabel_enabled_with_compat,spi136,$(DT_COMPAT_NORDIC_NRF_SPIM))
323-
324-
config HAS_HW_NRF_SPIM137
325-
def_bool $(dt_nodelabel_enabled_with_compat,spi137,$(DT_COMPAT_NORDIC_NRF_SPIM))
326-
327258
config HAS_HW_NRF_SPIS0
328259
def_bool $(dt_nodelabel_enabled_with_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIS))
329260

‎soc/nordic/nrf52/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ config NRF52_ANOMALY_198_WORKAROUND
9696
bool "Anomaly 198 workaround"
9797
default y
9898
depends on SOC_NRF52840
99-
depends on NRFX_SPIM3
99+
depends on NRFX_SPIM
100100
help
101101
This anomaly applies to IC revisions "Engineering B" up to "3", the most
102102
recent one.

0 commit comments

Comments
 (0)