app: Add nRF9151 DK support

* Add nRF9151 DK support
* Some ifdeffing needed to allow battery and environmental modules
  to be disabled.
* Move Thingy:91 X-specific configs to board files.

Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>

Author: jtguggedal

app/CMakeLists.txt

@@ -13,16 +13,16 @@ project("Asset Tracker Template")
 add_subdirectory(src/common)
 
 # Include mandatory module source folders
-add_subdirectory(src/modules/battery)
 add_subdirectory(src/modules/network)
 add_subdirectory(src/modules/cloud)
 add_subdirectory(src/modules/location)
 add_subdirectory(src/modules/app)
 add_subdirectory(src/modules/fota)
-add_subdirectory(src/modules/environmental)
 add_subdirectory(src/modules/button)
 
 # Optional modules
+add_subdirectory_ifdef(CONFIG_APP_BATTERY src/modules/battery)
+add_subdirectory_ifdef(CONFIG_APP_ENVIRONMENTAL src/modules/environmental)
 add_subdirectory_ifdef(CONFIG_APP_LED src/modules/led)
 add_subdirectory_ifdef(CONFIG_APP_MEMFAULT src/modules/memfault)
 add_subdirectory_ifdef(CONFIG_APP_SHELL src/modules/shell)

app/Kconfig.sysbuild

@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT if !BOARD_NATIVE_SIM
+endchoice
+
+config SECURE_BOOT_APPCORE
+	default y if BOARD_NRF9151DK_NRF9151_NS
+
+config WIFI_NRF70
+	default y if BOARD_THINGY91X_NRF9151_NS
+
+choice WIFI_NRF70_OPER_MODES
+	default WIFI_NRF70_SCAN_ONLY if BOARD_THINGY91X_NRF9151_NS
+endchoice
+
+config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
+	default y if BOARD_NRF9151DK_NRF9151_NS
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

app/boards/nrf9151dk_nrf9151_ns.conf

@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#

app/boards/nrf9151dk_nrf9151_ns.overlay

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	/* Configure partition manager to use gd25wb256 as the external flash */
+	chosen {
+		nordic,pm-ext-flash = &gd25wb256;
+	};
+
+	pwmleds {
+		compatible = "pwm-leds";
+		pwm_led0: pwm_led_0 {
+			pwms = <&pwm0 0 PWM_MSEC(8) PWM_POLARITY_NORMAL>;
+		};
+		pwm_led1: pwm_led_1 {
+			pwms = <&pwm0 2 PWM_MSEC(8) PWM_POLARITY_NORMAL>;
+		};
+		pwm_led2: pwm_led_2 {
+			pwms = <&pwm0 1 PWM_MSEC(8) PWM_POLARITY_NORMAL>;
+		};
+        };
+
+	aliases {
+		ext-flash = &gd25wb256;
+		pwm-led0 = &pwm_led0;
+		pwm-led1 = &pwm_led1;
+		pwm-led2 = &pwm_led2;
+	};
+};
+
+&gd25wb256 {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&pinctrl {
+	pwm0_default: pwm0_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 0)>,
+				<NRF_PSEL(PWM_OUT1, 0, 1)>,
+				<NRF_PSEL(PWM_OUT2, 0, 4)>;
+		};
+	};
+
+	pwm0_sleep: pwm0_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 0)>,
+				<NRF_PSEL(PWM_OUT1, 0, 1)>,
+				<NRF_PSEL(PWM_OUT2, 0, 4)>;
+			low-power-enable;
+		};
+	};
+};

app/boards/thingy91x_nrf9151_ns.conf

@@ -4,4 +4,41 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+# Environmental module
+CONFIG_APP_ENVIRONMENTAL=y
+
+# Enable BME680
 CONFIG_BME680=y
