fw: enable mcuboot on few more boards

fabiobaltieri · Sep 26, 2024 · 51c0936 · 51c0936
1 parent 81f16e2
commit 51c0936
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 15 deletions.
diff --git a/firmware/boards/balto/ploopy_mouse_nrf/ploopy_mouse_nrf.dts b/firmware/boards/balto/ploopy_mouse_nrf/ploopy_mouse_nrf.dts
@@ -226,19 +226,19 @@
 
 		boot_partition: partition@0 {
 			label = "mcuboot";
-			reg = <0x00000000 0xC000>;
+			reg = <0x00000000 0x8000>;
 		};
-		slot0_partition: partition@c000 {
+		slot0_partition: partition@8000 {
 			label = "image-0";
-			reg = <0x0000C000 0x37000>;
+			reg = <0x00008000 0x3a000>;
 		};
-		slot1_partition: partition@43000 {
+		slot1_partition: partition@42000 {
 			label = "image-1";
-			reg = <0x00043000 0x37000>;
+			reg = <0x00042000 0x3a000>;
 		};
-		storage_partition: partition@7a000 {
+		storage_partition: partition@7c000 {
 			label = "storage";
-			reg = <0x0007A000 0x00006000>;
+			reg = <0x0007c000 0x00004000>;
 		};
 	};
 };

diff --git a/firmware/boards/negcon_retro.conf b/firmware/boards/negcon_retro.conf
@@ -1,7 +1,7 @@
-CONFIG_SHELL_BACKEND_RTT=y
-CONFIG_SHELL_TAB=y
-CONFIG_SHELL_VT100_COMMANDS=y
-CONFIG_CONSOLE=y
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+CONFIG_LOG=n
+CONFIG_SHELL_MINIMAL=y
+CONFIG_SHELL_VT100_COMMANDS=n
 
 CONFIG_PWM=y
 CONFIG_REGULATOR=y
@@ -16,3 +16,37 @@ CONFIG_LED_SHELL=y
 CONFIG_REGULATOR_SHELL=y
 
 CONFIG_BT=y
+
+# MCUmgr
+
+CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="../git/zephyr-input-hid/keys/negcon-retro-key.pem"
+
+CONFIG_ZCBOR=y
+CONFIG_MCUMGR=y
+CONFIG_BOOTLOADER_MCUBOOT=y
+CONFIG_THREAD_MONITOR=y
+CONFIG_MCUMGR_GRP_OS=y
+CONFIG_MCUMGR_GRP_OS_ECHO=n
+CONFIG_MCUMGR_GRP_OS_TASKSTAT=n
+CONFIG_MCUMGR_GRP_SHELL=y
+CONFIG_SHELL_BACKEND_DUMMY=y
+CONFIG_SHELL_BACKEND_DUMMY_BUF_SIZE=1536
+CONFIG_MCUBOOT_SHELL=y
+
+CONFIG_MCUMGR_GRP_IMG=y
+CONFIG_MCUMGR_GRP_ZBASIC=y
+CONFIG_MCUMGR_GRP_ZBASIC_STORAGE_ERASE=y
+CONFIG_IMG_MANAGER=y
+
+CONFIG_BT_L2CAP_TX_MTU=498
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=502
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+
+CONFIG_MCUMGR_TRANSPORT_BT=y
+CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW=y
+CONFIG_MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL=y
+
+CONFIG_MCUMGR_TRANSPORT_BT_REASSEMBLY=y
+CONFIG_MCUMGR_TRANSPORT_NETBUF_SIZE=2475
+CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y
diff --git a/firmware/boards/ploopy_mouse_nrf.conf b/firmware/boards/ploopy_mouse_nrf.conf
@@ -1,11 +1,46 @@
-CONFIG_SHELL_BACKEND_RTT=y
-CONFIG_SHELL_TAB=y
-CONFIG_SHELL_VT100_COMMANDS=y
-CONFIG_CONSOLE=y
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+CONFIG_LOG=n
+CONFIG_SHELL_MINIMAL=y
+CONFIG_SHELL_VT100_COMMANDS=n
+
 CONFIG_REGULATOR=y
 
 CONFIG_APP_DEVICE_NAME="Ploopy Mouse nRF"
 
 CONFIG_BT=y
 CONFIG_USB_DEVICE_STACK=n
 CONFIG_USB_DEVICE_STACK_NEXT=y
+
+# MCUmgr
+
+CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="../git/zephyr-input-hid/keys/ploopy-mouse-nrf-key.pem"
+
+CONFIG_ZCBOR=y
+CONFIG_MCUMGR=y
+CONFIG_BOOTLOADER_MCUBOOT=y
+CONFIG_THREAD_MONITOR=y
+CONFIG_MCUMGR_GRP_OS=y
+CONFIG_MCUMGR_GRP_OS_ECHO=n
+CONFIG_MCUMGR_GRP_OS_TASKSTAT=n
+CONFIG_MCUMGR_GRP_SHELL=y
+CONFIG_SHELL_BACKEND_DUMMY=y
+CONFIG_SHELL_BACKEND_DUMMY_BUF_SIZE=1536
+CONFIG_MCUBOOT_SHELL=y
+
+CONFIG_MCUMGR_GRP_IMG=y
+CONFIG_MCUMGR_GRP_ZBASIC=y
+CONFIG_MCUMGR_GRP_ZBASIC_STORAGE_ERASE=y
+CONFIG_IMG_MANAGER=y
+
+CONFIG_BT_L2CAP_TX_MTU=498
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=502
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+
+CONFIG_MCUMGR_TRANSPORT_BT=y
+CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW=y
+CONFIG_MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL=y
+
+CONFIG_MCUMGR_TRANSPORT_BT_REASSEMBLY=y
+CONFIG_MCUMGR_TRANSPORT_NETBUF_SIZE=2475
+CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y