From 43da43ddc6e4f1af55e3f912252bab99e1a67248 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 2 Apr 2021 18:54:44 -0400
Subject: [PATCH] boards: cubepilot cubeorange Add remaining SRAM4 & DTCM to
 heap

---
 .../cubepilot/cubeorange/nuttx-config/console/defconfig  | 6 ++----
 boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig   | 6 ++----
 .../cubepilot/cubeorange/nuttx-config/scripts/script.ld  | 9 +++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/boards/cubepilot/cubeorange/nuttx-config/console/defconfig b/boards/cubepilot/cubeorange/nuttx-config/console/defconfig
index 7889ea82ee..3bd7d720c3 100644
--- a/boards/cubepilot/cubeorange/nuttx-config/console/defconfig
+++ b/boards/cubepilot/cubeorange/nuttx-config/console/defconfig
@@ -53,13 +53,11 @@ CONFIG_CDCACM_VENDORSTR="CubePilot"
 CONFIG_CLOCK_MONOTONIC=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_HARDFAULT_ALERT=y
-CONFIG_DEBUG_MEMFAULT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_DEV_FIFO_SIZE=0
 CONFIG_DEV_PIPE_MAXSIZE=1024
 CONFIG_DEV_PIPE_SIZE=70
-CONFIG_DISABLE_MQUEUE=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_FAT_DMAMEMORY=y
 CONFIG_FAT_LCNAMES=y
@@ -90,6 +88,7 @@ CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
+CONFIG_MM_REGIONS=4
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_PARTITION=y
@@ -163,8 +162,6 @@ CONFIG_STM32H7_BKPSRAM=y
 CONFIG_STM32H7_DMA1=y
 CONFIG_STM32H7_DMA2=y
 CONFIG_STM32H7_DMACAPABLE=y
-CONFIG_STM32H7_DTCMEXCLUDE=y
-CONFIG_STM32H7_DTCM_PROCFS=y
 CONFIG_STM32H7_FLOWCONTROL_BROKEN=y
 CONFIG_STM32H7_I2C1=y
 CONFIG_STM32H7_I2C2=y
@@ -235,3 +232,4 @@ CONFIG_USBDEV_MAXPOWER=500
 CONFIG_USEC_PER_TICK=1000
 CONFIG_USERMAIN_STACKSIZE=2944
 CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_WATCHDOG=y
diff --git a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig
index 70fe62e67a..07d469f5a0 100644
--- a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig
+++ b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig
@@ -54,13 +54,11 @@ CONFIG_CDCACM_VENDORSTR="CubePilot"
 CONFIG_CLOCK_MONOTONIC=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_HARDFAULT_ALERT=y
-CONFIG_DEBUG_MEMFAULT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_DEV_FIFO_SIZE=0
 CONFIG_DEV_PIPE_MAXSIZE=1024
 CONFIG_DEV_PIPE_SIZE=70
-CONFIG_DISABLE_MQUEUE=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_FAT_DMAMEMORY=y
 CONFIG_FAT_LCNAMES=y
@@ -91,6 +89,7 @@ CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
+CONFIG_MM_REGIONS=4
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_PARTITION=y
@@ -164,8 +163,6 @@ CONFIG_STM32H7_BKPSRAM=y
 CONFIG_STM32H7_DMA1=y
 CONFIG_STM32H7_DMA2=y
 CONFIG_STM32H7_DMACAPABLE=y
-CONFIG_STM32H7_DTCMEXCLUDE=y
-CONFIG_STM32H7_DTCM_PROCFS=y
 CONFIG_STM32H7_FLOWCONTROL_BROKEN=y
 CONFIG_STM32H7_I2C1=y
 CONFIG_STM32H7_I2C2=y
@@ -236,3 +233,4 @@ CONFIG_USBDEV_MAXPOWER=500
 CONFIG_USEC_PER_TICK=1000
 CONFIG_USERMAIN_STACKSIZE=2944
 CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_WATCHDOG=y
diff --git a/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld b/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld
index ac32f0afc8..f408f6c2e9 100644
--- a/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld
+++ b/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld
@@ -198,6 +198,15 @@ SECTIONS
 		_ebss = ABSOLUTE(.);
 	} > AXI_SRAM
 
+	/* Emit the the D3 power domain section for locating BDMA data */
+
+	.sram4_reserve (NOLOAD) :
+	{
+		*(.sram4)
+		. = ALIGN(4);
+		_sram4_heap_start = ABSOLUTE(.);
+	} > SRAM4
+
 	/* Stabs debugging sections. */
 	.stab 0 : { *(.stab) }
 	.stabstr 0 : { *(.stabstr) }