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.

Sign up for GitHub

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

cpu/msp430: add Kconfig #17290

Merged
merged 1 commit into from
Dec 3, 2021
Merged

cpu/msp430: add Kconfig #17290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ slstk3400a
sltb001a
slwstk6220a
waspmote-pro
z1
"}

: ${TEST_KCONFIG_ENFORCE_APP_GROUPS:="
Expand Down
8 changes: 8 additions & 0 deletions boards/common/msb-430/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,11 @@ config BOARD_COMMON_MSB_430
bool
default y
select CPU_MODEL_MSP430F1612

config MODULE_BOARDS_COMMON_MSB_430
bool
default y
depends on TEST_KCONFIG
depends on BOARD_COMMON_MSB_430
help
Common code for msb-430 boards.
2 changes: 1 addition & 1 deletion boards/common/msb-430/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MODULE = boards_common_msb-430
MODULE = boards_common_msb_430

include $(RIOTBASE)/Makefile.base
2 changes: 2 additions & 0 deletions boards/msb-430/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ config BOARD_MSB_430
select HAS_PERIPH_UART
select BOARD_COMMON_MSB_430

select HAVE_SHT11

source "$(RIOTBOARD)/common/msb-430/Kconfig"
2 changes: 1 addition & 1 deletion boards/msb-430/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += sht11
endif

USEMODULE += boards_common_msb-430
USEMODULE += boards_common_msb_430
2 changes: 1 addition & 1 deletion boards/msb-430h/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += sht11
endif

USEMODULE += boards_common_msb-430
USEMODULE += boards_common_msb_430
22 changes: 21 additions & 1 deletion cpu/msp430_common/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,27 @@
# directory for more details.
#

config MODULE_MSP430_COMMON
bool
default y if CPU_CORE_MSP430
depends on TEST_KCONFIG
imply MODULE_NEWLIB_NANO
select MODULE_MALLOC_THREAD_SAFE
help
Common code for MSP430 cores.

config MODULE_MSP430_COMMON_PERIPH
bool
default y if CPU_CORE_MSP430
depends on TEST_KCONFIG
select MODULE_PERIPH
help
Common peripheral code for MSP430 cores.

choice LIBC_IMPLEMENTATION
default MODULE_NEWLIB
endchoice

config CPU_ARCH_MSP430
bool
select HAS_ARCH_16BIT
Expand All @@ -15,7 +36,6 @@ config CPU_ARCH_MSP430
select HAS_PERIPH_FLASHPAGE_PAGEWISE
select HAS_NEWLIB
select HAS_PERIPH_PM
select MODULE_MALLOC_THREAD_SAFE if TEST_KCONFIG

config CPU_CORE_MSP430
bool
Expand Down
4 changes: 3 additions & 1 deletion cpu/msp430_common/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
USEMODULE += msp430_common msp430_common_periph
USEMODULE += msp430_common
USEMODULE += msp430_common_periph
USEMODULE += periph

ifneq (,$(filter newlib,$(USEMODULE)))
DEFAULT_MODULE += newlib_nano
Expand Down
1 change: 0 additions & 1 deletion cpu/msp430fxyz/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
USEMODULE += periph
include $(RIOTCPU)/msp430_common/Makefile.dep