fix overlays

plskeggs · Jan 9, 2025 · 3f86bb2 · 3f86bb2
1 parent 849e319
commit 3f86bb2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 50 deletions.
diff --git a/samples/cellular/nrf_cloud_ble_gateway/boards/nrf9160dk_nrf9160_ns.overlay b/samples/cellular/nrf_cloud_ble_gateway/boards/nrf9160dk_nrf9160_ns.overlay
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+/* Use the reset line that is available until v0.14.0 of the DK. */
 #include <nrf9160/nrf9160dk_nrf52840_reset_on_if5.dtsi>
 
 / {

diff --git a/samples/cellular/nrf_cloud_ble_gateway/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay b/samples/cellular/nrf_cloud_ble_gateway/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay
@@ -9,7 +9,6 @@
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
-		zephyr,bt-hci=&bt_hci_uart;
 	};
 };
 
@@ -18,57 +17,10 @@
 	status = "okay";
 };
 
-&nrf52840_reset {
-	status = "okay";
-};
-
 /* Enable high drive mode for the SPI3 pins to get a square signal at 8 MHz */
 &spi3_default {
 	group1 {
 		nordic,drive-mode = <NRF_DRIVE_H0H1>;
 	};
 };
 
-&gpiote {
-	interrupts = <49 NRF_DEFAULT_IRQ_PRIORITY>;
-};
-
-&uart2 {
-	current-speed = <1000000>;
-	status = "okay";
-	hw-flow-control;
-
-	pinctrl-0 = <&uart2_default_alt>;
-	pinctrl-1 = <&uart2_sleep_alt>;
-	pinctrl-names = "default", "sleep";
-	bt_hci_uart: bt_hci_uart {
-		compatible = "zephyr,bt-hci-uart";
-		status = "okay";
-	};
-};
-
-&pinctrl {
-	uart2_default_alt: uart2_default_alt {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 18)>,
-				<NRF_PSEL(UART_RTS, 0, 21)>;
-			};
-		group2 {
-			psels = <NRF_PSEL(UART_RX, 0, 17)>,
-				<NRF_PSEL(UART_CTS, 0, 19)>;
-				bias-pull-up;
-		};
-	};
-
-	uart2_sleep_alt: uart2_sleep_alt {
-		group1 {
-			psels = <NRF_PSEL(UART_TX, 0, 18)>,
-				<NRF_PSEL(UART_RX, 0, 17)>,
-				<NRF_PSEL(UART_RTS, 0, 21)>,
-				<NRF_PSEL(UART_CTS, 0, 19)>;
-			low-power-enable;
-		};
-	};
-
-};
-
diff --git a/samples/cellular/nrf_cloud_ble_gateway/src/ble/ble.c b/samples/cellular/nrf_cloud_ble_gateway/src/ble/ble.c
@@ -1582,4 +1582,15 @@ int ble_init(void)
 	}
 
 	return 0;
-}
+}
+
+#if defined(CONFIG_BOARD_NRF9160DK_NRF9160_NS)
+/* This function is missing in the Zephyr file
+ * boards/nordic/nrf9160dk/nrf52840_reset.c. It is now
+ * required by the Bluetooth stack.
+ */
+int bt_h4_vnd_setup(const struct device *dev)
+{
+	return 0;
+}
+#endif
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_fota.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_fota.c
@@ -121,7 +121,7 @@ static void update_last_job(char const *const job_id)
 
 static bool is_last_job(char const *const job_id)
 {
-	bool match;
+	bool match = false;
 
 	K_SPINLOCK(&last_job_slock) {
 		match = (strncmp(last_job, job_id, sizeof(last_job)) == 0);