Merge pull request #1153 from BernardXiong/master

[BSP] Update project files.

bsp/frdm-k64f/applications/startup.c

@@ -30,8 +30,8 @@ extern void finsh_set_device(const char* device);
 #endif
 
 #ifdef __CC_ARM
-extern int Image$$RW_IRAM1$$ZI$$Limit;
-#define K64_SRAM_BEGIN    (&Image$$RW_IRAM1$$ZI$$Limit)
+extern int Image$$RW_IRAM2$$ZI$$Limit;
+#define K64_SRAM_BEGIN    (&Image$$RW_IRAM2$$ZI$$Limit)
 #elif __ICCARM__
 #pragma section="HEAP"
 #define K64_SRAM_BEGIN    (__segment_end("HEAP"))

bsp/frdm-k64f/board/board.h

@@ -23,8 +23,8 @@
 
 // <o> Internal SRAM memory size[Kbytes] <8-64>
 // <i>Default: 64
-#define K64_SRAM_SIZE         256
-#define K64_SRAM_END          (0x1FFF0000 + (K64_SRAM_SIZE * 1024))
+#define K64_SRAM_SIZE         192
+#define K64_SRAM_END          (0x20000000 + (K64_SRAM_SIZE * 1024))
 
 //#define RT_USING_UART1
 #define RT_USING_UART0

bsp/frdm-k64f/template.uvproj

@@ -241,8 +241,8 @@
             <Ra1Chk>0</Ra1Chk>
             <Ra2Chk>0</Ra2Chk>
             <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
+            <Im1Chk>0</Im1Chk>
+            <Im2Chk>1</Im2Chk>
             <OnChipMemories>
               <Ocm1>
                 <Type>0</Type>

bsp/gd32450z-eval/project.eww

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<workspace>
+  <project>
+    <path>$WS_DIR$\project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
+
+

bsp/lpc2148/project.Uv2

@@ -3,48 +3,48 @@
 
 Target (rtthread-lpc2148), 0x0004 // Tools: 'ARM-ADS'
 
-Group (Applications)
 Group (Drivers)
+Group (Applications)
 Group (Kernel)
 Group (LPC214X)
 Group (finsh)
 
