diff --git a/bsp/lm3s/Libraries/driverlib/rvmdk/driverlib.lib b/bsp/lm3s/Libraries/driverlib/rvmdk/driverlib.lib new file mode 100644 index 000000000..1d247c15c Binary files /dev/null and b/bsp/lm3s/Libraries/driverlib/rvmdk/driverlib.lib differ diff --git a/bsp/lm3s/project_lwip_dfs.Opt b/bsp/lm3s/project_lwip_dfs.Opt index f468d6e9c..66caf10fa 100644 --- a/bsp/lm3s/project_lwip_dfs.Opt +++ b/bsp/lm3s/project_lwip_dfs.Opt @@ -10,19 +10,19 @@ CppX (*.cpp) DaveTm { 0,0,0,0,0,0,0,0 } -Target (RT-Thread/LM3S), 0x0004 // Tools: 'ARM-ADS' +Target (RT-Thread-LM3S), 0x0004 // Tools: 'ARM-ADS' GRPOPT 1,(Startup),1,0,0 GRPOPT 2,(Kernel),0,0,0 GRPOPT 3,(finsh),0,0,0 GRPOPT 4,(LM3S),0,0,0 -GRPOPT 5,(driverlib),0,0,0 +GRPOPT 5,(driverlib),1,0,0 GRPOPT 6,(Filesystem),0,0,0 GRPOPT 7,(LwIP),0,0,0 OPTFFF 1,1,1,0,0,1,1,0,<.\application.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,226,255,255,255,88,0,0,0,116,0,0,0,236,2,0,0,123,1,0,0 } OPTFFF 1,2,1,486539264,0,63,63,0,<.\board.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,226,255,255,255,44,0,0,0,58,0,0,0,183,2,0,0,100,1,0,0 } OPTFFF 1,3,1,0,0,130,135,0,<.\startup.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,226,255,255,255,22,0,0,0,29,0,0,0,161,2,0,0,71,1,0,0 } -OPTFFF 1,4,5,1291845632,0,100,114,0,<.\rtconfig.h> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,139,2,0,0,42,1,0,0 } +OPTFFF 1,4,5,134217728,0,84,84,0,<.\rtconfig.h> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,139,2,0,0,42,1,0,0 } OPTFFF 1,5,1,922746880,0,0,0,0,<.\sdcard.c> OPTFFF 1,6,1,1006632960,0,1,1,0,<.\luminaryif.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,226,255,255,255,66,0,0,0,87,0,0,0,205,2,0,0,129,1,0,0 } OPTFFF 1,7,5,0,0,0,0,0,<.\board.h> @@ -60,7 +60,7 @@ OPTFFF 4,38,2,0,0,0,0,0,<..\..\libcpu\arm\lm3s\start_rvds.S> OPTFFF 4,39,1,0,0,0,0,0,<..\..\libcpu\arm\lm3s\serial.c> OPTFFF 4,40,1,0,0,0,0,0,<..\..\libcpu\arm\lm3s\fault.c> OPTFFF 4,41,2,0,0,0,0,0,<..\..\libcpu\arm\lm3s\fault_rvds.S> -OPTFFF 5,42,4,0,0,0,0,0, +OPTFFF 5,42,4,0,0,0,0,0,<..\..\bsp\lm3s\Libraries\driverlib\rvmdk\driverlib.lib> OPTFFF 6,43,1,1,0,0,0,0,<..\..\filesystem\dfs\src\dfs_init.c> OPTFFF 6,44,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_fs.c> OPTFFF 6,45,1,0,0,0,0,0,<..\..\filesystem\dfs\src\dfs_raw.c> @@ -78,7 +78,7 @@ OPTFFF 6,56,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fs.c> OPTFFF 6,57,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ls.c> OPTFFF 6,58,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\time.c> OPTFFF 6,59,1,0,0,0,0,0,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ui.c> -OPTFFF 7,60,1,1,0,0,0,0,<..\..\net\lwip\src\core\dhcp.c> +OPTFFF 7,60,1,0,0,0,0,0,<..\..\net\lwip\src\core\dhcp.c> OPTFFF 7,61,1,0,0,0,0,0,<..\..\net\lwip\src\core\dns.c> OPTFFF 7,62,1,0,0,247,247,0,<..\..\net\lwip\src\core\init.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,226,255,255,255,0,0,0,0,0,0,0,0,139,2,0,0,42,1,0,0 } OPTFFF 7,63,1,0,0,0,0,0,<..\..\net\lwip\src\core\netif.c> @@ -106,25 +106,23 @@ OPTFFF 7,84,1,0,0,0,0,0,<..\..\net\lwip\src\api\err.c> OPTFFF 7,85,1,0,0,0,0,0,<..\..\net\lwip\src\api\netbuf.c> OPTFFF 7,86,1,0,0,0,0,0,<..\..\net\lwip\src\api\netdb.c> OPTFFF 7,87,1,0,0,0,0,0,<..\..\net\lwip\src\api\netifapi.c> -OPTFFF 7,88,1,1,0,0,0,0,<..\..\net\lwip\src\api\tcpip.c> +OPTFFF 7,88,1,0,0,0,0,0,<..\..\net\lwip\src\api\tcpip.c> OPTFFF 7,89,1,0,0,0,0,0,<..\..\net\lwip\src\netif\etharp.c> OPTFFF 7,90,1,0,0,0,0,0,<..\..\net\lwip\src\netif\ethernetif.c> OPTFFF 7,91,1,0,0,0,0,0,<..\..\net\lwip\src\netif\loopif.c> OPTFFF 7,92,1,0,0,0,0,0,<..\..\net\lwip\src\arch\sys_arch_init.c> OPTFFF 7,93,1,0,0,0,0,0,<..\..\net\lwip\src\arch\sys_arch.c> OPTFFF 7,94,1,0,0,0,0,0,<..\..\net\lwip\src\api\sockets.c> -OPTFFF 7,95,1,0,0,0,0,0,<..\..\net\lwip\src\core\memp_tiny.c> +OPTFFF 7,95,1,503316480,0,350,359,0,<..\..\net\lwip\src\core\memp.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,226,255,255,255,44,0,0,0,58,0,0,0,205,2,0,0,47,1,0,0 } +OPTFFF 7,96,1,0,0,0,0,0,<..\..\net\lwip\src\core\snmp\asn1_dec.c> +OPTFFF 7,97,1,0,0,0,0,0,<..\..\net\lwip\src\core\snmp\asn1_enc.c> +OPTFFF 7,98,1,838860802,0,4104,4104,0,<..\..\net\lwip\src\core\snmp\mib2.c> { 44,0,0,0,2,0,0,0,3,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,183,2,0,0,172,0,0,0 } +OPTFFF 7,99,1,0,0,0,0,0,<..\..\net\lwip\src\core\snmp\mib_structs.c> -ExtF 1,14,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,44,0,0,0,58,0,0,0,183,2,0,0,100,1,0,0 } -ExtF 46,46,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,66,0,0,0,87,0,0,0,205,2,0,0,129,1,0,0 } -ExtF 348,348,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,44,0,0,0,58,0,0,0,183,2,0,0,100,1,0,0 } -ExtF 153,153,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,88,0,0,0,116,0,0,0,227,2,0,0,158,1,0,0 } -ExtF 80,84,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,22,0,0,0,29,0,0,0,170,2,0,0,36,1,0,0 } -ExtF 1,9,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,139,2,0,0,42,1,0,0 } -TARGOPT 1, (RT-Thread/LM3S) +TARGOPT 1, (RT-Thread-LM3S) ADSCLK=6000000 - OPTTT 1,1,1,0 + OPTTT 0,1,1,0 OPTHX 1,65535,0,0,0 OPTLX 79,66,8,<.\> OPTOX 16 @@ -134,11 +132,7 @@ TARGOPT 1, (RT-Thread/LM3S) OPTAX 0 OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S6918)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S6918) OPTDBG 49150,7,()()()()()()()()()() (Segger\JL2CM3.dll)()()() - OPTKEY 0,(DLGTARM)((1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(102=-1,-1,-1,-1,0)(103=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(163=-1,-1,-1,-1,0)(164=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)(152=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)(1014=-1,-1,-1,-1,0)(1016=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)) - OPTKEY 0,(ARMDBGFLAGS)() - OPTKEY 0,(DLGUARM)((105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)) - OPTKEY 0,(JL2CM3)(-U -O14 -S0 -C-1 -JU1 -JI127.0.0.1 -JP0 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TRE0 -FO7 -FD20000000 -FC800 -FN1 -FF0LM3S_256 -FS00 -FL040000) - OPTDF 0x84 + OPTDF 0x0 OPTLE <> OPTLC <> EndOpt diff --git a/bsp/lm3s/project_lwip_dfs.Uv2 b/bsp/lm3s/project_lwip_dfs.Uv2 index a2552e35a..5a659941c 100644 --- a/bsp/lm3s/project_lwip_dfs.Uv2 +++ b/bsp/lm3s/project_lwip_dfs.Uv2 @@ -1,7 +1,7 @@ ### uVision2 Project, (C) Keil Software ### Do not modify ! -Target (RT-Thread/LM3S), 0x0004 // Tools: 'ARM-ADS' +Target (RT-Thread-LM3S), 0x0004 // Tools: 'ARM-ADS' Group (Startup) Group (Kernel) @@ -52,7 +52,7 @@ File 4,2,<..\..\libcpu\arm\lm3s\start_rvds.S> File 4,1,<..\..\libcpu\arm\lm3s\serial.c> File 4,1,<..\..\libcpu\arm\lm3s\fault.c> File 4,2,<..\..\libcpu\arm\lm3s\fault_rvds.S> -File 5,4, +File 5,4,<..\..\bsp\lm3s\Libraries\driverlib\rvmdk\driverlib.lib> File 6,1,<..\..\filesystem\dfs\src\dfs_init.c> File 6,1,<..\..\filesystem\dfs\src\dfs_fs.c> File 6,1,<..\..\filesystem\dfs\src\dfs_raw.c> @@ -105,10 +105,14 @@ File 7,1,<..\..\net\lwip\src\netif\loopif.c> File 7,1,<..\..\net\lwip\src\arch\sys_arch_init.c> File 7,1,<..\..\net\lwip\src\arch\sys_arch.c> File 7,1,<..\..\net\lwip\src\api\sockets.c> -File 7,1,<..\..\net\lwip\src\core\memp_tiny.c> +File 7,1,<..\..\net\lwip\src\core\memp.c> +File 7,1,<..\..\net\lwip\src\core\snmp\asn1_dec.c> +File 7,1,<..\..\net\lwip\src\core\snmp\asn1_enc.c> +File 7,1,<..\..\net\lwip\src\core\snmp\mib2.c> +File 7,1,<..\..\net\lwip\src\core\snmp\mib_structs.c> -Options 1,0,0 // Target 'RT-Thread/LM3S' +Options 1,0,0 // Target 'RT-Thread-LM3S' Device (LM3S6918) Vendor (Luminary Micro) Cpu (IRAM(0x20000000-0x2000FFFF) IROM(0-0x3FFFF) CLOCK(6000000) CPUTYPE("Cortex-M3")) @@ -162,7 +166,7 @@ Options 1,0,0 // Target 'RT-Thread/LM3S' OCMADSXRAM { 0,0,0,0,0,0,0,0,0 } OCR_RVCT { 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,4,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,1,0,0,0,0,0,0,0,0,0,0 } RV_STAVEC () - ADSCCFLG { 5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } + ADSCCFLG { 5,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } ADSCMISC () ADSCDEFN () ADSCUDEF ()