From f121387812ced4c4e4423f64919e2d997aaea72d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Tue, 11 Jun 2019 12:01:47 -0400
Subject: [PATCH] [ion] LD configuration: change RAM spliting between bench and
 flasher to give more space to flasher

---
 ...ig20008000-20032000.ld => ramConfig20008000-20030000.ld} | 4 ++--
 .../shared/{ramConfig20032000.ld => ramConfig20030000.ld}   | 6 +++---
 scripts/targets.device.mak                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename ion/src/device/shared/{ramConfig20008000-20032000.ld => ramConfig20008000-20030000.ld} (81%)
 rename ion/src/device/shared/{ramConfig20032000.ld => ramConfig20030000.ld} (61%)

diff --git a/ion/src/device/shared/ramConfig20008000-20032000.ld b/ion/src/device/shared/ramConfig20008000-20030000.ld
similarity index 81%
rename from ion/src/device/shared/ramConfig20008000-20032000.ld
rename to ion/src/device/shared/ramConfig20008000-20030000.ld
index e16a1e534..96b83cc31 100644
--- a/ion/src/device/shared/ramConfig20008000-20032000.ld
+++ b/ion/src/device/shared/ramConfig20008000-20030000.ld
@@ -1,6 +1,6 @@
-/* Config file for a ram binary linked at address 0x20008000, up to 0x20032000.
+/* Config file for a ram binary linked at address 0x20008000, up to 0x20030000.
  * This is used to build benchRAM. In what is left of the device's RAM, we might
  * put a flasher. */
 
 CONFIG_OFFSET = 0x0;
-CONFIG_LENGTH = 200K - 32K;
+CONFIG_LENGTH = 192K - 32K;
diff --git a/ion/src/device/shared/ramConfig20032000.ld b/ion/src/device/shared/ramConfig20030000.ld
similarity index 61%
rename from ion/src/device/shared/ramConfig20032000.ld
rename to ion/src/device/shared/ramConfig20030000.ld
index f5b922cbb..eeadc61e3 100644
--- a/ion/src/device/shared/ramConfig20032000.ld
+++ b/ion/src/device/shared/ramConfig20030000.ld
@@ -1,6 +1,6 @@
 /* Config file for a ram binary linked at address 0x20032000, taking all the RAM
  * space available. It is used to build flasher that can write both in flash and
- * in RAM up to the address 0x20032000. */
+ * in RAM up to the address 0x20030000. */
 
-CONFIG_OFFSET = 200K - 32K;
-CONFIG_LENGTH = 256K - 200K;
+CONFIG_OFFSET = 192K - 32K;
+CONFIG_LENGTH = 256K - 192K;
diff --git a/scripts/targets.device.mak b/scripts/targets.device.mak
index 2782afea8..57170dffe 100644
--- a/scripts/targets.device.mak
+++ b/scripts/targets.device.mak
@@ -55,7 +55,7 @@ openocd:
 ifeq ($(EPSILON_USB_DFU_XIP)$(EPSILON_DEVICE_BENCH),10)
 $(BUILD_DIR)/ion/src/$(PLATFORM)/shared/usb/flasher.o: SFLAGS += $(ION_DEVICE_SFLAGS)
 $(BUILD_DIR)/flasher.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/shared/ram.ld
-$(BUILD_DIR)/flasher.$(EXE): LDFLAGS += -Wl,ion/src/$(PLATFORM)/shared/ramConfig20032000.ld
+$(BUILD_DIR)/flasher.$(EXE): LDFLAGS += -Wl,ion/src/$(PLATFORM)/shared/ramConfig20030000.ld
 $(BUILD_DIR)/flasher.$(EXE): $(objs) $(BUILD_DIR)/ion/src/$(PLATFORM)/shared/usb/flasher.o
 else
 $(BUILD_DIR)/flasher.$(EXE):
@@ -65,7 +65,7 @@ endif
 #TODO Do not build all apps... Put elsewhere?
 ifeq ($(EPSILON_USB_DFU_XIP)$(EPSILON_DEVICE_BENCH),11)
 $(BUILD_DIR)/benchRAM.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/shared/ram.ld
-$(BUILD_DIR)/benchRAM.$(EXE): LDFLAGS += -Wl,ion/src/$(PLATFORM)/shared/ramConfig20008000-20032000.ld
+$(BUILD_DIR)/benchRAM.$(EXE): LDFLAGS += -Wl,ion/src/$(PLATFORM)/shared/ramConfig20008000-20030000.ld
 $(BUILD_DIR)/benchRAM.$(EXE): $(objs) $(call object_for,$(bench_src))
 else
 $(BUILD_DIR)/benchRAM.$(EXE):