From e2cdc8384c68cea178b0e585bb4467dae454b449 Mon Sep 17 00:00:00 2001
From: batt <batt@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Wed, 26 May 2010 17:16:00 +0000
Subject: [PATCH] Rename to correct CPU part number.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3849 38d2e660-2303-0410-9eaa-f027e97ec537
---
 bertos/cpu/attr.h                                      |  3 ++-
 .../info/{STM32P103.cdef => STM32F103R8.cdef}          |  4 ++--
 .../scripts/{stm32p103_rom.ld => stm32f103r8_rom.ld}   |  2 +-
 bertos/cpu/detect.h                                    | 10 +++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename bertos/cpu/cortex-m3/info/{STM32P103.cdef => STM32F103R8.cdef} (95%)
 rename bertos/cpu/cortex-m3/scripts/{stm32p103_rom.ld => stm32f103r8_rom.ld} (98%)

diff --git a/bertos/cpu/attr.h b/bertos/cpu/attr.h
index 185da4cc..9840f0f9 100644
--- a/bertos/cpu/attr.h
+++ b/bertos/cpu/attr.h
@@ -1,3 +1,4 @@
+advanced = True
 /**
  * \file
  * <!--
@@ -171,7 +172,7 @@
 	#define CPU_HARVARD            0
 
 	/// Valid pointers should be >= than this value (used for debug)
-	#if (CPU_CM3_LM3S1968 || CPU_CM3_LM3S8962 || CPU_CM3_STM32P103)
+	#if (CPU_CM3_LM3S1968 || CPU_CM3_LM3S8962 || CPU_CM3_STM32F103R8)
 		#define CPU_RAM_START 0x20000000
 	#else
 		#warning Fix CPU_RAM_START address for your Cortex-M3, default value set to 0x200
diff --git a/bertos/cpu/cortex-m3/info/STM32P103.cdef b/bertos/cpu/cortex-m3/info/STM32F103R8.cdef
similarity index 95%
rename from bertos/cpu/cortex-m3/info/STM32P103.cdef
rename to bertos/cpu/cortex-m3/info/STM32F103R8.cdef
index 0ff1ecc7..857632b2 100644
--- a/bertos/cpu/cortex-m3/info/STM32P103.cdef
+++ b/bertos/cpu/cortex-m3/info/STM32F103R8.cdef
@@ -61,5 +61,5 @@ CPU_DESC += [ "128 Kbytes on-chip flash memory",
 		"20 Kbytes on-chip SRAM memory" ]
 
 # GCC flags for this cpu.
-MK_CPU_CPPFLAGS += " -D__ARM_STM32P103__"
-MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "stm32p103_rom.ld"
+MK_CPU_CPPFLAGS += " -D__ARM_STM32F103R8__"
+MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "stm32f103r8_rom.ld"
diff --git a/bertos/cpu/cortex-m3/scripts/stm32p103_rom.ld b/bertos/cpu/cortex-m3/scripts/stm32f103r8_rom.ld
similarity index 98%
rename from bertos/cpu/cortex-m3/scripts/stm32p103_rom.ld
rename to bertos/cpu/cortex-m3/scripts/stm32f103r8_rom.ld
index 60548cb8..522a8428 100644
--- a/bertos/cpu/cortex-m3/scripts/stm32p103_rom.ld
+++ b/bertos/cpu/cortex-m3/scripts/stm32f103r8_rom.ld
@@ -41,7 +41,7 @@ OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 
 /*
- * Define memory configuration for LM3S1968 board
+ * Define memory configuration for STM32F103R8 
  */
 MEMORY
 {
diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index 7e9c2319..8e1a69fa 100644
--- a/bertos/cpu/detect.h
+++ b/bertos/cpu/detect.h
@@ -192,11 +192,11 @@
 		#define CPU_CM3_LM3S8962    0
 	#endif
 
-	#if defined (__ARM_STM32P103__)
+	#if defined (__ARM_STM32F103R8__)
 		#define CPU_CM3_STM32       1
-		#define CPU_CM3_STM32P103   1
+		#define CPU_CM3_STM32F103R8 1
 	#else
-		#define CPU_CM3_STM32P103   0
+		#define CPU_CM3_STM32F103R8 0
 	#endif
 
 	#if defined (CPU_CM3_LM3S)
@@ -205,7 +205,7 @@
 		#endif
 		#define CPU_CM3_STM32       0
 	#elif defined (CPU_CM3_STM32)
-		#if CPU_CM3_STM32P103 + 0 != 1
+		#if CPU_CM3_STM32F103R8 + 0 != 1
 			#error STM32 Cortex-M3 CPU configuration error
 		#endif
 		#define CPU_CM3_LM3S        0
@@ -231,7 +231,7 @@
 
 	#define CPU_CM3_STM32 0
 
-	#define CPU_CM3_STM32P103 0
+	#define CPU_CM3_STM32F103R8 0
 #endif
 
 #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
-- 
2.25.1