From 3b2e3292bd883cdfcfff44589b430d3ec96adb90 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 6 Mar 2019 17:10:35 -0600
Subject: [PATCH] configs/open1788:  Re-arrange PROTECTED mode link map to make
 more space for large kernels with debug enabled.

---
 configs/open1788/kernel/lpc17_userspace.c |  4 ++--
 configs/open1788/knsh/defconfig           |  2 +-
 configs/open1788/knxterm/defconfig        |  2 +-
 configs/open1788/scripts/memory.ld        | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configs/open1788/kernel/lpc17_userspace.c b/configs/open1788/kernel/lpc17_userspace.c
index 37e0dfd3d6d..8747acba6fd 100644
--- a/configs/open1788/kernel/lpc17_userspace.c
+++ b/configs/open1788/kernel/lpc17_userspace.c
@@ -56,8 +56,8 @@
 #  error "CONFIG_NUTTX_USERSPACE not defined"
 #endif
 
-#if CONFIG_NUTTX_USERSPACE != 0x00010000
-#  error "CONFIG_NUTTX_USERSPACE must be 0x00010000 to match memory.ld"
+#if CONFIG_NUTTX_USERSPACE != 0x00040000
+#  error "CONFIG_NUTTX_USERSPACE must be 0x00040000 to match memory.ld"
 #endif
 
 /****************************************************************************
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index 714f46fbd0d..283be9733e2 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_NSH_DISABLE_LOSETUP=y
 CONFIG_NSH_DISABLE_MKRD=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NUTTX_USERSPACE=0x00010000
+CONFIG_NUTTX_USERSPACE=0x00040000
 CONFIG_PASS1_BUILDIR="configs/open1788/kernel"
 CONFIG_PIPES=y
 CONFIG_PREALLOC_MQ_MSGS=4
diff --git a/configs/open1788/knxterm/defconfig b/configs/open1788/knxterm/defconfig
index 399906db9c6..e29d38fa219 100644
--- a/configs/open1788/knxterm/defconfig
+++ b/configs/open1788/knxterm/defconfig
@@ -43,7 +43,7 @@ CONFIG_NFILE_STREAMS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_READLINE=y
-CONFIG_NUTTX_USERSPACE=0x00010000
+CONFIG_NUTTX_USERSPACE=0x00040000
 CONFIG_NX=y
 CONFIG_NXFONT_SANS28X37B=y
 CONFIG_NXTERM=y
diff --git a/configs/open1788/scripts/memory.ld b/configs/open1788/scripts/memory.ld
index 33f93a195ee..cfef33bffed 100644
--- a/configs/open1788/scripts/memory.ld
+++ b/configs/open1788/scripts/memory.ld
@@ -39,7 +39,7 @@
  * 0x20000000 bank0 first and 8KB at 0x20002000 at bank0 second. And 16KB
  * at 0x20004000 on bank1.
  *
- * For MPU support, the kernel-mode NuttX section is assumed to be 64KB of
+ * For MPU support, the kernel-mode NuttX section is assumed to be 128KB of
  * FLASH and 4KB of SRAM.  That, of course, can be optimized as needed (See
  * also configs/open1788/scripts/kernel-space.ld).
  *
@@ -80,15 +80,15 @@ MEMORY
 {
     /* 256Kb FLASH */
 
-    kflash (rx)      : ORIGIN = 0x00000000, LENGTH = 64K
-    uflash (rx)      : ORIGIN = 0x00010000, LENGTH = 64K
-    xflash (rx)      : ORIGIN = 0x00010000, LENGTH = 384K
+    kflash (rx)      : ORIGIN = 0x00000000, LENGTH = 128K
+    xflash (rx)      : ORIGIN = 0x00020000, LENGTH = 128K /* Wasted */
+    uflash (rx)      : ORIGIN = 0x00040000, LENGTH = 256K
 
     /* 64Kb of SRAM in the CPU block */
 
-    ksram (rwx)      : ORIGIN = 0x10000000, LENGTH = 4K
+    ksram (rwx)      : ORIGIN = 0x10000000, LENGTH = 4K   /* May include waste */
     usram (rwx)      : ORIGIN = 0x10001000, LENGTH = 4K
-    xsram (rwx)      : ORIGIN = 0x10001000, LENGTH = 56K
+    xsram (rwx)      : ORIGIN = 0x10002000, LENGTH = 24K  /* All used as heap */
 
     /* Other peripheral memory (free, nothing is linked here) */