5 files changed, 25 insertions, 8 deletions
diff --git a/support/ld/flash.ld b/support/ld/flash.ld
index 2043649..d05aa6c 100644
--- a/support/ld/flash.ld
+++ b/support/ld/flash.ld
@@ -26,7 +26,11 @@
 MEMORY
 {
   ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 17K
-  rom (rx) : ORIGIN = 0x08005000, LENGTH = 108K
+  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 3823f4d..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 = 20K
-  rom (rx) : ORIGIN = 0x08000000, LENGTH = 120K
+  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 59aaeda..b9dd4ee 100644
--- a/support/ld/ram.ld
+++ b/support/ld/ram.ld
@@ -26,7 +26,11 @@
 MEMORY
 {
   ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 17K
-  rom (rx) : ORIGIN = 0x00000000, LENGTH = 0K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 0K
+/* native
+  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 0K
+*/
 }
 
 
diff --git a/support/make/build-targets.mk b/support/make/build-targets.mk
index 01097a7..448b1ee 100644
--- a/support/make/build-targets.mk
+++ b/support/make/build-targets.mk
@@ -15,7 +15,7 @@ $(BUILD_PATH)/$(BOARD).bin: $(BUILD_PATH)/$(BOARD).elf
 	@echo " "
 	@echo "Final Size:"
 	@$(SIZE) $<
-	@echo $(MAPLE_TARGET) > $(BUILD_PATH)/build-type
+	@echo $(MEMORY_TARGET) > $(BUILD_PATH)/build-type
 
 $(BUILDDIRS):
 	@mkdir -p $@
@@ -24,8 +24,9 @@ MSG_INFO:
 	@echo "================================================================================"
 	@echo ""
 	@echo "  Build info:"
-	@echo "     BOARD:" $(BOARD)
-	@echo "     MAPLE_TARGET:" $(MAPLE_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 eceac32..41c6532 100644
--- a/support/openocd/flash.cfg
+++ b/support/openocd/flash.cfg
@@ -63,14 +63,18 @@ 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
 
 proc flash_chip {} {
     echo "Halting..."
     halt
-    echo "Erasing 128KB..."
+    echo "Erasing..."
     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..."