Refs #145. Refactoring: ARMCM4_STM32 renamed to ARMCM4_STM32F4.

git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@168 5dc33758-31d5-4daf-9ae8-b24bf3d40d73

Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_Crossworks/Boot/blt_conf.h

@@ -1,7 +1,7 @@
 /************************************************************************************//**
-* \file         Demo\ARMCM4_STM32_Olimex_STM32E407_Crossworks\Boot\blt_conf.h
+* \file         Demo\ARMCM4_STM32F4_Olimex_STM32E407_Crossworks\Boot\blt_conf.h
 * \brief        Bootloader configuration header file.
-* \ingroup      Boot_ARMCM4_STM32_Olimex_STM32E407_Crossworks
+* \ingroup      Boot_ARMCM4_STM32F4_Olimex_STM32E407_Crossworks
 * \internal
 *----------------------------------------------------------------------------------------
 *                          C O P Y R I G H T

Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_Crossworks/Boot/boot.dox

@@ -0,0 +1,7 @@
+/**
+\defgroup   Boot_ARMCM4_STM32F4_Olimex_STM32E407_Crossworks Bootloader
+\brief      Bootloader. 
+\ingroup    ARMCM4_STM32F4_Olimex_STM32E407_Crossworks
+*/
+
+

Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_Crossworks/Boot/hooks.c

