samples: cellular: nrf_cloud_ble_gateway: Licenses

Add licenses. Update apricity board files. Address compliance failures. Signed-off-by: Pete Skeggs <[email protected]>
plskeggs · Jan 13, 2025 · ae53340 · ae53340
1 parent 2c04963
commit ae53340
Show file tree

Hide file tree

Showing 52 changed files with 317 additions and 1,293 deletions.
diff --git a/samples/cellular/nrf_cloud_ble_gateway/CMakeLists.txt b/samples/cellular/nrf_cloud_ble_gateway/CMakeLists.txt
@@ -106,7 +106,6 @@ target_sources(app PRIVATE src/ble/gateway.c)
 target_sources_ifdef(CONFIG_SHELL app PRIVATE src/ble/cli.c)
 target_sources_ifdef(CONFIG_GATEWAY_BLE_FOTA app PRIVATE src/ble/dfu/peripheral_dfu.c)
 
-add_subdirectory(src/ble/ui)
 #add_subdirectory(src/ble/dfu)
 add_subdirectory(src/ble/flash)
 

diff --git a/samples/cellular/nrf_cloud_ble_gateway/boards/apricity_gateway_nrf9160_ns.conf b/samples/cellular/nrf_cloud_ble_gateway/boards/apricity_gateway_nrf9160_ns.conf
@@ -6,5 +6,3 @@
 
 # Apricity
 CONFIG_ENTER_52840_MCUBOOT_VIA_BUTTON=y
-CONFIG_NRF_CLOUD_HOST_NAME="mqtt.beta.nrfcloud.com"
-CONFIG_NRF_CLOUD_SEC_TAG=42
diff --git a/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/CMakeLists.txt b/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Kconfig - APRICITY GATEWAY NRF9160 board configuration
 #
-# Copyright (c) 2020 Nordic Semiconductor ASA
+# Copyright (c) 2025 Nordic Semiconductor ASA
 #
-# SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
 zephyr_library()
 zephyr_library_sources(nrf52840_reset.c)
diff --git a/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/Kconfig b/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/Kconfig
@@ -1,8 +1,8 @@
 # Apricity Gateway nRF9160 board configuration
 #
-# Copyright (c) 2020 Nordic Semiconductor ASA
+# Copyright (c) 2025 Nordic Semiconductor ASA
 #
-# SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
 module=BOARD
 module-dep=LOG

diff --git a/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/Kconfig.board b/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/Kconfig.board
@@ -1,8 +1,8 @@
 # Apricity Gateway nRF9160 board configuration
 #
-# Copyright (c) 2020 Nordic Semiconductor ASA
+# Copyright (c) 2025 Nordic Semiconductor ASA
 #
-# SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
 if SOC_NRF9160_SICA
 

diff --git a/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/Kconfig.defconfig b/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/Kconfig.defconfig
@@ -1,8 +1,8 @@
 # Apricity Gateway nRF9160 board configuration
 #
-# Copyright (c) 2020 Nordic Semiconductor ASA
+# Copyright (c) 2025 Nordic Semiconductor ASA
 #
-# SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
 if BOARD_APRICITY_GATEWAY_NRF9160 || BOARD_APRICITY_GATEWAY_NRF9160_NS
 
@@ -34,9 +34,6 @@ endif # BUILD_WITH_TFM
 # Apply this configuration below by setting the Kconfig symbols used by
 # the linker according to the information extracted from DT partitions.
 
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-
 config FLASH_LOAD_SIZE
 	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
 	depends on BOARD_APRICITY_GATEWAY_NRF9160 && TRUSTED_EXECUTION_SECURE

diff --git a/...ar/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160.dts b/...ar/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160.dts
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020 Nordic Semiconductor ASA
+ * Copyright (c) 2025 Nordic Semiconductor ASA
  *
- * SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
 /dts-v1/;
@@ -10,10 +10,8 @@
 
 / {
 	chosen {
-		zephyr,sram = &sram0_s;
+		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
-		zephyr,sram-secure-partition = &sram0_s;
-		zephyr,sram-non-secure-partition = &sram0_ns;
 	};
 };
diff --git a/...r/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160.yaml b/...r/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160.yaml
@@ -13,5 +13,4 @@ supported:
   - i2c
   - pwm
   - spi
-  - watchdog
   - counter
