Skip to content

Commit c579627

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

File tree

4 files changed

+1
-252
lines changed

4 files changed

+1
-252
lines changed

‎drivers/spi/Kconfig.nrfx‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,7 @@ config SPI_NRFX_SPIS
2828
def_bool y
2929
depends on DT_HAS_NORDIC_NRF_SPIS_ENABLED
3030
select SPI_SLAVE
31-
select NRFX_SPIS0 if HAS_HW_NRF_SPIS0
32-
select NRFX_SPIS1 if HAS_HW_NRF_SPIS1
33-
select NRFX_SPIS2 if HAS_HW_NRF_SPIS2
34-
select NRFX_SPIS3 if HAS_HW_NRF_SPIS3
35-
select NRFX_SPIS00 if HAS_HW_NRF_SPIS00
36-
select NRFX_SPIS01 if HAS_HW_NRF_SPIS01
37-
select NRFX_SPIS20 if HAS_HW_NRF_SPIS20
38-
select NRFX_SPIS21 if HAS_HW_NRF_SPIS21
39-
select NRFX_SPIS22 if HAS_HW_NRF_SPIS22
40-
select NRFX_SPIS23 if HAS_HW_NRF_SPIS23
41-
select NRFX_SPIS24 if HAS_HW_NRF_SPIS24
42-
select NRFX_SPIS30 if HAS_HW_NRF_SPIS30
43-
select NRFX_SPIS120 if HAS_HW_NRF_SPIS120
44-
select NRFX_SPIS130 if HAS_HW_NRF_SPIS130
45-
select NRFX_SPIS131 if HAS_HW_NRF_SPIS131
46-
select NRFX_SPIS132 if HAS_HW_NRF_SPIS132
47-
select NRFX_SPIS133 if HAS_HW_NRF_SPIS133
48-
select NRFX_SPIS134 if HAS_HW_NRF_SPIS134
49-
select NRFX_SPIS135 if HAS_HW_NRF_SPIS135
50-
select NRFX_SPIS136 if HAS_HW_NRF_SPIS136
51-
select NRFX_SPIS137 if HAS_HW_NRF_SPIS137
31+
select NRFX_SPIS
5232

5333
config SPI_NRFX_RAM_BUFFER_SIZE
5434
int "Size of RAM buffers for SPIM peripherals"

‎modules/hal_nordic/nrfx/Kconfig‎

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -531,111 +531,6 @@ config NRFX_SPIM
531531
config NRFX_SPIS
532532
bool
533533

534-
config NRFX_SPIS0
535-
bool "SPIS0 driver instance"
536-
depends on $(dt_nodelabel_exists,spi0) && !SOC_SERIES_NRF51X
537-
select NRFX_SPIS
538-
539-
config NRFX_SPIS1
540-
bool "SPIS1 driver instance"
541-
depends on $(dt_nodelabel_exists,spi1)
542-
select NRFX_SPIS
543-
544-
config NRFX_SPIS2
545-
bool "SPIS2 driver instance"
546-
depends on $(dt_nodelabel_exists,spi2)
547-
select NRFX_SPIS
548-
549-
config NRFX_SPIS3
550-
bool "SPIS3 driver instance"
551-
depends on $(dt_nodelabel_exists,spi3)
552-
select NRFX_SPIS
553-
554-
config NRFX_SPIS00
555-
bool "SPIS00 driver instance"
556-
depends on $(dt_nodelabel_exists,spi00)
557-
select NRFX_SPIS
558-
559-
config NRFX_SPIS01
560-
bool "SPIS01 driver instance"
561-
depends on $(dt_nodelabel_exists,spi01)
562-
select NRFX_SPIS
563-
564-
config NRFX_SPIS20
565-
bool "SPIS20 driver instance"
566-
depends on $(dt_nodelabel_exists,spi20)
567-
select NRFX_SPIS
568-
569-
config NRFX_SPIS21
570-
bool "SPIS21 driver instance"
571-
depends on $(dt_nodelabel_exists,spi21)
572-
select NRFX_SPIS
573-
574-
config NRFX_SPIS22
575-
bool "SPIS22 driver instance"
576-
depends on $(dt_nodelabel_exists,spi22)
577-
select NRFX_SPIS
578-
579-
config NRFX_SPIS23
580-
bool "SPIS23 driver instance"
581-
depends on $(dt_nodelabel_exists,spi23)
582-
select NRFX_SPIS
583-
584-
config NRFX_SPIS24
585-
bool "SPIS24 driver instance"
586-
depends on $(dt_nodelabel_exists,spi24)
587-
select NRFX_SPIS
588-
589-
config NRFX_SPIS30
590-
bool "SPIS30 driver instance"
591-
depends on $(dt_nodelabel_exists,spi30)
592-
select NRFX_SPIS
593-
594-
config NRFX_SPIS120
595-
bool "SPIS120 driver instance"
596-
depends on $(dt_nodelabel_exists,spis120)
597-
select NRFX_SPIS
598-
599-
config NRFX_SPIS130
600-
bool "SPIS130 driver instance"
601-
depends on $(dt_nodelabel_exists,spi130)
602-
select NRFX_SPIS
603-
604-
config NRFX_SPIS131
605-
bool "SPIS131 driver instance"
606-
depends on $(dt_nodelabel_exists,spi131)
607-
select NRFX_SPIS
608-
609-
config NRFX_SPIS132
610-
bool "SPIS132 driver instance"
611-
depends on $(dt_nodelabel_exists,spi132)
612-
select NRFX_SPIS
613-
614-
config NRFX_SPIS133
615-
bool "SPIS133 driver instance"
616-
depends on $(dt_nodelabel_exists,spi133)
617-
select NRFX_SPIS
618-
619-
config NRFX_SPIS134
620-
bool "SPIS134 driver instance"
621-
depends on $(dt_nodelabel_exists,spi134)
622-
select NRFX_SPIS
623-
624-
config NRFX_SPIS135
625-
bool "SPIS135 driver instance"
626-
depends on $(dt_nodelabel_exists,spi135)
627-
select NRFX_SPIS
628-
629-
config NRFX_SPIS136
630-
bool "SPIS136 driver instance"
631-
depends on $(dt_nodelabel_exists,spi136)
632-
select NRFX_SPIS
633-
634-
config NRFX_SPIS137
635-
bool "SPIS137 driver instance"
636-
depends on $(dt_nodelabel_exists,spi137)
637-
select NRFX_SPIS
638-
639534
config NRFX_SYSTICK
640535
bool "SYSTICK driver"
641536
depends on CPU_CORTEX_M_HAS_SYSTICK

