Updated the Challenger 840 BLE board support files to include the new partition

Author: klingenbergh

boards/ilabs/challenger_840_ble/challenger_840_ble.dts

@@ -1,16 +1,16 @@
 /dts-v1/;
 #include "challenger_840_ble_common.dtsi"
-#include <nordic/nrf52840_partition.dtsi>
+#include "challenger_840_ble_partition.dtsi"
 
 / {
     model = "iLabs CHALLENGER 840 BLE";
     compatible = "adafruit,feather-nrf52840";
 
 	chosen {
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
-		zephyr,uart-mcumgr = &uart0;
-		zephyr,bt-mon-uart = &uart0;
-		zephyr,bt-c2h-uart = &uart0;
+		zephyr,console = &cdc_acm_uart0;
+		zephyr,shell-uart = &cdc_acm_uart0;
+		zephyr,uart-mcumgr = &cdc_acm_uart0;
+		zephyr,bt-mon-uart = &cdc_acm_uart0;
+		zephyr,bt-c2h-uart = &cdc_acm_uart0;
 	};
-};
+};

boards/ilabs/challenger_840_ble/challenger_840_ble_common.dtsi

@@ -69,7 +69,20 @@ SPDX-License-Identifier: Apache-2.0 */
 		sw0 = &button0;
 		led-strip = &led_strip;
 	};
-
+	fstab {
+		compatible = "zephyr,fstab";
+		lfs1: lfs1 {
+			compatible = "zephyr,fstab,littlefs";
+			mount-point = "/lfs1";
+			partition = <&storage_partition>;
+			automount;
+			read-size = <16>;
+			prog-size = <16>;
+			cache-size = <64>;
+			lookahead-size = <32>;
+			block-cycles = <512>;
+		};
+	};
 };
 
 &adc {
@@ -153,12 +166,23 @@ SPDX-License-Identifier: Apache-2.0 */
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
-		size = <DT_SIZE_M(8)>; /* (8MB) */
+		size = <DT_SIZE_M(64)>;
 		status = "okay";
 		jedec-id = [ ef 40 17  ];
 		has-dpd;
 		t-enter-dpd = <3500>;
 		t-exit-dpd = <3500>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+	
+			storage_partition: partition@0 {
+				label = "storage";
+				reg = <0x00000000 0x007270E0>;
+			};
+		};
 	};
 };
 
@@ -169,4 +193,7 @@ SPDX-License-Identifier: Apache-2.0 */
 zephyr_udc0: &usbd {
 	compatible = "nordic,nrf-usbd";
 	status = "okay";
-};
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+	};
+};

boards/ilabs/challenger_840_ble/challenger_840_ble_defconfig

@@ -17,10 +17,12 @@ CONFIG_REGULATOR=y
 CONFIG_VOLTAGE_DIVIDER=y
 
 # Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
+#CONFIG_CONSOLE=y
+#CONFIG_UART_CONSOLE=y
 
 # 32kHz clock source
+CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_NRF=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_500PPM=y
 

boards/ilabs/challenger_840_ble/challenger_840_ble_partition.dtsi

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2024 Jacob Winther
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,code-partition = &slot0_partition;
+	};
+};
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 0x0000C000>;
+		};
+		slot0_partition: partition@c000 {
+			label = "image-0";
+			reg = <0x0000C000 0x00077000>;
+		};
+		slot1_partition: partition@83000 {
+			label = "image-1";
+			reg = <0x00083000 0x00075000>;
+		};
+
+	};
+};

boards/ilabs/challenger_840_ble/challenger_840_ble_partition_uf2.dtsi

@@ -32,10 +32,6 @@ SPDX-License-Identifier: Apache-2.0 */
 		 * The flash starting at 0x000ed000 and ending at
 		 * 0x000f4000 is reserved for use by the application.
 		 */
-		storage_partition: partition@ed000 {
-			label = "storage";
-			reg = <0x0000ed000 DT_SIZE_K(28)>;
-		};
 
 		boot_partition: partition@f4000 {
 			label = "UF2";

boards/ilabs/challenger_840_ble/challenger_840_ble_uf2.dts

@@ -10,7 +10,7 @@
 
  / {
 	 model = "iLabs Challenger 840 BLE UF2";
-	 compatible = "adafruit,feather-nrf52840-uf2";
+	 compatible = "adafruit,feather-nrf52840";
 
 	 chosen {
 		 zephyr,console = &cdc_acm_uart0;
@@ -21,10 +21,4 @@
 	 };
 
  };
- 
- zephyr_udc0: &usbd {
-	 cdc_acm_uart0: cdc_acm_uart0 {
-		 compatible = "zephyr,cdc-acm-uart";
-	 };
- };
 

boards/ilabs/challenger_840_ble/challenger_840_ble_uf2_defconfig

@@ -35,6 +35,8 @@ CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # 32kHz clock source
+CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_NRF=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_500PPM=y