diff --git a/...cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_common.dts b/...cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_common.dts
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2024 Nordic Semiconductor ASA
+ * Copyright (c) 2025 Nordic Semiconductor ASA
  *
- * SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
 / {
@@ -12,7 +12,7 @@
 		zephyr,console = &uart0;
 		zephyr,shell-uart = &uart0;
 		zephyr,uart-mcumgr = &uart0;
-		zephyr,bt-uart=&uart1;
+		zephyr,bt-hci=&bt_hci_uart;
 	};
 
 	buttons {
@@ -266,6 +266,10 @@
 	pinctrl-0 = <&uart1_default>;
 	pinctrl-1 = <&uart1_sleep>;
 	pinctrl-names = "default", "sleep";
+	bt_hci_uart: bt_hci_uart {
+		compatible = "zephyr,bt-hci-uart";
+		status = "okay";
+	};
 };
 
 &flash0 {
@@ -294,8 +298,12 @@
 		slot1_ns_partition: partition@c0000 {
 			label = "image-1-nonsecure";
 		};
+		scratch_partition: partition@f0000 {
+			label = "image-scratch";
+			reg = <0x000f0000 0xa000>;
+		};
 		/* 0xf0000 to 0xf7fff reserved for TF-M partitions */
-		storage_partition: partition@f8000 {
+		storage_partition: partition@fa000 {
 			label = "storage";
 			reg = <0x000f8000 0x00008000>;
 		};
@@ -313,7 +321,7 @@
 			/* Secure image memory */
 		};
 
-		sram0_modem: image_modem@20016000 {
+		sram0_bsd: image_modem@20010000 {
 			/* Modem (shared) memory */
 		};
 

diff --git a/..._cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_defconfig b/..._cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_defconfig
@@ -23,3 +23,6 @@ CONFIG_SERIAL=y
 # Enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
+
+# Disable entropy driver, as it's not yet implemented for nRF9160
+CONFIG_ENTROPY_NRF5_RNG=n
diff --git a/...nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_ns.dts b/...nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_ns.dts
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020 Nordic Semiconductor ASA
+ * Copyright (c) 2025 Nordic Semiconductor ASA
  *
- * SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
 /dts-v1/;

diff --git a/...rf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_ns.yaml b/...rf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_ns.yaml
@@ -1,18 +1,16 @@
-identifier: apricity_gateway_nrf9160ns
+identifier: apricity_gateway_nrf9160_ns
 name: APRICITY_GATEWAY-nRF9160-Non-Secure
 type: mcu
 arch: arm
 toolchain:
   - gnuarmemb
-  - xtools
   - zephyr
 ram: 128
-flash: 192
+flash: 256
 supported:
   - serial
   - spi
   - i2c
   - pwm
-  - watchdog
   - netif:modem
   - gpio
diff --git a/...oud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_ns_defconfig b/...oud_ble_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_ns_defconfig
@@ -28,4 +28,12 @@ CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # Disable entropy driver, as it's not yet implemented for nRF9160
-#CONFIG_ENTROPY_NRF5_RNG=n
+CONFIG_ENTROPY_NRF5_RNG=n
+
+# Enable SPI
+CONFIG_SPI=y
+
+# Disable entropy driver, as it's not yet implemented for nRF9160
+CONFIG_ENTROPY_NRF5_RNG=n
+
+CONFIG_BOOTLOADER_MCUBOOT=y
diff --git a/...e_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_partition_conf.dts b/...e_gateway/boards/arm/apricity_gateway_nrf9160/apricity_gateway_nrf9160_partition_conf.dts
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020 Nordic Semiconductor ASA
+ * Copyright (c) 2025 Nordic Semiconductor ASA
  *
- * SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
 /*
@@ -51,7 +51,7 @@
 	reg = <0x20000000 DT_SIZE_K(88)>;
 };
 
-&sram0_modem {
+&sram0_bsd {
 	reg = <0x20016000 DT_SIZE_K(40)>;
 };
 

diff --git a/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/board.cmake b/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/board.cmake
@@ -1,16 +1,11 @@
-# Copyright (c) 2019 Nordic Semiconductor ASA.
-# SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
-
-if(CONFIG_BOARD_APRICITY_GATEWAY_NRF9160_NS)
-  set(TFM_PUBLIC_KEY_FORMAT "full")
-endif()
+# Copyright (c) 2025 Nordic Semiconductor ASA.
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
 if(CONFIG_TFM_FLASH_MERGED_BINARY)
   set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
 endif()
 
-board_runner_args(jlink "--device=nRF9160_xxAA" "--speed=4000")
+board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
 board_runner_args(nrfjprog "--softreset")
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
diff --git a/...eway/boards/arm/apricity_gateway_nrf9160/dts/bindings/nordic,nrf9160dk-nrf52840-boot.yaml b/...eway/boards/arm/apricity_gateway_nrf9160/dts/bindings/nordic,nrf9160dk-nrf52840-boot.yaml
@@ -1,5 +1,5 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
 # NOTE: This file is replicated in nrf9160dk_nrf9160 and nrf9160dk_nrf52840.
 #       Any changes should be done in both instances.

diff --git a/...boards/arm/apricity_gateway_nrf9160/dts/bindings/nordic,nrf9160dk-nrf52840-interface.yaml b/...boards/arm/apricity_gateway_nrf9160/dts/bindings/nordic,nrf9160dk-nrf52840-interface.yaml
@@ -1,5 +1,5 @@
-# Copyright (c) 2021 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
 # NOTE: This file is replicated in nrf9160dk_nrf9160 and nrf9160dk_nrf52840.
 #       Any changes should be done in both instances.

diff --git a/...way/boards/arm/apricity_gateway_nrf9160/dts/bindings/nordic,nrf9160dk-nrf52840-reset.yaml b/...way/boards/arm/apricity_gateway_nrf9160/dts/bindings/nordic,nrf9160dk-nrf52840-reset.yaml
@@ -1,5 +1,5 @@
-# Copyright (c) 2021 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
 # NOTE: This file is replicated in nrf9160dk_nrf9160 and nrf9160dk_nrf52840.
 #       Any changes should be done in both instances.

diff --git a/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/nrf52840_reset.c b/samples/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/nrf52840_reset.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020 Nordic Semiconductor ASA.
+ * Copyright (c) 2025 Nordic Semiconductor ASA.
  *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
 #include <zephyr/kernel.h>
@@ -242,4 +242,3 @@ int bt_hci_transport_setup(struct device *h4)
 #else
 #warning "Reset and/or boot node is missing"
 #endif /* DT_NODE_HAS_STATUS(RESET_NODE, okay) && DT_NODE_HAS_STATUS(BOOT_NODE, okay) */
-
diff --git a/...les/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/pre_dt_board.cmake b/...les/cellular/nrf_cloud_ble_gateway/boards/arm/apricity_gateway_nrf9160/pre_dt_board.cmake
@@ -1,5 +1,5 @@
-# Copyright (c) 2021 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
 # Suppress "unique_unit_address_if_enabled" to handle the following overlaps:
 # - flash-controller@39000 & kmu@39000

diff --git a/samples/cellular/nrf_cloud_ble_gateway/boards/nrf9160dk_nrf9160_0_14_0.overlay b/samples/cellular/nrf_cloud_ble_gateway/boards/nrf9160dk_nrf9160_0_14_0.overlay
@@ -1,13 +1,13 @@
 /*
  * Copyright (c) 2021 Nordic Semiconductor ASA
  *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 /*
-#include <nrf9160/nrf9160dk_uart1_on_if0_3.dtsi>
-#include <nrf9160/nrf9160dk_nrf9160_common_0_14_0.dtsi>
-#include <nrf9160/nrf9160dk_nrf52840_reset_on_if9.dtsi>
-*/
+ * #include <nrf9160/nrf9160dk_uart1_on_if0_3.dtsi>
+ * #include <nrf9160/nrf9160dk_nrf9160_common_0_14_0.dtsi>
+ * #include <nrf9160/nrf9160dk_nrf52840_reset_on_if9.dtsi>
+ */
 #include <nrf9160/nrf9160dk_nrf9160_common_0_14_0.dtsi>
 
 &nrf52840_reset {

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
@@ -23,4 +23,3 @@
 		nordic,drive-mode = <NRF_DRIVE_H0H1>;
 	};
 };
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,5 +13,4 @@ supported: @@
       - i2c
       - pwm
       - spi
-      - watchdog
       - counter
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,4 +23,3 @@
		nordic,drive-mode = <NRF_DRIVE_H0H1>;
		};
		};