‎modules/hal_nordic/nrfx/nrfx_kconfig.h‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -507,69 +507,6 @@
507507
#ifdef CONFIG_NRFX_SPIS_LOG
508508
#define NRFX_SPIS_CONFIG_LOG_ENABLED 1
509509
#endif
510-
#ifdef CONFIG_NRFX_SPIS0
511-
#define NRFX_SPIS0_ENABLED 1
512-
#endif
513-
#ifdef CONFIG_NRFX_SPIS1
514-
#define NRFX_SPIS1_ENABLED 1
515-
#endif
516-
#ifdef CONFIG_NRFX_SPIS2
517-
#define NRFX_SPIS2_ENABLED 1
518-
#endif
519-
#ifdef CONFIG_NRFX_SPIS3
520-
#define NRFX_SPIS3_ENABLED 1
521-
#endif
522-
#ifdef CONFIG_NRFX_SPIS00
523-
#define NRFX_SPIS00_ENABLED 1
524-
#endif
525-
#ifdef CONFIG_NRFX_SPIS01
526-
#define NRFX_SPIS01_ENABLED 1
527-
#endif
528-
#ifdef CONFIG_NRFX_SPIS20
529-
#define NRFX_SPIS20_ENABLED 1
530-
#endif
531-
#ifdef CONFIG_NRFX_SPIS21
532-
#define NRFX_SPIS21_ENABLED 1
533-
#endif
534-
#ifdef CONFIG_NRFX_SPIS22
535-
#define NRFX_SPIS22_ENABLED 1
536-
#endif
537-
#ifdef CONFIG_NRFX_SPIS23
538-
#define NRFX_SPIS23_ENABLED 1
539-
#endif
540-
#ifdef CONFIG_NRFX_SPIS24
541-
#define NRFX_SPIS24_ENABLED 1
542-
#endif
543-
#ifdef CONFIG_NRFX_SPIS30
544-
#define NRFX_SPIS30_ENABLED 1
545-
#endif
546-
#ifdef CONFIG_NRFX_SPIS120
547-
#define NRFX_SPIS120_ENABLED 1
548-
#endif
549-
#ifdef CONFIG_NRFX_SPIS130
550-
#define NRFX_SPIS130_ENABLED 1
551-
#endif
552-
#ifdef CONFIG_NRFX_SPIS131
553-
#define NRFX_SPIS131_ENABLED 1
554-
#endif
555-
#ifdef CONFIG_NRFX_SPIS132
556-
#define NRFX_SPIS132_ENABLED 1
557-
#endif
558-
#ifdef CONFIG_NRFX_SPIS133
559-
#define NRFX_SPIS133_ENABLED 1
560-
#endif
561-
#ifdef CONFIG_NRFX_SPIS134
562-
#define NRFX_SPIS134_ENABLED 1
563-
#endif
564-
#ifdef CONFIG_NRFX_SPIS135
565-
#define NRFX_SPIS135_ENABLED 1
566-
#endif
567-
#ifdef CONFIG_NRFX_SPIS136
568-
#define NRFX_SPIS136_ENABLED 1
569-
#endif
570-
#ifdef CONFIG_NRFX_SPIS137
571-
#define NRFX_SPIS137_ENABLED 1
572-
#endif
573510

