Fixes for compile

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

2 files changed, 12 insertions, 4 deletions

diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig
index 496717411..c55c11329 100755
--- a/nuttx/configs/stm3210e-eval/ostest/defconfig
+++ b/nuttx/configs/stm3210e-eval/ostest/defconfig
@@ -71,8 +71,8 @@ CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP=stm32
-CONFIG_ARCH_CHIP_STM32F103Z=y
-CONFIG_ARCH_BOARD=stm3210e_eval
+CONFIG_ARCH_CHIP_STM32F103ZET6=y
+CONFIG_ARCH_BOARD=stm3210e-eval
 CONFIG_ARCH_BOARD_STM3210E_EVAL=y
 CONFIG_BOARD_LOOPSPERMSEC=4531
 CONFIG_DRAM_SIZE=0x00010000
@@ -87,6 +87,13 @@ CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_CALIBRATION=n
 
 #
+# Identify toolchain
+CONFIG_STM32_CODESOURCERY=n
+CONFIG_STM32_DEVKITARM=n
+CONFIG_STM32_RAISONANCE=n
+CONFIG_STM32_BUILDROOT=y
+
+#
 # STM32F103Z specific serial device driver settings
 #
 # CONFIG_UARTn_DISABLE - select to disable all support for
diff --git a/nuttx/configs/stm3210e-eval/ostest/ld.script b/nuttx/configs/stm3210e-eval/ostest/ld.script
index 59a673c04..fd0014c20 100755
--- a/nuttx/configs/stm3210e-eval/ostest/ld.script
+++ b/nuttx/configs/stm3210e-eval/ostest/ld.script
@@ -33,11 +33,12 @@
  *
  ****************************************************************************/
 
-/* The STM32F103Z has S56Kb of FLASH beginning at address 0x0000:0000 */
+/* The STM32F103ZET6 has 512Kb of FLASH beginning at address 0x0800:0000 and
+ * 64Kb of FLASH beginning at 0x2000:0000*/
 
 MEMORY
 {
-    flash (rx) : ORIGIN = 0x00000000, LENGTH = 256K
+    flash (rx) : ORIGIN = 0x08000000, LENGTH = 256K
     sram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
 }