Misc setup changes

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2109 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 15 insertions, 4 deletions

diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt
index 51e86d619..01f9173cd 100755
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@@ -118,6 +118,15 @@ NuttX buildroot Toolchain
   detailed PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+DFU
+^^^
+
+  The linker files in these projects assume that you will be loading code
+  using STMicro built in USB DFU loader.  In this case, the code will not
+  be positioned at the beginning of FLASH (0x80000000) but will be offset
+  to 0x08030000.  If you need to change that origin, you will need to
+  edit the file(s) ld.script for each configuration.
+
 STM3210E-EVAL-specific Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig
index d73d0d983..0a71545ca 100755
--- a/nuttx/configs/stm3210e-eval/ostest/defconfig
+++ b/nuttx/configs/stm3210e-eval/ostest/defconfig
@@ -214,9 +214,9 @@ CONFIG_SSI_POLLWAIT=y
 # CONFIG_HAVE_LIBM - toolchain supports libm.a
 #
 CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=n
+CONFIG_INTELHEX_BINARY=y
 CONFIG_MOTOROLA_SREC=n
-CONFIG_RAW_BINARY=y
+CONFIG_RAW_BINARY=n
 CONFIG_HAVE_LIBM=n
 
 #
diff --git a/nuttx/configs/stm3210e-eval/ostest/ld.script b/nuttx/configs/stm3210e-eval/ostest/ld.script
index 0e318f7cc..15db8dd0d 100755
--- a/nuttx/configs/stm3210e-eval/ostest/ld.script
+++ b/nuttx/configs/stm3210e-eval/ostest/ld.script
@@ -34,12 +34,14 @@
  ****************************************************************************/
 
 /* The STM32F103ZET6 has 512Kb of FLASH beginning at address 0x0800:0000 and
- * 64Kb of SRAM beginning at address 0x2000:0000
+ * 64Kb of SRAM beginning at address 0x2000:0000.  Here we assume that the
+ * STM3210E-EVAL's DFU bootloader is being used.  In that case, the corrct
+ * load .text load address is 0x08030000 (leaving 320Kb).
  */
 
 MEMORY
 {
-    flash (rx) : ORIGIN = 0x08000000, LENGTH = 512K
+    flash (rx) : ORIGIN = 0x08030000, LENGTH = 320K
     sram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
 }