diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt
index 175209b93c9..bb26a74408f 100755
--- a/configs/stm3210e-eval/README.txt
+++ b/configs/stm3210e-eval/README.txt
@@ -141,7 +141,7 @@ STM3210E-EVAL-specific Configuration Options
 	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
 	   chip:
 
-	   CONFIG_ARCH_CHIP_STM32F103Z
+	   CONFIG_ARCH_CHIP_STM32F103ZET6
 
 	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
 	   hence, the board that supports the particular chip or SoC.
diff --git a/configs/stm3210e-eval/ostest/defconfig b/configs/stm3210e-eval/ostest/defconfig
index 4967174111a..c55c11329a3 100755
--- a/configs/stm3210e-eval/ostest/defconfig
+++ b/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
@@ -86,6 +86,13 @@ CONFIG_ARCH_BOOTLOADER=n
 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
 #
diff --git a/configs/stm3210e-eval/ostest/ld.script b/configs/stm3210e-eval/ostest/ld.script
index 59a673c0480..fd0014c2099 100755
--- a/configs/stm3210e-eval/ostest/ld.script
+++ b/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
 }
 
diff --git a/configs/stm3210e-eval/src/up_boot.c b/configs/stm3210e-eval/src/up_boot.c
index 9807f56861b..cfc02062da3 100755
--- a/configs/stm3210e-eval/src/up_boot.c
+++ b/configs/stm3210e-eval/src/up_boot.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "stm3210e_internal.h"
+#include "stm3210e-internal.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm3210e-eval/src/up_leds.c b/configs/stm3210e-eval/src/up_leds.c
index 175dfabff6e..c40953b41db 100755
--- a/configs/stm3210e-eval/src/up_leds.c
+++ b/configs/stm3210e-eval/src/up_leds.c
@@ -49,7 +49,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "stm32_internal.h"
-#include "stm3210e_internal.h"
+#include "stm3210e-internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/configs/stm3210e-eval/src/up_spi.c b/configs/stm3210e-eval/src/up_spi.c
index 8599eff2b73..852c4faec13 100755
--- a/configs/stm3210e-eval/src/up_spi.c
+++ b/configs/stm3210e-eval/src/up_spi.c
@@ -49,7 +49,7 @@
 #include "up_arch.h"
 #include "chip.h"
 #include "stm32_internal.h"
-#include "stm3210e_internal.h"
+#include "stm3210e-internal.h"
 
 #if !defined(CONFIG_SPI1_DISABLE) || !defined(CONFIG_SPI2_DISABLE)