From 7ab05fa129246eb39f6b7e3e66e1607c5af28513 Mon Sep 17 00:00:00 2001
From: Francisco Molina <femolina@uc.cl>
Date: Mon, 29 Nov 2021 10:45:20 +0100
Subject: [PATCH] cpu/msp430: add Kconfig

---
 .murdock                       |  1 +
 boards/common/msb-430/Kconfig  |  8 ++++++++
 boards/common/msb-430/Makefile |  2 +-
 boards/msb-430/Kconfig         |  2 ++
 boards/msb-430/Makefile.dep    |  2 +-
 boards/msb-430h/Makefile.dep   |  2 +-
 cpu/msp430_common/Kconfig      | 22 +++++++++++++++++++++-
 cpu/msp430_common/Makefile.dep |  4 +++-
 cpu/msp430fxyz/Makefile.dep    |  1 -
 9 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/.murdock b/.murdock
index c44051788e..006e563695 100755
--- a/.murdock
+++ b/.murdock
@@ -49,6 +49,7 @@ slstk3400a
 sltb001a
 slwstk6220a
 waspmote-pro
+z1
 "}
 
 : ${TEST_KCONFIG_ENFORCE_APP_GROUPS:="
diff --git a/boards/common/msb-430/Kconfig b/boards/common/msb-430/Kconfig
index cf87d207a8..644f84e358 100644
--- a/boards/common/msb-430/Kconfig
+++ b/boards/common/msb-430/Kconfig
@@ -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.
diff --git a/boards/common/msb-430/Makefile b/boards/common/msb-430/Makefile
index 4695a0f761..739476a36d 100644
--- a/boards/common/msb-430/Makefile
+++ b/boards/common/msb-430/Makefile
@@ -1,3 +1,3 @@
-MODULE = boards_common_msb-430
+MODULE = boards_common_msb_430
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/msb-430/Kconfig b/boards/msb-430/Kconfig
index e856e35179..512e021281 100644
--- a/boards/msb-430/Kconfig
+++ b/boards/msb-430/Kconfig
@@ -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"
diff --git a/boards/msb-430/Makefile.dep b/boards/msb-430/Makefile.dep
index 79312a58ae..f793cff79e 100644
--- a/boards/msb-430/Makefile.dep
+++ b/boards/msb-430/Makefile.dep
@@ -2,4 +2,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += sht11
 endif
 
-USEMODULE += boards_common_msb-430
+USEMODULE += boards_common_msb_430
diff --git a/boards/msb-430h/Makefile.dep b/boards/msb-430h/Makefile.dep
index 79312a58ae..f793cff79e 100644
--- a/boards/msb-430h/Makefile.dep
+++ b/boards/msb-430h/Makefile.dep
@@ -2,4 +2,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += sht11
 endif
 
-USEMODULE += boards_common_msb-430
+USEMODULE += boards_common_msb_430
diff --git a/cpu/msp430_common/Kconfig b/cpu/msp430_common/Kconfig
index d5cdcd9b28..6f5b27df0d 100644
--- a/cpu/msp430_common/Kconfig
+++ b/cpu/msp430_common/Kconfig
@@ -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
@@ -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
diff --git a/cpu/msp430_common/Makefile.dep b/cpu/msp430_common/Makefile.dep
index 1292b4bbdc..613b06f873 100644
--- a/cpu/msp430_common/Makefile.dep
+++ b/cpu/msp430_common/Makefile.dep
@@ -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
diff --git a/cpu/msp430fxyz/Makefile.dep b/cpu/msp430fxyz/Makefile.dep
index 5e2d2fd0bb..fa687b6fad 100644
--- a/cpu/msp430fxyz/Makefile.dep
+++ b/cpu/msp430fxyz/Makefile.dep
@@ -1,2 +1 @@
-USEMODULE += periph
 include $(RIOTCPU)/msp430_common/Makefile.dep