-File 1,1,<applications\application.c><application.c>
-File 1,1,<applications\startup.c><startup.c>
-File 2,1,<drivers\board.c><board.c>
-File 2,1,<drivers\serial.c><serial.c>
-File 3,1,<..\..\src\clock.c><clock.c>
-File 3,1,<..\..\src\device.c><device.c>
-File 3,1,<..\..\src\idle.c><idle.c>
-File 3,1,<..\..\src\ipc.c><ipc.c>
-File 3,1,<..\..\src\irq.c><irq.c>
-File 3,1,<..\..\src\kservice.c><kservice.c>
-File 3,1,<..\..\src\mem.c><mem.c>
-File 3,1,<..\..\src\mempool.c><mempool.c>
-File 3,1,<..\..\src\object.c><object.c>
-File 3,1,<..\..\src\scheduler.c><scheduler.c>
-File 3,1,<..\..\src\signal.c><signal.c>
-File 3,1,<..\..\src\thread.c><thread.c>
-File 3,1,<..\..\src\timer.c><timer.c>
-File 4,1,<..\..\libcpu\arm\lpc214x\cpuport.c><cpuport.c>
-File 4,2,<..\..\libcpu\arm\lpc214x\context_rvds.S><context_rvds.S>
-File 4,2,<..\..\libcpu\arm\lpc214x\start_rvds.S><start_rvds.S>
-File 4,1,<..\..\libcpu\arm\common\backtrace.c><backtrace.c>
-File 4,1,<..\..\libcpu\arm\common\div0.c><div0.c>
-File 4,1,<..\..\libcpu\arm\common\showmem.c><showmem.c>
-File 5,1,<..\..\components\finsh\shell.c><shell.c>
-File 5,1,<..\..\components\finsh\symbol.c><symbol.c>
-File 5,1,<..\..\components\finsh\cmd.c><cmd.c>
-File 5,1,<..\..\components\finsh\finsh_compiler.c><finsh_compiler.c>
-File 5,1,<..\..\components\finsh\finsh_error.c><finsh_error.c>
-File 5,1,<..\..\components\finsh\finsh_heap.c><finsh_heap.c>
-File 5,1,<..\..\components\finsh\finsh_init.c><finsh_init.c>
-File 5,1,<..\..\components\finsh\finsh_node.c><finsh_node.c>
-File 5,1,<..\..\components\finsh\finsh_ops.c><finsh_ops.c>
-File 5,1,<..\..\components\finsh\finsh_parser.c><finsh_parser.c>
-File 5,1,<..\..\components\finsh\finsh_var.c><finsh_var.c>
-File 5,1,<..\..\components\finsh\finsh_vm.c><finsh_vm.c>
-File 5,1,<..\..\components\finsh\finsh_token.c><finsh_token.c>
+File 1,1,<drivers/board.c><board.c>
+File 1,1,<drivers/serial.c><serial.c>
+File 2,1,<applications/application.c><application.c>
+File 2,1,<applications/startup.c><startup.c>
+File 3,1,<../../src/clock.c><clock.c>
+File 3,1,<../../src/device.c><device.c>
+File 3,1,<../../src/idle.c><idle.c>
+File 3,1,<../../src/ipc.c><ipc.c>
+File 3,1,<../../src/irq.c><irq.c>
+File 3,1,<../../src/kservice.c><kservice.c>
+File 3,1,<../../src/mem.c><mem.c>
+File 3,1,<../../src/mempool.c><mempool.c>
+File 3,1,<../../src/object.c><object.c>
+File 3,1,<../../src/scheduler.c><scheduler.c>
+File 3,1,<../../src/signal.c><signal.c>
+File 3,1,<../../src/thread.c><thread.c>
+File 3,1,<../../src/timer.c><timer.c>
+File 4,1,<../../libcpu/arm/lpc214x/cpuport.c><cpuport.c>
+File 4,2,<../../libcpu/arm/lpc214x/context_rvds.S><context_rvds.S>
+File 4,2,<../../libcpu/arm/lpc214x/start_rvds.S><start_rvds.S>
+File 4,1,<../../libcpu/arm/common/backtrace.c><backtrace.c>
+File 4,1,<../../libcpu/arm/common/div0.c><div0.c>
+File 4,1,<../../libcpu/arm/common/showmem.c><showmem.c>
+File 5,1,<../../components/finsh/shell.c><shell.c>
+File 5,1,<../../components/finsh/symbol.c><symbol.c>
+File 5,1,<../../components/finsh/cmd.c><cmd.c>
+File 5,1,<../../components/finsh/finsh_compiler.c><finsh_compiler.c>
+File 5,1,<../../components/finsh/finsh_error.c><finsh_error.c>
+File 5,1,<../../components/finsh/finsh_heap.c><finsh_heap.c>
+File 5,1,<../../components/finsh/finsh_init.c><finsh_init.c>
+File 5,1,<../../components/finsh/finsh_node.c><finsh_node.c>
+File 5,1,<../../components/finsh/finsh_ops.c><finsh_ops.c>
+File 5,1,<../../components/finsh/finsh_parser.c><finsh_parser.c>
+File 5,1,<../../components/finsh/finsh_var.c><finsh_var.c>
+File 5,1,<../../components/finsh/finsh_vm.c><finsh_vm.c>
+File 5,1,<../../components/finsh/finsh_token.c><finsh_token.c>
 
 
 
@@ -107,7 +107,7 @@ Options 1,0,0  // Target 'rtthread-lpc2148'
  ADSCMISC ()
  ADSCDEFN ()
  ADSCUDEF ()
- ADSCINCD (..\..\include;drivers;.;applications;..\..\libcpu\arm\lpc214x;..\..\libcpu\arm\common;..\..\components\finsh)
+ ADSCINCD (drivers;../../libcpu/arm/common;.;applications;../../include;../../libcpu/arm/lpc214x;../../components/finsh)
  ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
  ADSAMISC ()
  ADSADEFN ()

