From 8dc5c7f92cfcf348148fd2e73424e8b75328c592 Mon Sep 17 00:00:00 2001
From: Noah Pendleton <2538614+noahp@users.noreply.github.com>
Date: Mon, 4 Nov 2024 11:56:55 -0500
Subject: [PATCH] Fix `ZEPHYR_DATA_REGION_START` for zephyr 4

This has been fixed in upstream Zephyr, so make it conditional.
---
 config/memfault_platform_config.h | 2 +-
 prj.conf                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/memfault_platform_config.h b/config/memfault_platform_config.h
index 32b508a..d762693 100644
--- a/config/memfault_platform_config.h
+++ b/config/memfault_platform_config.h
@@ -10,7 +10,7 @@
 extern "C" {
 #endif
 
-#if defined(CONFIG_SOC_FAMILY_ESP32)
+#if defined(CONFIG_MEMFAULT_SOC_FAMILY_ESP32)
   #define ZEPHYR_DATA_REGION_START _data_start
   #define ZEPHYR_DATA_REGION_END _data_end
 #endif
diff --git a/prj.conf b/prj.conf
index ea62b90..fc73c63 100644
--- a/prj.conf
+++ b/prj.conf
@@ -74,7 +74,7 @@ CONFIG_LOG_PRINTK=n
 CONFIG_LOG_MODE_IMMEDIATE=y
 
 # Disable these temporarily, for debugging.
-CONFIG_MEMFAULT_COREDUMP_COLLECT_DATA_REGIONS=n
+CONFIG_MEMFAULT_COREDUMP_COLLECT_DATA_REGIONS=y
 CONFIG_MEMFAULT_COREDUMP_COLLECT_KERNEL_REGION=n
 CONFIG_MEMFAULT_COREDUMP_COLLECT_TASKS_REGIONS=n