@@ -1,7 +1,7 @@
 /************************************************************************************//**
-* \file         Demo\ARMCM4_STM32_Olimex_STM32E407_Crossworks\Boot\hooks.c
+* \file         Demo\ARMCM4_STM32F4_Olimex_STM32E407_Crossworks\Boot\hooks.c
 * \brief        Bootloader callback source file.
-* \ingroup      Boot_ARMCM4_STM32_Olimex_STM32E407_Crossworks
+* \ingroup      Boot_ARMCM4_STM32F4_Olimex_STM32E407_Crossworks
 * \internal
 *----------------------------------------------------------------------------------------
 *                          C O P Y R I G H T

Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_Crossworks/Boot/ide/stm32f407_crossworks.hzp

@@ -1,7 +1,7 @@
 <!DOCTYPE CrossStudio_Project_File>
 <solution Name="stm32f407_crossworks" target="8" version="2">
   <project Name="openbtl_olimex_stm32e407">
-    <configuration Name="Common" Placement="Flash" Target="STM32F407ZG" arm_architecture="v7EM" arm_core_type="Cortex-M4" arm_fp_abi="Soft" arm_fpu_type="FPv4-SP-D16" arm_gcc_target="arm-unknown-eabi" arm_keep_assembly="No" arm_linker_heap_size="128" arm_linker_jtag_pad_pre_dr="1" arm_linker_jtag_pad_pre_ir="5" arm_linker_process_stack_size="0" arm_linker_stack_size="128" arm_long_calls="No" arm_simulator_memory_simulation_filename="$(TargetsDir)/STM32/STM32SimulatorMemory.dll" arm_simulator_memory_simulation_parameter="STM32F407ZG;0x100000;0x20000" arm_target_debug_interface_type="ADIv5" arm_target_interface_type="Default" arm_target_loader_applicable_loaders="Flash" arm_target_loader_default_loader="Flash" arm_target_loader_parameter="8000000" arm_use_gcc_libraries="Yes" build_intermediate_directory="$(Configuration)/../../obj" build_output_directory="$(ProjectDir)/../bin" c_only_additional_options="-I./..;-I./../lib/ethernetlib/inc;-I./../lib/ethernetlib/src;-I./../lib/uip;-I./../lib/stdperiphlib;-I./../lib/stdperiphlib/CMSIS/Device/ST/STM32F4xx/Include;-I./../lib/stdperiphlib/CMSIS/Include;-I./../lib/fatfs;-I./../lib/stdperiphlib/STM32F4xx_StdPeriph_Driver/inc;-I./../lib/usbdevicelib/Core/inc;-I./../lib/usbdevicelib/Core/src;-I./../lib/usbotgdriver/inc;-I./../lib/usbotgdriver/src;-I./../../../../Source;-I./../../../../Source/ARMCM4_STM32;-I./../../../../Source/third_party/fatfs/src;-I./../../../../Source/third_party/uip/uip" c_preprocessor_definitions="USE_STDPERIPH_DRIVER;USE_USB_OTG_FS;HSE_VALUE=12000000;VECT_TAB_FLASH" c_user_include_directories="$(TargetsDir)/STM32/include" gcc_optimization_level="Level 2" link_IOLibraryName="target" link_include_standard_libraries="Yes" linker_keep_symbols="_vectors;EntryFromProg" linker_memory_map_file="$(TargetsDir)/STM32/STM32F407ZG_MemoryMap.xml" linker_output_format="srec" linker_printf_enabled="No" linker_printf_width_precision_supported="No" linker_scanf_enabled="No" linker_section_placement_file="$(StudioDir)/targets/Cortex_M/flash_placement.xml" oscillator_frequency="8MHz" project_directory="" project_type="Executable" property_groups_file_path="$(TargetsDir)/STM32/propertyGroups.xml" target_get_partname_script="GetPartName()" target_match_partname_script="MatchPartName(&quot;$(Target)&quot;)" target_reset_script="Reset()"/>
+    <configuration Name="Common" Placement="Flash" Target="STM32F407ZG" arm_architecture="v7EM" arm_core_type="Cortex-M4" arm_fp_abi="Soft" arm_fpu_type="FPv4-SP-D16" arm_gcc_target="arm-unknown-eabi" arm_keep_assembly="No" arm_linker_heap_size="128" arm_linker_jtag_pad_pre_dr="1" arm_linker_jtag_pad_pre_ir="5" arm_linker_process_stack_size="0" arm_linker_stack_size="128" arm_long_calls="No" arm_simulator_memory_simulation_filename="$(TargetsDir)/STM32/STM32SimulatorMemory.dll" arm_simulator_memory_simulation_parameter="STM32F407ZG;0x100000;0x20000" arm_target_debug_interface_type="ADIv5" arm_target_interface_type="Default" arm_target_loader_applicable_loaders="Flash" arm_target_loader_default_loader="Flash" arm_target_loader_parameter="8000000" arm_use_gcc_libraries="Yes" build_intermediate_directory="$(Configuration)/../../obj" build_output_directory="$(ProjectDir)/../bin" c_only_additional_options="-I./..;-I./../lib/ethernetlib/inc;-I./../lib/ethernetlib/src;-I./../lib/uip;-I./../lib/stdperiphlib;-I./../lib/stdperiphlib/CMSIS/Device/ST/STM32F4xx/Include;-I./../lib/stdperiphlib/CMSIS/Include;-I./../lib/fatfs;-I./../lib/stdperiphlib/STM32F4xx_StdPeriph_Driver/inc;-I./../lib/usbdevicelib/Core/inc;-I./../lib/usbdevicelib/Core/src;-I./../lib/usbotgdriver/inc;-I./../lib/usbotgdriver/src;-I./../../../../Source;-I./../../../../Source/ARMCM4_STM32F4;-I./../../../../Source/third_party/fatfs/src;-I./../../../../Source/third_party/uip/uip" c_preprocessor_definitions="USE_STDPERIPH_DRIVER;USE_USB_OTG_FS;HSE_VALUE=12000000;VECT_TAB_FLASH" c_user_include_directories="$(TargetsDir)/STM32/include" gcc_optimization_level="Level 2" link_IOLibraryName="target" link_include_standard_libraries="Yes" linker_keep_symbols="_vectors;EntryFromProg" linker_memory_map_file="$(TargetsDir)/STM32/STM32F407ZG_MemoryMap.xml" linker_output_format="srec" linker_printf_enabled="No" linker_printf_width_precision_supported="No" linker_scanf_enabled="No" linker_section_placement_file="$(StudioDir)/targets/Cortex_M/flash_placement.xml" oscillator_frequency="8MHz" project_directory="" project_type="Executable" property_groups_file_path="$(TargetsDir)/STM32/propertyGroups.xml" target_get_partname_script="GetPartName()" target_match_partname_script="MatchPartName(&quot;$(Target)&quot;)" target_reset_script="Reset()"/>
     <configuration Name="Flash" arm_target_flash_loader_file_path="$(TargetsDir)/STM32/Release/STM32F2xx_Loader_rpc.elf" arm_target_flash_loader_type="LIBMEM RPC Loader" arm_target_loader_can_erase_all="Yes" arm_target_loader_can_lock_all="No" arm_target_loader_can_lock_range="No" arm_target_loader_can_unlock_all="No" arm_target_loader_can_unlock_range="No" target_reset_script="FLASHReset()"/>
     <folder Name="Source Files">
       <configuration Name="Common" filter="c;cpp;cxx;cc;h;s;asm;inc"/>
@@ -124,21 +124,21 @@
         </folder>
       </folder>
       <folder Name="Source" file_name="">
-        <folder Name="ARMCM4_STM32" file_name="">
+        <folder Name="ARMCM4_STM32F4" file_name="">
           <folder Name="Crossworks" file_name="">
-            <file file_name="../../../../Source/ARMCM4_STM32/Crossworks/cstart.s"/>
+            <file file_name="../../../../Source/ARMCM4_STM32F4/Crossworks/cpu_comp.c"/>
-            <file file_name="../../../../Source/ARMCM4_STM32/Crossworks/vectors.c"/>
+            <file file_name="../../../../Source/ARMCM4_STM32F4/Crossworks/cstart.s"/>
-            <file file_name="../../../../Source/ARMCM4_STM32/Crossworks/cpu_comp.c"/>
+            <file file_name="../../../../Source/ARMCM4_STM32F4/Crossworks/vectors.c"/>
           </folder>
-          <file file_name="../../../../Source/ARMCM4_STM32/cpu.c"/>
+          <file file_name="../../../../Source/ARMCM4_STM32F4/can.c"/>
-          <file file_name="../../../../Source/ARMCM4_STM32/flash.c"/>
+          <file file_name="../../../../Source/ARMCM4_STM32F4/cpu.c"/>
-          <file file_name="../../../../Source/ARMCM4_STM32/flash.h"/>
+          <file file_name="../../../../Source/ARMCM4_STM32F4/flash.c"/>
-          <file file_name="../../../../Source/ARMCM4_STM32/nvm.c"/>
+          <file file_name="../../../../Source/ARMCM4_STM32F4/flash.h"/>
-          <file file_name="../../../../Source/ARMCM4_STM32/timer.c"/>
+          <file file_name="../../../../Source/ARMCM4_STM32F4/nvm.c"/>
-          <file file_name="../../../../Source/ARMCM4_STM32/types.h"/>
+          <file file_name="../../../../Source/ARMCM4_STM32F4/timer.c"/>
-          <file file_name="../../../../Source/ARMCM4_STM32/uart.c"/>
+          <file file_name="../../../../Source/ARMCM4_STM32F4/types.h"/>
-          <file file_name="../../../../Source/ARMCM4_STM32/can.c"/>
+          <file file_name="../../../../Source/ARMCM4_STM32F4/uart.c"/>
-          <file file_name="../../../../Source/ARMCM4_STM32/usb.c"/>
+          <file file_name="../../../../Source/ARMCM4_STM32F4/usb.c"/>
         </folder>
         <file file_name="../../../../Source/assert.c"/>
         <file file_name="../../../../Source/assert.h"/>
@@ -200,7 +200,7 @@
       <file file_name="$(TargetsDir)/STM32/STM32_Target.js">
         <configuration Name="Common" file_type="Reset Script"/>
       </file>
-      <file file_name="../../../../Source/ARMCM4_STM32/Crossworks/memory.x">
+      <file file_name="../../../../Source/ARMCM4_STM32F4/Crossworks/memory.x">
         <configuration Name="Common" file_type="Linker Script"/>
       </file>
     </folder>

Target/Demo/ARMCM4_STM32F4_Olimex_STM32E407_Crossworks/Boot/ide/stm32f407_crossworks.hzs

@@ -25,9 +25,7 @@
   <ProjectSessionItem path="stm32f407_crossworks;openbtl_olimex_stm32e407;Source Files" name="unnamed" />
   <ProjectSessionItem path="stm32f407_crossworks;openbtl_olimex_stm32e407;Source Files;Demo" name="unnamed" />
   <ProjectSessionItem path="stm32f407_crossworks;openbtl_olimex_stm32e407;Source Files;Demo;Boot" name="unnamed" />
-  <ProjectSessionItem path="stm32f407_crossworks;openbtl_olimex_stm32e407;Source Files;Source" name="unnamed" />
+  <ProjectSessionItem path="stm32f407_crossworks;openbtl_olimex_stm32e407;System Files" name="unnamed" />
-  <ProjectSessionItem path="stm32f407_crossworks;openbtl_olimex_stm32e407;Source Files;Source;ARMCM4_STM32" name="unnamed" />
-  <ProjectSessionItem path="stm32f407_crossworks;openbtl_olimex_stm32e407;Source Files;Source;ARMCM4_STM32;Crossworks" name="unnamed" />
  </Project>
  <Register1>
   <RegisterWindow openNodes="CPU" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="CPU" decimalNodes="" octalNodes="" asciiNodes="" name="openbtl_olimex_stm32e407" />
@@ -66,8 +64,7 @@
   <Watches active="0" update="Never" />
  </Watch4>
  <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Work\software\OpenBLT\Target\Demo\ARMCM4_STM32_Olimex_STM32E407_Crossworks\Boot\main.c" y="62" path="C:\Work\software\OpenBLT\Target\Demo\ARMCM4_STM32_Olimex_STM32E407_Crossworks\Boot\main.c" left="0" selected="1" name="unnamed" top="49" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Work\software\OpenBLT\Target\Demo\ARMCM4_STM32F4_Olimex_STM32E407_Crossworks\Boot\main.c" y="0" path="C:\Work\software\OpenBLT\Target\Demo\ARMCM4_STM32F4_Olimex_STM32E407_Crossworks\Boot\main.c" left="18" selected="1" name="unnamed" top="0" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Work\software\OpenBLT\Target\Demo\ARMCM4_STM32_Olimex_STM32E407_Crossworks\Boot\blt_conf.h" y="186" path="C:\Work\software\OpenBLT\Target\Demo\ARMCM4_STM32_Olimex_STM32E407_Crossworks\Boot\blt_conf.h" left="0" selected="0" name="unnamed" top="186" />
  </Files>
- <ARMCrossStudioWindow activeProject="openbtl_olimex_stm32e407" autoConnectTarget="SEGGER J-Link" debugSearchFileMap="" fileDialogInitialDirectory="C:\Work\software\OpenBLT\Target\Source\ARMCM4_STM32\Crossworks" fileDialogDefaultFilter="" autoConnectCapabilities="266111" debugSearchPath="" buildConfiguration="THUMB Debug" />
+ <ARMCrossStudioWindow activeProject="openbtl_olimex_stm32e407" autoConnectTarget="SEGGER J-Link" debugSearchFileMap="" fileDialogInitialDirectory="C:\Work\software\OpenBLT\Target\Source\ARMCM4_STM32F4\Crossworks" fileDialogDefaultFilter="*.c" autoConnectCapabilities="266111" debugSearchPath="" buildConfiguration="THUMB Debug" />
 </session>