bsp/lpc54608-LPCXpresso/project.eww

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<workspace>
+  <project>
+    <path>$WS_DIR$\project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
+
+

bsp/xplorer4330/M0/SConstruct

@@ -5,7 +5,7 @@ import rtconfig
 if os.getenv('RTT_ROOT'):
     RTT_ROOT = os.getenv('RTT_ROOT')
 else:
-    RTT_ROOT = os.path.join(Dir('#').get_abspath(), '..', '..', 'rt-thread')
+    RTT_ROOT = os.path.join(Dir('#').get_abspath(), '..', '..', '..')
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 from building import *

bsp/xplorer4330/M4/SConstruct

@@ -5,7 +5,7 @@ import rtconfig
 if os.getenv('RTT_ROOT'):
     RTT_ROOT = os.getenv('RTT_ROOT')
 else:
-    RTT_ROOT = os.path.join(Dir('#').get_abspath(), '..', '..', 'rt-thread')
+    RTT_ROOT = os.path.join(Dir('#').get_abspath(), '..', '..', '..')
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 from building import *

bsp/xplorer4330/M4/project.uvproj

@@ -30,6 +30,7 @@
           <SLE66AMisc></SLE66AMisc>
           <SLE66LinkerMisc></SLE66LinkerMisc>
           <SFDFile>SFD\NXP\LPC43xx\LPC43xx.SFR</SFDFile>
+          <bCustSvd>0</bCustSvd>
           <UseEnv>0</UseEnv>
           <BinPath></BinPath>
           <IncludePath></IncludePath>
@@ -97,6 +98,7 @@
           <StopOnExitCode>3</StopOnExitCode>
           <CustomArgument></CustomArgument>
           <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>1</ComprImg>
         </CommonProperty>
         <DllOption>
           <SimDllName>SARMCM3.DLL</SimDllName>
@@ -126,6 +128,7 @@
             <RestoreFunctions>1</RestoreFunctions>
             <RestoreToolbox>1</RestoreToolbox>
             <LimitSpeedToRealTime>0</LimitSpeedToRealTime>
+            <RestoreSysVw>1</RestoreSysVw>
           </Simulator>
           <Target>
             <UseTarget>1</UseTarget>
@@ -137,6 +140,8 @@
             <RestoreFunctions>0</RestoreFunctions>
             <RestoreToolbox>1</RestoreToolbox>
             <RestoreTracepoints>0</RestoreTracepoints>
+            <RestoreSysVw>1</RestoreSysVw>
+            <UsePdscDebugDescription>1</UsePdscDebugDescription>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
           <TargetSelection>1</TargetSelection>
@@ -169,6 +174,10 @@
           <Flash2>BIN\UL2CM3.DLL</Flash2>
           <Flash3>"" ()</Flash3>
           <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
         </Utilities>
         <TargetArmAds>
           <ArmAdsMisc>
@@ -347,11 +356,13 @@
             <wLevel>0</wLevel>
             <uThumb>0</uThumb>
             <uSurpInc>0</uSurpInc>
+            <uC99>0</uC99>
+            <useXO>0</useXO>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>CORE_M4 USE_SPIFI</Define>
+              <Define>USE_SPIFI, CORE_M4</Define>
               <Undefine></Undefine>
-              <IncludePath>.;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\include;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\Libraries\CMSIS\Include;..\Libraries\Device\NXP\LPC43xx\Include;..\drivers;applications</IncludePath>
+              <IncludePath>applications;.;..\drivers;..\Libraries\Device\NXP\LPC43xx\Include;..\Libraries\CMSIS\Include;..\..\..\include;..\..\..\libcpu\arm\cortex-m4;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -363,6 +374,7 @@
             <SwStkChk>0</SwStkChk>
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define>NO_CRP</Define>
@@ -379,10 +391,11 @@
             <useFile>0</useFile>
             <TextAddressRange>0x14000000</TextAddressRange>
             <DataAddressRange>0x10000000</DataAddressRange>
+            <pXoBase></pXoBase>
             <ScatterFile></ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