+
+# Battery module
+CONFIG_APP_BATTERY=y
+
+# Fuel Gage
+CONFIG_NRF_FUEL_GAUGE=y
+CONFIG_NPM1300_CHARGER=y
+
+# Wi-Fi
+CONFIG_WIFI=y
+CONFIG_WIFI_NRF70=y
+CONFIG_WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC=y
+CONFIG_NRF70_BH_WQ_STACK_SIZE=1024
+CONFIG_NRF70_IRQ_WQ_STACK_SIZE=1024
+# Scan only using offload API
+CONFIG_WIFI_NM_WPA_SUPPLICANT=n
+# Wifi scan requires extended heap size
+CONFIG_HEAP_MEM_POOL_SIZE=20000
+CONFIG_NET_STATISTICS_WIFI=y
+
+# Wi-Fi location
+CONFIG_LOCATION_METHOD_WIFI=y
+CONFIG_LOCATION_REQUEST_DEFAULT_WIFI_TIMEOUT=10000
+CONFIG_LOCATION_WORKQUEUE_STACK_SIZE=4244
+
+# Align this with CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT
+CONFIG_LOCATION_METHOD_WIFI_SCANNING_RESULTS_MAX_CNT=10
+# Align this with CONFIG_LOCATION_METHOD_WIFI_SCANNING_RESULTS_MAX_CNT
+CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT=10
+
+# Debug logging
+CONFIG_APP_BATTERY_LOG_LEVEL_DBG=y
+CONFIG_APP_ENVIRONMENTAL_LOG_LEVEL_DBG=y

app/prj.conf

@@ -17,8 +17,7 @@ CONFIG_PWM=y
 CONFIG_MAIN_STACK_SIZE=4096
 # Extended AT host/monitor stack/heap sizes since some nrf_cloud credentials are longer than 1024 bytes.
 CONFIG_AT_MONITOR_HEAP_SIZE=2176
-# Wifi scan requires extended heap size
-CONFIG_HEAP_MEM_POOL_SIZE=20000
+CONFIG_HEAP_MEM_POOL_SIZE=10000
 CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1600
 
@@ -119,6 +118,7 @@ CONFIG_FOTA_DOWNLOAD=y
 CONFIG_FOTA_DOWNLOAD_PROGRESS_EVT=y
 CONFIG_FOTA_DL_TIMEOUT_MIN=30
 CONFIG_DFU_TARGET=y
+
 # COAP client
 CONFIG_COAP_CLIENT_THREAD_PRIORITY=0
 CONFIG_COAP_CLIENT_BLOCK_SIZE=1024
@@ -147,40 +147,18 @@ CONFIG_LOCATION_DATA_DETAILS=y
 CONFIG_LOCATION_METHOD_GNSS=y
 CONFIG_LOCATION_SERVICE_NRF_CLOUD_GNSS_POS_SEND=y
 CONFIG_LOCATION_REQUEST_DEFAULT_GNSS_TIMEOUT=60000
-CONFIG_LOCATION_REQUEST_DEFAULT_WIFI_TIMEOUT=10000
 CONFIG_LOCATION_REQUEST_DEFAULT_CELLULAR_TIMEOUT=30000
 CONFIG_LOCATION_REQUEST_DEFAULT_TIMEOUT=120000
 CONFIG_LOCATION_REQUEST_DEFAULT_CELLULAR_CELL_COUNT=3
 CONFIG_LOCATION_REQUEST_DEFAULT_GNSS_VISIBILITY_DETECTION=y
 CONFIG_LOCATION_REQUEST_DEFAULT_GNSS_PRIORITY_MODE=y
 CONFIG_LTE_NETWORK_MODE_LTE_M_NBIOT_GPS=y
-
-# configs for Wi-Fi
-CONFIG_WIFI=y
-CONFIG_WIFI_NRF70=y
-CONFIG_WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC=y
-CONFIG_WIFI_NRF70_LOG_LEVEL_ERR=y
-CONFIG_NRF70_BH_WQ_STACK_SIZE=1024
-CONFIG_NRF70_IRQ_WQ_STACK_SIZE=1024
-
-# Align this with CONFIG_LOCATION_METHOD_WIFI_SCANNING_RESULTS_MAX_CNT
-CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT=10
 CONFIG_NRF_CLOUD_AGNSS=y
 
-# Wi-Fi location
-CONFIG_LOCATION_METHOD_WIFI=y
-
-# Align this with CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT
-CONFIG_LOCATION_METHOD_WIFI_SCANNING_RESULTS_MAX_CNT=10
-CONFIG_LOCATION_WORKQUEUE_STACK_SIZE=4244
-
 # Not for LTE throughput testing
 CONFIG_NRF_MODEM_LIB_SHMEM_TX_SIZE=4096
 CONFIG_NRF_MODEM_LIB_SHMEM_RX_SIZE=4096
 
