Cleanup

Signed-off-by: Adam Szczygieł <[email protected]>

Author: adsz-nordic

samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay

@@ -1,7 +1,7 @@
 / {
-	sram@22007F00 {
+	sram@22007FC0 {
 		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x22007F00 0x100>;
+		reg = <0x22007FC0 0x40>;
 		zephyr,memory-region = "RetainedMem";
 		status = "okay";
 
@@ -14,7 +14,7 @@
 			boot_info0: boot_info@0 {
 				compatible = "zephyr,retention";
 				status = "okay";
-				reg = <0x0 0x100>;
+				reg = <0x0 0x40>;
 			};
 		};
 	};
@@ -25,5 +25,5 @@
 };
 
 &cpuapp_ram0 {
-	reg = <0x22000000 0x7F00>;
+	reg = <0x22000000 0x7FC0>;
 };

samples/subsys/mgmt/mcumgr/smp_svr/prj.conf

@@ -40,18 +40,7 @@ CONFIG_MCUBOOT_UTIL_LOG_LEVEL_WRN=y
 # Disable debug logging
 CONFIG_LOG_MAX_LEVEL=3
 
-# TODO: My config attempts
 CONFIG_RETAINED_MEM=y
 CONFIG_RETENTION=y
 CONFIG_RETENTION_BOOTLOADER_INFO=y
 CONFIG_RETENTION_BOOTLOADER_INFO_TYPE_MCUBOOT=y
-
-# Is it needed?
-CONFIG_RETENTION_BOOTLOADER_INFO_OUTPUT_FUNCTION=y
-
-#####################################
-# Alternative?
-
-# CONFIG_SETTINGS=y
-# CONFIG_SETTINGS_RUNTIME=y
-# CONFIG_RETENTION_BOOTLOADER_INFO_OUTPUT_SETTINGS=y

samples/subsys/mgmt/mcumgr/smp_svr/src/main.c

@@ -25,9 +25,7 @@ LOG_MODULE_REGISTER(smp_sample);
 #include "common.h"
 
 #include <zephyr/retention/blinfo.h>
-#include <bootutil/boot_status.h>
 #include <bootutil/image.h>
-#include <zephyr/settings/settings.h>
 
 #define STORAGE_PARTITION_LABEL	storage_partition
 #define STORAGE_PARTITION_ID	FIXED_PARTITION_ID(STORAGE_PARTITION_LABEL)
@@ -55,20 +53,21 @@ static struct fs_mount_t littlefs_mnt = {
 };
 #endif
 
-static void my_blinfo_bootloader_version(void)
+static void blinfo_bootloader_version(void)
 {
-	printf("adsz: my_blinfo_bootloader_version\n");
+	struct image_version version = {0x00};
 
-	struct image_version version= {0x00};
-	int ret = blinfo_lookup(BLINFO_BOOTLOADER_VERSION, (char *)&version, sizeof(struct image_version));
+	int ret = blinfo_lookup(BLINFO_BOOTLOADER_VERSION,
+				(char *)&version,
+				sizeof(struct image_version));
 
 	if (ret < 0) {
-		printf("adsz: Error: %d\n", ret);
+		printf("blinfo_lookup error: %d\n", ret);
 	} else {
-		printf("adsz: iv_major: %d\n", version.iv_major);
-		printf("adsz: iv_minor: %d\n", version.iv_minor);
-		printf("adsz: iv_revision: %d\n", version.iv_revision);
-		printf("adsz: iv_build_num: %d\n", version.iv_build_num);
+		printf("bl iv_major: %d\n", version.iv_major);
+		printf("bl iv_minor: %d\n", version.iv_minor);
+		printf("bl iv_revision: %d\n", version.iv_revision);
+		printf("bl iv_build_num: %d\n", version.iv_build_num);
 	}
 }
 
@@ -106,9 +105,8 @@ int main(void)
 	 * compile which is convenient when testing firmware upgrade.
 	 */
 	LOG_INF("build time: " __DATE__ " " __TIME__);
-	LOG_INF("adsz: Hello from smp_svr!");
 
-	my_blinfo_bootloader_version();
+	blinfo_bootloader_version();
 
 	/* The system work queue handles all incoming mcumgr requests.  Let the
 	 * main thread idle while the mcumgr server runs.

samples/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot.overlay

@@ -1,7 +1,7 @@
 / {
-	sram@22007F00 {
+	sram@22007FC0 {
 		compatible = "zephyr,memory-region", "mmio-sram";
-		reg = <0x22007F00 0x100>;
+		reg = <0x22007FC0 0x40>;
 		zephyr,memory-region = "RetainedMem";
 		status = "okay";
 
@@ -14,7 +14,7 @@
 			boot_info0: boot_info@0 {
 				compatible = "zephyr,retention";
 				status = "okay";
-				reg = <0x0 0x100>;
+				reg = <0x0 0x40>;
 			};
 		};
 	};
@@ -26,5 +26,5 @@
 };
 
 &cpuapp_ram0 {
-  reg = <0x22000000 0x7F00>;
+	reg = <0x22000000 0x7FC0>;
 };