-            <Misc> --keep __fsym_* --keep __vsym_* </Misc>
+            <Misc> --keep *.o(FSymTab) --keep *.o(VSymTab) </Misc>
             <LinkerInputFile></LinkerInputFile>
             <DisabledWarnings></DisabledWarnings>
           </LDads>
@@ -497,6 +510,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\src\scheduler.c</FilePath>
             </File>
+            <File>
+              <FileName>signal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\src\signal.c</FilePath>
+            </File>
             <File>
               <FileName>thread.c</FileName>
               <FileType>1</FileType>
@@ -562,16 +580,16 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\components\drivers\src\pipe.c</FilePath>
             </File>
-            <File>
-              <FileName>portal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\components\drivers\src\portal.c</FilePath>
-            </File>
             <File>
               <FileName>ringbuffer.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\..\..\components\drivers\src\ringbuffer.c</FilePath>
             </File>
+            <File>
+              <FileName>waitqueue.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath>
+            </File>
             <File>
               <FileName>workqueue.c</FileName>
               <FileType>1</FileType>
@@ -675,6 +693,7 @@
           <SLE66AMisc></SLE66AMisc>
           <SLE66LinkerMisc></SLE66LinkerMisc>
           <SFDFile>SFD\NXP\LPC43xx\LPC43xx.SFR</SFDFile>
+          <bCustSvd>0</bCustSvd>
           <UseEnv>0</UseEnv>
           <BinPath></BinPath>
           <IncludePath></IncludePath>
@@ -742,6 +761,7 @@
           <StopOnExitCode>3</StopOnExitCode>
           <CustomArgument></CustomArgument>
           <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>1</ComprImg>
         </CommonProperty>
         <DllOption>
           <SimDllName>SARMCM3.DLL</SimDllName>
@@ -771,6 +791,7 @@
             <RestoreFunctions>1</RestoreFunctions>
             <RestoreToolbox>1</RestoreToolbox>
             <LimitSpeedToRealTime>0</LimitSpeedToRealTime>
+            <RestoreSysVw>1</RestoreSysVw>
           </Simulator>
           <Target>
             <UseTarget>1</UseTarget>
@@ -782,6 +803,8 @@
             <RestoreFunctions>0</RestoreFunctions>
             <RestoreToolbox>1</RestoreToolbox>
             <RestoreTracepoints>0</RestoreTracepoints>
+            <RestoreSysVw>1</RestoreSysVw>
+            <UsePdscDebugDescription>1</UsePdscDebugDescription>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
           <TargetSelection>1</TargetSelection>
@@ -814,6 +837,10 @@
           <Flash2>BIN\UL2CM3.DLL</Flash2>
           <Flash3></Flash3>
           <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
         </Utilities>
         <TargetArmAds>
           <ArmAdsMisc>
@@ -992,6 +1019,8 @@
             <wLevel>0</wLevel>
             <uThumb>0</uThumb>
             <uSurpInc>0</uSurpInc>
+            <uC99>0</uC99>
+            <useXO>0</useXO>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -1008,6 +1037,7 @@
             <SwStkChk>0</SwStkChk>
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define>NO_CRP</Define>
@@ -1024,6 +1054,7 @@
             <useFile>0</useFile>
             <TextAddressRange>0x10000000</TextAddressRange>
             <DataAddressRange>0x20000000</DataAddressRange>
+            <pXoBase></pXoBase>
             <ScatterFile></ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
@@ -1142,6 +1173,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\src\scheduler.c</FilePath>
             </File>
+            <File>
+              <FileName>signal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\src\signal.c</FilePath>
+            </File>
             <File>
               <FileName>thread.c</FileName>
               <FileType>1</FileType>
@@ -1207,16 +1243,16 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\components\drivers\src\pipe.c</FilePath>
             </File>
-            <File>
-              <FileName>portal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\components\drivers\src\portal.c</FilePath>
-            </File>
             <File>
               <FileName>ringbuffer.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\..\..\components\drivers\src\ringbuffer.c</FilePath>
             </File>
+            <File>
+              <FileName>waitqueue.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath>
+            </File>
             <File>
               <FileName>workqueue.c</FileName>
               <FileType>1</FileType>