From b7daab00fae8117ef4d1f63848874c1bedc68c01 Mon Sep 17 00:00:00 2001 From: batt Date: Thu, 27 May 2010 14:05:01 +0000 Subject: [PATCH] Rename to correct CPU name. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3858 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/attr.h | 2 +- .../info/{STM32F103R8.cdef => STM32F103RB.cdef} | 4 ++-- .../scripts/{stm32f103r8_rom.ld => stm32f103rb_rom.ld} | 0 bertos/cpu/detect.h | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) rename bertos/cpu/cortex-m3/info/{STM32F103R8.cdef => STM32F103RB.cdef} (95%) rename bertos/cpu/cortex-m3/scripts/{stm32f103r8_rom.ld => stm32f103rb_rom.ld} (100%) diff --git a/bertos/cpu/attr.h b/bertos/cpu/attr.h index 65129b57..da3e08bc 100644 --- a/bertos/cpu/attr.h +++ b/bertos/cpu/attr.h @@ -171,7 +171,7 @@ #define CPU_HARVARD 0 /// Valid pointers should be >= than this value (used for debug) - #if (CPU_CM3_LM3S1968 || CPU_CM3_LM3S8962 || CPU_CM3_STM32F103R8) + #if (CPU_CM3_LM3S1968 || CPU_CM3_LM3S8962 || CPU_CM3_STM32F103RB) #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/STM32F103R8.cdef b/bertos/cpu/cortex-m3/info/STM32F103RB.cdef similarity index 95% rename from bertos/cpu/cortex-m3/info/STM32F103R8.cdef rename to bertos/cpu/cortex-m3/info/STM32F103RB.cdef index 857632b2..add4cea6 100644 --- a/bertos/cpu/cortex-m3/info/STM32F103R8.cdef +++ b/bertos/cpu/cortex-m3/info/STM32F103RB.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_STM32F103R8__" -MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "stm32f103r8_rom.ld" +MK_CPU_CPPFLAGS += " -D__ARM_STM32F103RB__" +MK_CPU_LDFLAGS += " -T " + SCRIPT_DIR + "stm32f103rb_rom.ld" diff --git a/bertos/cpu/cortex-m3/scripts/stm32f103r8_rom.ld b/bertos/cpu/cortex-m3/scripts/stm32f103rb_rom.ld similarity index 100% rename from bertos/cpu/cortex-m3/scripts/stm32f103r8_rom.ld rename to bertos/cpu/cortex-m3/scripts/stm32f103rb_rom.ld diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h index 8e1a69fa..33f6178c 100644 --- a/bertos/cpu/detect.h +++ b/bertos/cpu/detect.h @@ -192,11 +192,11 @@ #define CPU_CM3_LM3S8962 0 #endif - #if defined (__ARM_STM32F103R8__) + #if defined (__ARM_STM32F103RB__) #define CPU_CM3_STM32 1 - #define CPU_CM3_STM32F103R8 1 + #define CPU_CM3_STM32F103RB 1 #else - #define CPU_CM3_STM32F103R8 0 + #define CPU_CM3_STM32F103RB 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_STM32F103R8 + 0 != 1 + #if CPU_CM3_STM32F103RB + 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_STM32F103R8 0 + #define CPU_CM3_STM32F103RB 0 #endif #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \ -- 2.25.1