574511
#ifdef CONFIG_NRFX_SYSTICK
575512
#define NRFX_SYSTICK_ENABLED 1

‎soc/nordic/common/Kconfig.peripherals‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -255,69 +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_SPIS0
259-
def_bool $(dt_nodelabel_enabled_with_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIS))
260-
261-
config HAS_HW_NRF_SPIS1
262-
def_bool $(dt_nodelabel_enabled_with_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIS))
263-
264-
config HAS_HW_NRF_SPIS2
265-
def_bool $(dt_nodelabel_enabled_with_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIS))
266-
267-
config HAS_HW_NRF_SPIS3
268-
def_bool $(dt_nodelabel_enabled_with_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIS))
269-
270-
config HAS_HW_NRF_SPIS00
271-
def_bool $(dt_nodelabel_enabled_with_compat,spi00,$(DT_COMPAT_NORDIC_NRF_SPIS))
272-
273-
config HAS_HW_NRF_SPIS01
274-
def_bool $(dt_nodelabel_enabled_with_compat,spi01,$(DT_COMPAT_NORDIC_NRF_SPIS))
275-
276-
config HAS_HW_NRF_SPIS20
277-
def_bool $(dt_nodelabel_enabled_with_compat,spi20,$(DT_COMPAT_NORDIC_NRF_SPIS))
278-
279-
config HAS_HW_NRF_SPIS21
280-
def_bool $(dt_nodelabel_enabled_with_compat,spi21,$(DT_COMPAT_NORDIC_NRF_SPIS))
281-
282-
config HAS_HW_NRF_SPIS22
283-
def_bool $(dt_nodelabel_enabled_with_compat,spi22,$(DT_COMPAT_NORDIC_NRF_SPIS))
284-
285-
config HAS_HW_NRF_SPIS23
286-
def_bool $(dt_nodelabel_enabled_with_compat,spi23,$(DT_COMPAT_NORDIC_NRF_SPIS))
287-
288-
config HAS_HW_NRF_SPIS24
289-
def_bool $(dt_nodelabel_enabled_with_compat,spi24,$(DT_COMPAT_NORDIC_NRF_SPIS))
290-
291-
config HAS_HW_NRF_SPIS30
292-
def_bool $(dt_nodelabel_enabled_with_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIS))
293-
294-
config HAS_HW_NRF_SPIS120
295-
def_bool $(dt_nodelabel_enabled_with_compat,spis120,$(DT_COMPAT_NORDIC_NRF_SPIS))
296-
297-
config HAS_HW_NRF_SPIS130
298-
def_bool $(dt_nodelabel_enabled_with_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIS))
299-
300-
config HAS_HW_NRF_SPIS131
301-
def_bool $(dt_nodelabel_enabled_with_compat,spi131,$(DT_COMPAT_NORDIC_NRF_SPIS))
302-
303-
config HAS_HW_NRF_SPIS132
304-
def_bool $(dt_nodelabel_enabled_with_compat,spi132,$(DT_COMPAT_NORDIC_NRF_SPIS))
305-
306-
config HAS_HW_NRF_SPIS133
307-
def_bool $(dt_nodelabel_enabled_with_compat,spi133,$(DT_COMPAT_NORDIC_NRF_SPIS))
308-
309-
config HAS_HW_NRF_SPIS134
310-
def_bool $(dt_nodelabel_enabled_with_compat,spi134,$(DT_COMPAT_NORDIC_NRF_SPIS))
311-
312-
config HAS_HW_NRF_SPIS135
313-
def_bool $(dt_nodelabel_enabled_with_compat,spi135,$(DT_COMPAT_NORDIC_NRF_SPIS))
314-
315-
config HAS_HW_NRF_SPIS136
316-
def_bool $(dt_nodelabel_enabled_with_compat,spi136,$(DT_COMPAT_NORDIC_NRF_SPIS))
317-
318-
config HAS_HW_NRF_SPIS137
319-
def_bool $(dt_nodelabel_enabled_with_compat,spi137,$(DT_COMPAT_NORDIC_NRF_SPIS))
320-
321258
config HAS_HW_NRF_SPU
322259
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_SPU))
323260

0 commit comments

Comments
 (0)