-# Scan only using offload API
-CONFIG_WIFI_NM_WPA_SUPPLICANT=n
-
 # For nRF9160 the default is socket interface
 CONFIG_NET_DEFAULT_IF_ETHERNET=y
 CONFIG_MBEDTLS=n
@@ -191,7 +169,6 @@ CONFIG_NET_NATIVE=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_STATISTICS=y
-CONFIG_NET_STATISTICS_WIFI=y
 CONFIG_NET_STATISTICS_USER_API=y
 CONFIG_NET_CONTEXT_SYNC_RECV=y
 
@@ -215,19 +192,13 @@ CONFIG_THREAD_NAME=y
 
 # Extra Logging
 CONFIG_APP_FOTA_LOG_LEVEL_DBG=y
-CONFIG_APP_BATTERY_LOG_LEVEL_DBG=y
 CONFIG_APP_LOCATION_LOG_LEVEL_DBG=y
 CONFIG_APP_CLOUD_LOG_LEVEL_DBG=y
 CONFIG_APP_NETWORK_LOG_LEVEL_DBG=y
 CONFIG_APP_LED_LOG_LEVEL_DBG=y
-CONFIG_APP_ENVIRONMENTAL_LOG_LEVEL_DBG=y
 CONFIG_APP_SHELL_LOG_LEVEL_DBG=y
 CONFIG_APP_LOG_LEVEL_DBG=y
 
-# Fuel Gage
-CONFIG_NRF_FUEL_GAUGE=y
-CONFIG_NPM1300_CHARGER=y
-
 # Task Watchdog
 CONFIG_TASK_WDT=y
 CONFIG_TASK_WDT_CHANNELS=9

app/src/modules/app/app.c

@@ -13,10 +13,13 @@
 
 #include "modules_common.h"
 #include "message_channel.h"
-#include "battery.h"
 #include "button.h"
 #include "network.h"
 
+#if defined(CONFIG_APP_BATTERY)
+#include "battery.h"
+#endif /* CONFIG_APP_BATTERY */
+
 /* Register log module */
 LOG_MODULE_REGISTER(app, CONFIG_APP_LOG_LEVEL);
 
@@ -117,12 +120,6 @@ static void triggers_send(void)
 	struct network_msg network_msg = {
 		.type = NETWORK_QUALITY_SAMPLE_REQUEST,
 	};
-	struct battery_msg battery_msg = {
-		.type = BATTERY_PERCENTAGE_SAMPLE_REQUEST,
-	};
-	struct battery_msg environmental_msg = {
-		.type = ENVIRONMENTAL_SENSOR_SAMPLE_REQUEST,
-	};
 	enum trigger_type poll_trigger = TRIGGER_FOTA_POLL;
 
 	err = zbus_chan_pub(&NETWORK_CHAN, &network_msg, K_SECONDS(1));
@@ -132,19 +129,31 @@ static void triggers_send(void)
 		return;
 	}
 
+#if defined(CONFIG_APP_BATTERY)
+	struct battery_msg battery_msg = {
+		.type = BATTERY_PERCENTAGE_SAMPLE_REQUEST,
+	};
+
 	err = zbus_chan_pub(&BATTERY_CHAN, &battery_msg, K_SECONDS(1));
 	if (err) {
 		LOG_ERR("zbus_chan_pub, error: %d", err);
 		SEND_FATAL_ERROR();
 		return;
 	}
+#endif /* CONFIG_APP_BATTERY */
+
+#if defined(CONFIG_APP_ENVIRONMENTAL)
+	struct battery_msg environmental_msg = {
+		.type = ENVIRONMENTAL_SENSOR_SAMPLE_REQUEST,
+	};
 
 	err = zbus_chan_pub(&ENVIRONMENTAL_CHAN, &environmental_msg, K_SECONDS(1));
 	if (err) {
 		LOG_ERR("zbus_chan_pub, error: %d", err);
 		SEND_FATAL_ERROR();
 		return;
 	}
