From 7c4d4364eb2e3fd9b86a81e72eef0bae787563d8 Mon Sep 17 00:00:00 2001 From: Jared Wolff Date: Thu, 29 Aug 2024 14:37:34 -0400 Subject: [PATCH] Updating usage of PMIC startup code Signed-off-by Jared Wolff --- boards/circuitdojo/feather_nrf9161/CMakeLists.txt | 2 +- boards/circuitdojo/feather_nrf9161/Kconfig | 2 ++ .../feather_nrf9161/Kconfig.circuitdojo_feather_nrf9161 | 6 +----- .../at_client/boards/circuitdojo_feather_nrf9161_ns.conf | 3 ++- samples/https/boards/circuitdojo_feather_nrf9161_ns.conf | 4 ++++ 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 boards/circuitdojo/feather_nrf9161/Kconfig create mode 100644 samples/https/boards/circuitdojo_feather_nrf9161_ns.conf diff --git a/boards/circuitdojo/feather_nrf9161/CMakeLists.txt b/boards/circuitdojo/feather_nrf9161/CMakeLists.txt index 173d27a..3533b01 100644 --- 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 "") \ No newline at end of file diff --git a/boards/circuitdojo/feather_nrf9161/Kconfig b/boards/circuitdojo/feather_nrf9161/Kconfig new file mode 100644 index 0000000..667744b --- /dev/null +++ b/boards/circuitdojo/feather_nrf9161/Kconfig @@ -0,0 +1,2 @@ +config CIRCUITDOJO_FEATHER_NRF9161_PMIC_STARTUP + bool "Allows for executing startup code for PMIC." \ No newline at end of file diff --git a/boards/circuitdojo/feather_nrf9161/Kconfig.circuitdojo_feather_nrf9161 b/boards/circuitdojo/feather_nrf9161/Kconfig.circuitdojo_feather_nrf9161 index 624f2f6..30e3121 100644 --- 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 \ No newline at end of file diff --git a/samples/at_client/boards/circuitdojo_feather_nrf9161_ns.conf b/samples/at_client/boards/circuitdojo_feather_nrf9161_ns.conf index 970b423..516ccd0 100644 --- 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 \ No newline at end of file +CONFIG_MFD_NPM1300=y +CONFIG_CIRCUITDOJO_FEATHER_NRF9161_PMIC_STARTUP=y \ No newline at end of file diff --git a/samples/https/boards/circuitdojo_feather_nrf9161_ns.conf b/samples/https/boards/circuitdojo_feather_nrf9161_ns.conf new file mode 100644 index 0000000..d9506f8 --- /dev/null +++ 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 \ No newline at end of file