Updating usage of PMIC startup code

Signed-off-by Jared Wolff <[email protected]>
circuitdojo · Aug 29, 2024 · 7c4d436 · 7c4d436
1 parent 4f60f41
commit 7c4d436
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/boards/circuitdojo/feather_nrf9161/CMakeLists.txt b/boards/circuitdojo/feather_nrf9161/CMakeLists.txt
@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_library()
-zephyr_library_sources_ifdef(CONFIG_BOARD_CIRCUITDOJO_FEATHER_NRF9161_PMIC_STARTUP startup.c)
+zephyr_library_sources_ifdef(CONFIG_CIRCUITDOJO_FEATHER_NRF9161_PMIC_STARTUP startup.c)
 
 set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/circuitdojo_feather_nrf9161_pm_static.yml CACHE INTERNAL "")
diff --git a/boards/circuitdojo/feather_nrf9161/Kconfig b/boards/circuitdojo/feather_nrf9161/Kconfig
@@ -0,0 +1,2 @@
+config CIRCUITDOJO_FEATHER_NRF9161_PMIC_STARTUP
+	bool "Allows for executing startup code for PMIC."
diff --git a/boards/circuitdojo/feather_nrf9161/Kconfig.circuitdojo_feather_nrf9161 b/boards/circuitdojo/feather_nrf9161/Kconfig.circuitdojo_feather_nrf9161
@@ -2,8 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_CIRCUITDOJO_FEATHER_NRF9161
-	select SOC_NRF9161_LACA
-
-config BOARD_CIRCUITDOJO_FEATHER_NRF9161_PMIC_STARTUP
-	default y
-	bool
+	select SOC_NRF9161_LACA
diff --git a/samples/at_client/boards/circuitdojo_feather_nrf9161_ns.conf b/samples/at_client/boards/circuitdojo_feather_nrf9161_ns.conf
@@ -7,4 +7,5 @@ CONFIG_SPI_NOR=y
 
 # PMIC 
 CONFIG_MFD=y
-CONFIG_MFD_NPM1300=y
+CONFIG_MFD_NPM1300=y
+CONFIG_CIRCUITDOJO_FEATHER_NRF9161_PMIC_STARTUP=y
diff --git a/samples/https/boards/circuitdojo_feather_nrf9161_ns.conf b/samples/https/boards/circuitdojo_feather_nrf9161_ns.conf
@@ -0,0 +1,4 @@
+# PMIC 
+CONFIG_MFD=y
+CONFIG_MFD_NPM1300=y
+CONFIG_CIRCUITDOJO_FEATHER_NRF9161_PMIC_STARTUP=y