From 0ccec95446d4c7f3ea47a46d267c791fb22bb8d4 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Tue, 31 Aug 2010 22:05:39 -0400
Subject: Portability fixes

Still not working but fixed a lot of merge errors
---
 support/ld/flash.ld           | 4 ++++
 support/ld/jtag.ld            | 8 ++++++--
 support/ld/ram.ld             | 6 +++++-
 support/make/build-targets.mk | 5 +++--
 support/openocd/flash.cfg     | 6 +++++-
 5 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'support')

diff --git a/support/ld/flash.ld b/support/ld/flash.ld
index 7e1e453..d05aa6c 100644
--- a/support/ld/flash.ld
+++ b/support/ld/flash.ld
@@ -25,8 +25,12 @@
 /* Define memory spaces. */
 MEMORY
 {
+  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 17K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 108K
+/* native
   ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
   rom (rx)  : ORIGIN = 0x08005000, LENGTH = 500K
+*/
 }
 
 OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
diff --git a/support/ld/jtag.ld b/support/ld/jtag.ld
index 890f18a..2ba3ce6 100644
--- a/support/ld/jtag.ld
+++ b/support/ld/jtag.ld
@@ -8,8 +8,12 @@
 /* Define memory spaces. */
 MEMORY
 {
-  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
-  rom (rx) : ORIGIN = 0x08000000, LENGTH = 512K
+  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 17K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 108K
+/* native
+  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 500K
+*/
 }
 
 OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
diff --git a/support/ld/ram.ld b/support/ld/ram.ld
index 168c1da..b9dd4ee 100644
--- a/support/ld/ram.ld
+++ b/support/ld/ram.ld
@@ -25,8 +25,12 @@
 /* Define memory spaces. */
 MEMORY
 {
+  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 17K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 0K
+/* native
   ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
-  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 512K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 0K
+*/
 }
 
 
diff --git a/support/make/build-targets.mk b/support/make/build-targets.mk
index 083976a..448b1ee 100644
--- a/support/make/build-targets.mk
+++ b/support/make/build-targets.mk
@@ -24,8 +24,9 @@ MSG_INFO:
 	@echo "================================================================================"
 	@echo ""
 	@echo "  Build info:"
-	@echo "     BOARD:" $(BOARD)
-	@echo "     MEMORY_TARGET:" $(MEMORY_TARGET)
+	@echo "     BOARD:          " $(BOARD)
+	@echo "     MCU:            " $(MCU)
+	@echo "     MEMORY_TARGET:  " $(MEMORY_TARGET)
 	@echo ""
 	@echo "  See 'make help' for all possible targets"
 	@echo ""
diff --git a/support/openocd/flash.cfg b/support/openocd/flash.cfg
index 25fe23f..fcd9561 100644
--- a/support/openocd/flash.cfg
+++ b/support/openocd/flash.cfg
@@ -62,6 +62,8 @@ jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
 set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME
 
+$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x5000 -work-area-backup 0
+# TODO: native
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x10000 -work-area-backup 0
 
 flash bank stm32x 0x08000000 0x00020000 0 0 $_TARGETNAME
@@ -70,7 +72,9 @@ proc flash_chip {} {
     echo "Halting..."
     halt
     echo "Erasing..."
-    flash erase_address 0x08000000 0x80000
+    flash erase_address 0x08000000 0x20000
+    # TODO: native
+    #flash erase_address 0x08000000 0x80000
     echo "Flashing image..."
     flash write_bank 0 build/maple.bin 0
     echo "Verifying image..."
-- 
cgit v1.2.3