Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.murdock: Add same54-xpro to kconfig tests #17255

Merged
merged 7 commits into from
Nov 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .murdock
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ nucleo-l433rc
nucleo-l552ze-q
p-nucleo-wb55
remote-revb
same54-xpro
samr21-xpro
seeedstudio-gd32
slstk3400a
Expand Down
4 changes: 4 additions & 0 deletions boards/adafruit-itsybitsy-m4/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@ config BOARD_ADAFRUIT_ITSYBITSY_M4
select HAS_PERIPH_TIMER
select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV

select HAVE_MTD_SPI_NOR
# This specific board requires SPI_ON_QSPI for the MTD_SPI_NOR
select MODULE_PERIPH_SPI_ON_QSPI if MODULE_MTD_SPI_NOR
4 changes: 4 additions & 0 deletions boards/avr-rss2/Makefile.dep
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ ifneq (,$(filter eui_provider,$(USEMODULE)))
USEMODULE += at24mac
endif

ifneq (,$(filter mtd,$(USEMODULE)))
USEMODULE += mtd_at24cxxx at24mac
endif

ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += bme280_i2c
USEMODULE += saul_gpio
Expand Down
6 changes: 6 additions & 0 deletions boards/same54-xpro/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ config BOARD_SAME54_XPRO
select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV
select HAS_RIOTBOOT

select HAVE_SAUL_GPIO
select HAVE_MTD_SPI_NOR
select HAVE_AT24MAC
# This specific board requires SPI_ON_QSPI for the MTD_SPI_NOR
select MODULE_PERIPH_SPI_ON_QSPI if MODULE_MTD_SPI_NOR
2 changes: 1 addition & 1 deletion cpu/sam0_common/periph/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ config MODULE_SAM0_COMMON_PERIPH

config MODULE_PERIPH_RTC_RTT
bool
default y if MODULE_PERIPH_RTT || MODULE_PERIPH_RTC
default y if MODULE_PERIPH_RTT || MODULE_PERIPH_RTC || MODULE_PERIPH_GPIO_TAMPER_WAKE

config MODULE_PERIPH_UART_NONBLOCKING
depends on HAS_PERIPH_UART_NONBLOCKING
Expand Down
4 changes: 2 additions & 2 deletions drivers/at24mac/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ comment "AT24MAC unique ID chip enabled as default EUI-48/64 provider"

config MODULE_AT24MAC
bool
prompt "AT24MAC unique ID chip" if !(MODULE_EUI_PROVIDER && HAVE_AT24MAC)
default (MODULE_EUI_PROVIDER && HAVE_AT24MAC)
prompt "AT24MAC unique ID chip" if !((MODULE_EUI_PROVIDER || MODULE_MTD) && HAVE_AT24MAC)
default ((MODULE_EUI_PROVIDER || MODULE_MTD) && HAVE_AT24MAC)
select MODULE_AT24CXXX
depends on HAS_PERIPH_I2C
depends on TEST_KCONFIG
Expand Down
15 changes: 14 additions & 1 deletion drivers/periph_common/Kconfig.gpio
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,15 @@ config MODULE_PERIPH_GPIO_FAST_READ
This trades an increase in power consumption for a decrease in GPIO pin
read latency.

# TODO: this module is actually just an artifact from the way periph_init_%
config MODULE_PERIPH_GPIO_TAMPER_WAKE
bool "enable wake from Deep Sleep by RTC tamper pins"
depends on HAS_PERIPH_GPIO_TAMPER_WAKE
help
If you enable this, a RTC tamper pin that has been configured as an
interrupt can wake the CPU from Deep Sleep. Only RTC tamper pins
(and the RTC alarm) can wake the CPU from Deep Sleep.

MrKevinWeiss marked this conversation as resolved.
Show resolved Hide resolved
# TODO: this module is actually jus t an artifact from the way periph_init_%
# modules are handled in Makefile. We need to define it to keep the list the
# same for now. We should be able to remove it later on.

Expand All @@ -43,6 +51,11 @@ config MODULE_PERIPH_INIT_GPIO_FAST_READ
default y if MODULE_PERIPH_INIT
depends on MODULE_PERIPH_GPIO_FAST_READ

config MODULE_PERIPH_INIT_GPIO_TAMPER_WAKE
bool "Auto initialize tamper detection"
default y if MODULE_PERIPH_INIT
depends on MODULE_PERIPH_GPIO_TAMPER_WAKE

endif # MODULE_PERIPH_GPIO

osource "$(RIOTCPU)/$(CPU)/periph/Kconfig.gpio"
4 changes: 4 additions & 0 deletions drivers/periph_common/Kconfig.spi
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ config MODULE_PERIPH_SPI_RECONFIGURE
bool "Pin reconfiguration support"
depends on HAS_PERIPH_SPI_RECONFIGURE

config MODULE_PERIPH_SPI_ON_QSPI
bool "Use QSPI peripherial in SPI mode"
depends on HAS_PERIPH_SPI_ON_QSPI

config MODULE_PERIPH_SPI_GPIO_MODE
bool "Support initializing SPI pins with adapted GPIO modes"
depends on HAS_PERIPH_SPI_GPIO_MODE
Expand Down
3 changes: 2 additions & 1 deletion makefiles/features_modules.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ ifneq (,$(filter periph_init, $(USEMODULE)))
periph_rtc_rtt \
periph_clic \
periph_coretimer \
periph_plic
periph_plic \
periph_spi_on_qspi
#
PERIPH_MODULES := $(filter-out $(PERIPH_IGNORE_MODULES),\
$(filter periph_%,$(USEMODULE)))
Expand Down
1 change: 1 addition & 0 deletions tests/periph_gpio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ config APPLICATION
default y
imply MODULE_PERIPH_GPIO_IRQ
imply MODULE_PERIPH_GPIO_FAST_READ
imply MODULE_PERIPH_GPIO_TAMPER_WAKE
depends on TEST_KCONFIG
1 change: 1 addition & 0 deletions tests/periph_spi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ config APPLICATION
bool
default y
imply MODULE_PERIPH_SPI_RECONFIGURE
imply MODULE_PERIPH_SPI_ON_QSPI
depends on TEST_KCONFIG
1 change: 1 addition & 0 deletions tests/periph_spi_dma/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ config APPLICATION
bool
default y
imply MODULE_PERIPH_SPI_RECONFIGURE
imply MODULE_PERIPH_SPI_ON_QSPI
depends on TEST_KCONFIG