mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-04-19 21:11:57 -04:00
Update Rowley STM32F107 project to remove multiple defined symbol warning.
This commit is contained in:
parent
73287e108b
commit
020ddcbd90
|
@ -1,7 +1,7 @@
|
||||||
<!DOCTYPE CrossStudio_Project_File>
|
<!DOCTYPE CrossStudio_Project_File>
|
||||||
<solution Name="RTOSDemo" version="2">
|
<solution Name="RTOSDemo" target="8" version="2">
|
||||||
<project Name="RTOSDemo">
|
<project Name="RTOSDemo">
|
||||||
<configuration Name="Common" Target="STM32F107VC" arm_architecture="v7M" arm_core_type="Cortex-M3" arm_linker_fiq_stack_size="0" arm_linker_heap_size="128" arm_linker_irq_stack_size="0" arm_linker_jtag_pad_pre_dr="1" arm_linker_jtag_pad_pre_ir="5" arm_linker_stack_size="128" arm_simulator_memory_simulation_filename="$(TargetsDir)/STM32/STM32SimulatorMemory.dll" arm_simulator_memory_simulation_parameter="0x40000;0xC000" arm_target_debug_interface_type="ADIv5" arm_target_loader_parameter="25000000" c_additional_options="-Wall;-Wextra" c_preprocessor_definitions="PACK_STRUCT_END=__attribute((packed));ALIGN_STRUCT_END=__attribute((aligned(4)))" c_system_include_directories="$(StudioDir)/include;$(StudioDir)/include/targets" c_user_include_directories=".;..\\..\\Source\\include;..\\..\\Source\\portable\\GCC\\ARM_CM3;..\\Common\\Include;..\\Common\\drivers\\ST\\STM32F10xFWLib\\inc;..\\Common\\ethernet\\uIP\\uip-1.0\\uip;webserver;LCD" link_include_startup_code="No" linker_memory_map_file="$(TargetsDir)/STM32/STM32F107VC_MemoryMap.xml" linker_printf_width_precision_supported="No" linker_scanf_fmt_level="int" oscillator_frequency="25MHz" project_directory="" project_type="Executable" property_groups_file_path="$(TargetsDir)/STM32/propertyGroups.xml"/>
|
<configuration Name="Common" Target="STM32F107VC" arm_architecture="v7M" arm_core_type="Cortex-M3" arm_linker_allow_multiple_definition="Yes" arm_linker_fiq_stack_size="0" arm_linker_heap_size="128" arm_linker_irq_stack_size="0" arm_linker_jtag_pad_pre_dr="1" arm_linker_jtag_pad_pre_ir="5" arm_linker_stack_size="128" arm_simulator_memory_simulation_filename="$(TargetsDir)/STM32/STM32SimulatorMemory.dll" arm_simulator_memory_simulation_parameter="0x40000;0xC000" arm_target_debug_interface_type="ADIv5" arm_target_loader_parameter="25000000" c_additional_options="-Wall;-Wextra" c_preprocessor_definitions="PACK_STRUCT_END=__attribute((packed));ALIGN_STRUCT_END=__attribute((aligned(4)))" c_system_include_directories="$(StudioDir)/include;$(StudioDir)/include/targets" c_user_include_directories=".;..\\..\\Source\\include;..\\..\\Source\\portable\\GCC\\ARM_CM3;..\\Common\\Include;..\\Common\\drivers\\ST\\STM32F10xFWLib\\inc;..\\Common\\ethernet\\uIP\\uip-1.0\\uip;webserver;LCD" link_include_startup_code="No" linker_memory_map_file="$(TargetsDir)/STM32/STM32F107VC_MemoryMap.xml" linker_printf_width_precision_supported="No" linker_scanf_fmt_level="int" oscillator_frequency="25MHz" project_directory="" project_type="Executable" property_groups_file_path="$(TargetsDir)/STM32/propertyGroups.xml"/>
|
||||||
<configuration Name="RAM" Placement="RAM" linker_section_placement_file="$(StudioDir)/targets/Cortex_M/ram_placement.xml" target_reset_script="SRAMReset()"/>
|
<configuration Name="RAM" Placement="RAM" linker_section_placement_file="$(StudioDir)/targets/Cortex_M/ram_placement.xml" target_reset_script="SRAMReset()"/>
|
||||||
<configuration Name="Flash" Placement="Flash" arm_target_flash_loader_file_path="$(TargetsDir)/STM32/Release/Loader_rpc.elf" arm_target_flash_loader_type="LIBMEM RPC Loader" linker_section_placement_file="$(StudioDir)/targets/Cortex_M/flash_placement.xml" target_reset_script="FLASHReset()"/>
|
<configuration Name="Flash" Placement="Flash" arm_target_flash_loader_file_path="$(TargetsDir)/STM32/Release/Loader_rpc.elf" arm_target_flash_loader_type="LIBMEM RPC Loader" linker_section_placement_file="$(StudioDir)/targets/Cortex_M/flash_placement.xml" target_reset_script="FLASHReset()"/>
|
||||||
<folder Name="Source Files">
|
<folder Name="Source Files">
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
<session>
|
<session>
|
||||||
<Bookmarks/>
|
<Bookmarks/>
|
||||||
<Breakpoints/>
|
<Breakpoints/>
|
||||||
|
<ETMWindow>
|
||||||
|
<ETMRegister number="0" value="800" />
|
||||||
|
<ETMRegister number="8" value="6f" />
|
||||||
|
<ETMRegister number="9" value="1000000" />
|
||||||
|
</ETMWindow>
|
||||||
<ExecutionCountWindow/>
|
<ExecutionCountWindow/>
|
||||||
<Memory1>
|
<Memory1>
|
||||||
<MemoryWindow autoEvaluate="0" addressText="0x200047ec" numColumns="8" sizeText="100" dataSize="1" radix="16" addressSpace="" />
|
<MemoryWindow autoEvaluate="0" addressText="0x200047ec" numColumns="8" sizeText="100" dataSize="1" radix="16" addressSpace="" />
|
||||||
|
@ -19,20 +24,18 @@
|
||||||
<ProjectSessionItem path="RTOSDemo" name="unnamed" />
|
<ProjectSessionItem path="RTOSDemo" name="unnamed" />
|
||||||
<ProjectSessionItem path="RTOSDemo;RTOSDemo" name="unnamed" />
|
<ProjectSessionItem path="RTOSDemo;RTOSDemo" name="unnamed" />
|
||||||
<ProjectSessionItem path="RTOSDemo;RTOSDemo;Source Files" name="unnamed" />
|
<ProjectSessionItem path="RTOSDemo;RTOSDemo;Source Files" name="unnamed" />
|
||||||
<ProjectSessionItem path="RTOSDemo;RTOSDemo;Source Files;Library" name="unnamed" />
|
|
||||||
<ProjectSessionItem path="RTOSDemo;RTOSDemo;Source Files;webserver" name="unnamed" />
|
|
||||||
</Project>
|
</Project>
|
||||||
<Register1>
|
<Register1>
|
||||||
<RegisterWindow openNodes="CPU" binaryNodes="" unsignedNodes="" visibleGroups="CPU" decimalNodes="" octalNodes="" asciiNodes="" />
|
<RegisterWindow openNodes="CPU" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="CPU" decimalNodes="" octalNodes="" asciiNodes="" />
|
||||||
</Register1>
|
</Register1>
|
||||||
<Register2>
|
<Register2>
|
||||||
<RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" />
|
<RegisterWindow openNodes="" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" />
|
||||||
</Register2>
|
</Register2>
|
||||||
<Register3>
|
<Register3>
|
||||||
<RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" />
|
<RegisterWindow openNodes="" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" />
|
||||||
</Register3>
|
</Register3>
|
||||||
<Register4>
|
<Register4>
|
||||||
<RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" />
|
<RegisterWindow openNodes="" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" />
|
||||||
</Register4>
|
</Register4>
|
||||||
<TargetWindow programAction="" uploadFileType="" programLoadAddress="" programSize="" uploadFileName="" uploadMemoryInterface="" programFileName="" uploadStartAddress="" programFileType="" uploadSize="" programMemoryInterface="" />
|
<TargetWindow programAction="" uploadFileType="" programLoadAddress="" programSize="" uploadFileName="" uploadMemoryInterface="" programFileName="" uploadStartAddress="" programFileType="" uploadSize="" programMemoryInterface="" />
|
||||||
<TraceWindow>
|
<TraceWindow>
|
||||||
|
|
Loading…
Reference in a new issue