RIDE uses pre-built NuttX start file

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2121 42af7a65-404d-4744-a932-0658087f49c3

arch/arm/include/arch.h

@@ -44,10 +44,14 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/config.h>
+
 /****************************************************************************
  * Definitions
  ****************************************************************************/
 
+#ifdef CONFIG_PIC
+
 /* This identifies the register the is used by the processor as the PIC base
  * register.  It is usually r9 or r10
  */
@@ -82,6 +86,7 @@ do { \
   ); \
 } while (0)
 
+#endif
 
 /****************************************************************************
  * Inline functions

configs/stm3210e-eval/README.txt

@@ -95,7 +95,9 @@ IDEs
      on the command line.
 
   Startup files will probably cause you some headaches.  The NuttX startup file
-  is arch/arm/src/stm32/stm32_vectors.S
+  is arch/arm/src/stm32/stm32_vectors.S.  With RIDE, I have to build NuttX
+  one time from the Cygwin command line in order to obtain the pre-built
+  startup object needed by RIDE.
 
 NuttX buildroot Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -291,10 +293,10 @@ STM3210E-EVAL-specific Configuration Options
 	CONFIG_STM32_TIM3_FULL_REMAP
 	CONFIG_STM32_TIM3_PARTIAL_REMAP
 	CONFIG_STM32_TIM4_REMAP
-    CONFIG_STM32_USART1_REMAP
+	CONFIG_STM32_USART1_REMAP
-    CONFIG_STM32_USART2_REMAP
+	CONFIG_STM32_USART2_REMAP
-    CONFIG_STM32_USART3_FULL_REMAP
+	CONFIG_STM32_USART3_FULL_REMAP
-    CONFIG_STM32_USART3_PARTIAL_REMAP
+	CONFIG_STM32_USART3_PARTIAL_REMAP
 	CONFIG_STM32_SPI1_REMAP
 	CONFIG_STM32_SPI3_REMAP
 	CONFIG_STM32_I2C1_REMAP

configs/stm3210e-eval/RIDE/nuttx.dbi

@@ -18,3 +18,5 @@ Explore=No
 Startup=1
 StartupSymb=main
 ToolName=RLINK_CORTEX
+[SimFile]
+path=C:\Program Files\Raisonance\Ride\sim\ARM\STM32F101VET6.sim

configs/stm3210e-eval/RIDE/nuttx.elf.ld

@@ -1,9 +1,8 @@
 
 SEARCH_DIR(".")
 SEARCH_DIR("C:\Program Files\Raisonance\Ride\Lib\ARM")
-STARTUP("C:\Program Files\Raisonance\Ride\lib\ARM\crt0_STM32x_HD.o")
+STARTUP("C:\cygwin\home\Owner\projects\nuttx\nuttx\arch\arm\src\stm32_vectors.o")
 INPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\stm32_timerisr.o")
-INPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\stm32_vectors.o")
 INPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\stm32_gpio.o")
 INPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\stm32_irq.o")
 INPUT("C:\cygwin\home\Owner\projects\nuttx\nuttx\configs\stm3210e-eval\RIDE\stm32_lowputc.o")

configs/stm3210e-eval/RIDE/nuttx.rapp

@@ -1,7 +1,6 @@
 
 <ApplicationBuild Header="nuttx" Extern=".\nuttx.rapp" Path=".\nuttx.rapp" OutputFile=".\nuttx.elf" sate="98" >
 	<NodeC Path="..\..\..\arch\arm\src\stm32\stm32_timerisr.c" Header="stm32_timerisr.c" Marker="-1" OutputFile=".\stm32_timerisr.o" sate="0" />
-	<NodeASM Path="..\..\..\arch\arm\src\stm32\stm32_vectors.S" Header="stm32_vectors.S" Marker="-1" OutputFile=".\stm32_vectors.o" sate="0" />
 	<NodeC Path="..\..\..\arch\arm\src\stm32\stm32_gpio.c" Header="stm32_gpio.c" Marker="-1" OutputFile=".\stm32_gpio.o" sate="0" />
 	<NodeC Path="..\..\..\arch\arm\src\stm32\stm32_irq.c" Header="stm32_irq.c" Marker="-1" OutputFile=".\stm32_irq.o" sate="0" />
 	<NodeC Path="..\..\..\arch\arm\src\stm32\stm32_lowputc.c" Header="stm32_lowputc.c" Marker="-1" OutputFile=".\stm32_lowputc.o" sate="0" />
@@ -13,35 +12,36 @@
 			<Set Header="ApplicationBuild" >
 				<Section Header="General" >
 					<Property Header="TargetFamily" Value="ARM" />
-																
+																									
 				</Section>
 				<Section Header="Directories" >
 					<Property Header="IncDir" Value=".;C:\cygwin\home\Owner\projects\nuttx\nuttx\arch\arm\src\common;C:\cygwin\home\Owner\projects\nuttx\nuttx\arch\arm\src\cortexm3;C:\cygwin\home\Owner\projects\nuttx\nuttx\arch\arm\src\stm32;C:\cygwin\home\Owner\projects\nuttx\nuttx\include;C:\cygwin\home\Owner\projects\nuttx\nuttx\sched" Removable="1" />
-							
-				</Section>
-					
-			</Set>
-			<Set Header="Target" >
-				<Section Header="ProcessorARM" >
-					<Property Header="Processor" Value="STM32F101VET6" />
-																
-				</Section>
-				<Section Header="ToolSetARM" >
-					<Property Header="BuildToolSetARM" Value="ARM\\GNU.config" Removable="1" />
 																
 				</Section>
 												
+			</Set>
+			<Set Header="Target" >
+				<Section Header="ProcessorARM" >
+					<Property Header="Processor" Value="STM32F101VET6" />
+																									
+				</Section>
+				<Section Header="ToolSetARM" >
+					<Property Header="BuildToolSetARM" Value="ARM\\GNU.config" Removable="1" />
+																									
+				</Section>
+																			
 			</Set>
 			<Set Header="AS" >
 				<Section Header="Options" >
 					<Property Header="More" Value="-D __ASSEMBLY__" />
-							
+																
 				</Section>
-					
+												
 			</Set>
 			<Set Header="LD" >
 				<Section Header="Startup" >
 					<Property Header="DEFAULTSTARTUP" Value="No" Removable="1" />
+					<Property Header="File" Value="C:\cygwin\home\Owner\projects\nuttx\nuttx\arch\arm\src\stm32_vectors.o" Removable="1" />
 							
 				</Section>