Tweaks to board def

1. Removed TFM_SECURE entries in defconfig 2. Startup code only runs in app Signed-off-by Jared Wolff <[email protected]>
circuitdojo · Aug 31, 2024 · a499cb9 · a499cb9
1 parent 4f60f41
commit a499cb9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 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,5 @@
+if !MCUBOOT
+config CIRCUITDOJO_FEATHER_NRF9161_PMIC_STARTUP
+	bool "Allows for executing startup code for PMIC."
+	default y
+endif
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/boards/circuitdojo/feather_nrf9161/circuitdojo_feather_nrf9161_ns_defconfig b/boards/circuitdojo/feather_nrf9161/circuitdojo_feather_nrf9161_ns_defconfig
@@ -25,9 +25,5 @@ CONFIG_UART_CONSOLE=y
 # Enable pincontrol
 CONFIG_PINCTRL=y
 
-# Fixes for I2C
-CONFIG_TFM_SECURE_UART=n
-CONFIG_TFM_LOG_LEVEL_SILENCE=y
-
 # Disable entropy driver, as it's not yet implemented
 CONFIG_ENTROPY_NRF5_RNG=n