+#endif /* CONFIG_APP_ENVIRONMENTAL */
 
 	/* Send FOTA poll trigger */
 	err = zbus_chan_pub(&TRIGGER_CHAN, &poll_trigger, K_SECONDS(1));

app/src/modules/battery/Kconfig.battery

@@ -6,6 +6,11 @@
 
 menu "Battery"
 
+config APP_BATTERY
+	bool "Battery module"
+
+if APP_BATTERY
+
 config APP_BATTERY_THREAD_STACK_SIZE
 	int "Thread stack size"
 	default 1536
@@ -24,4 +29,6 @@ module = APP_BATTERY
 module-str = Battery
 source "subsys/logging/Kconfig.template.log_config"
 
+endif # APP_BATTERY
+
 endmenu # Battery

app/src/modules/button/button.c

@@ -11,7 +11,6 @@
 #include <date_time.h>
 
 #include "message_channel.h"
-#include "battery.h"
 #include "button.h"
 
 /* Register log module */

app/src/modules/cloud/cloud_module.c

@@ -19,17 +19,29 @@
 
 #include "modules_common.h"
 #include "message_channel.h"
-#include "battery.h"
 #include "network.h"
+#if defined(CONFIG_APP_BATTERY)
+#include "battery.h"
+#endif /* CONFIG_APP_BATTERY */
 
 /* Register log module */
 LOG_MODULE_REGISTER(cloud, CONFIG_APP_CLOUD_LOG_LEVEL);
 
 #define CUSTOM_JSON_APPID_VAL_CONEVAL "CONEVAL"
 #define CUSTOM_JSON_APPID_VAL_BATTERY "BATTERY"
+
+#if defined(CONFIG_APP_BATTERY)
+#define BAT_MSG_SIZE	sizeof(struct battery_msg)
+#else
+#define BAT_MSG_SIZE	0
+#endif /* CONFIG_APP_BATTERY */
+
 #define MAX_MSG_SIZE	(MAX(sizeof(struct cloud_payload),					\
 			 MAX(sizeof(struct network_msg),					\
-			 MAX(sizeof(struct battery_msg), sizeof(struct environmental_msg)))))
+			 MAX(BAT_MSG_SIZE,							\
+			 sizeof(struct environmental_msg)))))
+
+
 
 BUILD_ASSERT(CONFIG_APP_CLOUD_WATCHDOG_TIMEOUT_SECONDS >
 	     CONFIG_APP_CLOUD_EXEC_TIME_SECONDS_MAX,
@@ -41,9 +53,11 @@ ZBUS_MSG_SUBSCRIBER_DEFINE(cloud);
 /* Observe channels */
 ZBUS_CHAN_ADD_OBS(PAYLOAD_CHAN, cloud, 0);
 ZBUS_CHAN_ADD_OBS(NETWORK_CHAN, cloud, 0);
-ZBUS_CHAN_ADD_OBS(BATTERY_CHAN, cloud, 0);
 ZBUS_CHAN_ADD_OBS(TRIGGER_CHAN, cloud, 0);
 ZBUS_CHAN_ADD_OBS(ENVIRONMENTAL_CHAN, cloud, 0);
+#if defined(CONFIG_APP_BATTERY)
+ZBUS_CHAN_ADD_OBS(BATTERY_CHAN, cloud, 0);
+#endif /* CONFIG_APP_BATTERY */
 
 /* Define channels provided by this module */
 
@@ -532,6 +546,7 @@ static void state_connected_ready_run(void *o)
 		}
 	}
 
+#if defined(CONFIG_APP_BATTERY)
 	if (state_object->chan == &BATTERY_CHAN) {
 		struct battery_msg msg = MSG_TO_BATTERY_MSG(state_object->msg_buf);
 
@@ -547,6 +562,7 @@ static void state_connected_ready_run(void *o)
 			return;
 		}
 	}
+#endif /* CONFIG_APP_BATTERY */
 
 	if (state_object->chan == &ENVIRONMENTAL_CHAN) {
 		struct environmental_msg msg = MSG_TO_ENVIRONMENTAL_MSG(state_object->msg_buf);

app/sysbuild.conf

@@ -3,6 +3,3 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
-
-SB_CONFIG_WIFI_NRF70=y
-SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y