Change project so output files go into a bin directory rather than being dumped in...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@716 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h b/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h
index 5451584b43ab79f4d10c4e2a57b3536a46a6a410..91efc87691d09fbbfe7fdb633bfd9f863bd25883 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h
@@ -79,6 +79,8 @@
 #define configUSE_16_BIT_TICKS         0\r
 #define configIDLE_SHOULD_YIELD                1\r
 \r
+#define configQUEUE_REGISTRY_SIZE      0\r
+\r
 /* Co-routine definitions. */\r
 #define configUSE_CO_ROUTINES          0\r
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
index cab98af2157a0fb491d3b04249fc8838ec575c86..3860e3a40e87acd38c19c6b651f5809fde14f041 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
@@ -13,17 +13,17 @@
 Target (RTOSDemo_ARM), 0x0004 // Tools: 'ARM-ADS'\r
 Target (RTOSDemo_THUMB), 0x0004 // Tools: 'ARM-ADS'\r
 GRPOPT 1,(Other),1,0,0\r
-GRPOPT 2,(FreeRTOS),0,0,0\r
+GRPOPT 2,(FreeRTOS),1,0,0\r
 GRPOPT 3,(Stadard Demo),0,0,0\r
 \r
 OPTFFF 1,1,2,0,0,0,0,0,<.\Startup.s><Startup.s> \r
 OPTFFF 1,2,1,503316480,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> \r
-OPTFFF 1,3,1,2,0,149,155,0,<.\main.c><main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,45,0,0,0,57,0,0,0,246,3,0,0,181,1,0,0 }\r
+OPTFFF 1,3,1,2,0,1,1,0,<.\main.c><main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,66,0,0,0,66,0,0,0,135,4,0,0,33,2,0,0 }\r
 OPTFFF 1,4,1,0,0,0,0,0,<.\serial\serial.c><serial.c> \r
 OPTFFF 1,5,2,0,0,0,0,0,<.\serial\serialISR.s><serialISR.s> \r
-OPTFFF 2,6,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c> \r
+OPTFFF 2,6,1,301989888,0,0,0,0,<..\..\Source\tasks.c><tasks.c> \r
 OPTFFF 2,7,1,0,0,0,0,0,<..\..\Source\list.c><list.c> \r
-OPTFFF 2,8,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c> \r
+OPTFFF 2,8,1,754974720,0,0,0,0,<..\..\Source\queue.c><queue.c> \r
 OPTFFF 2,9,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c> \r
 OPTFFF 2,10,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> \r
 OPTFFF 2,11,2,301989888,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s> \r
@@ -73,11 +73,13 @@ TARGOPT 2, (RTOSDemo_THUMB)
   OPTBL 0,(Data Sheet)<DATASHTS\PHILIPS\LPC2119_2129.PDF>\r
   OPTBL 1,(User Manual)<DATASHTS\PHILIPS\user_manual_LPC2119_2129_2194_2292_2294.PDF>\r
   OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)\r
-  OPTDBG 49150,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\r
+  OPTDBG 49149,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\r
   OPTKEY 0,(DLGTARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0))\r
   OPTKEY 0,(UL2ARM)(-UU0605F6E -O39 -S0 -C0 -N00("ARM7TDMI-S Core") -D00(4F1F0F0F) -L00(4) -FO19 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000)\r
   OPTKEY 0,(DLGDARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0))\r
   OPTKEY 0,(ARMDBGFLAGS)(-T5F)\r
+  OPTBB 0,0,218,1,644,0,0,0,0,1,<main.c>()()\r
+  OPTBB 1,0,207,1,626,0,0,0,0,1,<main.c>()()\r
   OPTDF 0x86\r
   OPTLE <>\r
   OPTLC <>\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2 b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
index d0433bf10c52adffe4f361c45e96548b1a9b4399..3983ea522554f73e7037a29de8537934277e2c35 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
@@ -143,7 +143,7 @@ Options 2,0,0  // Target 'RTOSDemo_THUMB'
  EnvReg (ÿPhilips\)\r
  OrgReg (ÿPhilips\)\r
  TgStat=16\r
- OutDir (.\)\r
+ OutDir (.\bin\)\r
  OutName (RTOSDemo)\r
  GenApp=1\r
  GenLib=0\r
@@ -201,7 +201,7 @@ Options 2,0,0  // Target 'RTOSDemo_THUMB'
  ADSLDIF ()\r
  ADSLDDW ()\r
   OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)\r
-  OPTDBG 49150,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\r
+  OPTDBG 49149,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\r
  FLASH1 { 1,0,0,0,1,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0 }\r
  FLASH2 (BIN\UL2ARM.DLL)\r
  FLASH3 ("LPC210x_ISP.EXE" ("#H" ^X $D COM1: 9600 1))\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
index b9dc2121c506bf61a48b886e069e01fd6db3ba42..870f48c54cb44275c63da01d257279a8702bfe32 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
@@ -27,7 +27,7 @@
 ### ADS-LD Output File: 'RTOSDemo.axf'\r
 ### ADS-LD Command File: 'RTOSDemo.lnp'\r
 ### Checking for dirty Components...\r
-### Creating CmdFile 'RTOSDemo.lnp', Handle=0x000004F4\r
+### Creating CmdFile 'RTOSDemo.lnp', Handle=0x00000228\r
 ### Writing '.lnp' file\r
 ### ADS-LD Command file 'RTOSDemo.lnp' is ready.\r
 ### ADS-LD: About to start ADS-LD Thread.\r