diff --git a/bsp/frdm-k64f/project.uvproj b/bsp/frdm-k64f/project.uvproj index 38dd4a8bda..9530fc5210 100644 --- a/bsp/frdm-k64f/project.uvproj +++ b/bsp/frdm-k64f/project.uvproj @@ -72,6 +72,8 @@ 0 0 + 0 + 0 0 @@ -80,6 +82,8 @@ 0 0 + 0 + 0 0 @@ -141,10 +145,9 @@ 1 1 1 - 0 0 - 6 + 3 @@ -224,6 +227,7 @@ 0 0 0 + 0 3 3 0 @@ -358,6 +362,13 @@ 0 1 0 + 1 + 1 + 1 + 1 + 0 + 0 + 0 CPU_MK64FN1M0VLL12 @@ -375,6 +386,7 @@ 0 0 0 + 0 diff --git a/bsp/frdm-k64f/project.uvprojx b/bsp/frdm-k64f/project.uvprojx index 7d8bef0d9c..0e5a4da425 100644 --- a/bsp/frdm-k64f/project.uvprojx +++ b/bsp/frdm-k64f/project.uvprojx @@ -1,41 +1,45 @@ + 2.1 +
### uVision Project, (C) Keil Software
+ RT-Thread 0x4 ARM-ADS + 5060422::V5.06 update 4 (build 422)::ARMCC MK64FN1M0xxx12 NXP - Keil.Kinetis_K60_DFP.1.5.0 - http://www.keil.com/pack/ + NXP.MK64F12_DFP.10.0.4 + http://mcuxpresso.nxp.com/cmsis_pack/repo/ IRAM(0x20000000,0x00030000) IRAM2(0x1FFF0000,0x00010000) IROM(0x00000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0MK_P1M0 -FS00 -FL0100000 -FP0($$Device:MK64FN1M0xxx12$Flash\MK_P1M0.FLM)) 7425 $$Device:MK64FN1M0xxx12$Device\Include\MK64F12.h - - - - - - - - - + + + + + + + + + $$Device:MK64FN1M0xxx12$SVD\MK64F12.svd 0 0 - - - - - + + + + + 0 0 @@ -57,8 +61,8 @@ 0 0 - - + + 0 0 0 @@ -67,8 +71,8 @@ 0 0 - - + + 0 0 0 @@ -77,15 +81,15 @@ 0 0 - - + + 0 0 0 0 0 - + 0 @@ -99,17 +103,17 @@ 0 0 3 - - + + 1 SARMCM3.DLL - + DCM.DLL -pCM4 SARMCM3.DLL - + TCM.DLL -pCM4 @@ -133,11 +137,11 @@ 1 BIN\UL2CM3.DLL - - - - - + + + + + 0 @@ -170,7 +174,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -203,8 +207,8 @@ 0 0 0 - 1 - 0 + 0 + 1 0 @@ -293,16 +297,16 @@ 0 - 0x20000000 - 0x30000 + 0x1fff0000 + 0x10000 0 - 0x1fff0000 - 0x10000 + 0x20000000 + 0x30000 - + 1 @@ -328,10 +332,10 @@ 0 0 - + CPU_MK64FN1M0VLL12 - - device;device/MK64F12;board;applications;.;../../include;../../libcpu/arm/cortex-m4;../../libcpu/arm/common;../../components/drivers/include;../../components/drivers/include;../../components/finsh;../../components/net/lwip-2.0.2/src;../../components/net/lwip-2.0.2/src/include;../../components/net/lwip-2.0.2/src/include/ipv4;../../components/net/lwip-2.0.2/src/arch/include;../../components/net/lwip-2.0.2/src/include/netif;../../components/net/lwip-2.0.2/src/include/posix + + applications;.;board;device;device\MK64F12;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif;..\..\components\net\lwip-2.0.2\src\include\posix @@ -346,10 +350,10 @@ 0 0 - - - - + + + + @@ -361,297 +365,29 @@ 0 0x00000000 0x1FFF0000 - - - - + + + + --keep *.o(.rti_fn.*) --keep *.o(FSymTab) --keep *.o(VSymTab) - - + + - Device + Applications - fsl_adc16.c + application.c 1 - device/MK64F12/fsl_adc16.c + applications\application.c - - - fsl_clock.c + startup.c 1 - device/MK64F12/fsl_clock.c - - - - - fsl_cmp.c - 1 - device/MK64F12/fsl_cmp.c - - - - - fsl_cmt.c - 1 - device/MK64F12/fsl_cmt.c - - - - - fsl_common.c - 1 - device/MK64F12/fsl_common.c - - - - - fsl_crc.c - 1 - device/MK64F12/fsl_crc.c - - - - - fsl_dac.c - 1 - device/MK64F12/fsl_dac.c - - - - - fsl_dmamux.c - 1 - device/MK64F12/fsl_dmamux.c - - - - - fsl_dspi.c - 1 - device/MK64F12/fsl_dspi.c - - - - - fsl_dspi_edma.c - 1 - device/MK64F12/fsl_dspi_edma.c - - - - - fsl_edma.c - 1 - device/MK64F12/fsl_edma.c - - - - - fsl_enet.c - 1 - device/MK64F12/fsl_enet.c - - - - - fsl_ewm.c - 1 - device/MK64F12/fsl_ewm.c - - - - - fsl_flash.c - 1 - device/MK64F12/fsl_flash.c - - - - - fsl_flexbus.c - 1 - device/MK64F12/fsl_flexbus.c - - - - - fsl_flexcan.c - 1 - device/MK64F12/fsl_flexcan.c - - - - - fsl_ftm.c - 1 - device/MK64F12/fsl_ftm.c - - - - - fsl_gpio.c - 1 - device/MK64F12/fsl_gpio.c - - - - - fsl_i2c.c - 1 - device/MK64F12/fsl_i2c.c - - - - - fsl_i2c_edma.c - 1 - device/MK64F12/fsl_i2c_edma.c - - - - - fsl_llwu.c - 1 - device/MK64F12/fsl_llwu.c - - - - - fsl_lptmr.c - 1 - device/MK64F12/fsl_lptmr.c - - - - - fsl_pdb.c - 1 - device/MK64F12/fsl_pdb.c - - - - - fsl_pit.c - 1 - device/MK64F12/fsl_pit.c - - - - - fsl_pmc.c - 1 - device/MK64F12/fsl_pmc.c - - - - - fsl_rcm.c - 1 - device/MK64F12/fsl_rcm.c - - - - - fsl_rnga.c - 1 - device/MK64F12/fsl_rnga.c - - - - - fsl_rtc.c - 1 - device/MK64F12/fsl_rtc.c - - - - - fsl_sai.c - 1 - device/MK64F12/fsl_sai.c - - - - - fsl_sai_edma.c - 1 - device/MK64F12/fsl_sai_edma.c - - - - - fsl_sdhc.c - 1 - device/MK64F12/fsl_sdhc.c - - - - - fsl_sim.c - 1 - device/MK64F12/fsl_sim.c - - - - - fsl_smc.c - 1 - device/MK64F12/fsl_smc.c - - - - - fsl_sysmpu.c - 1 - device/MK64F12/fsl_sysmpu.c - - - - - fsl_uart.c - 1 - device/MK64F12/fsl_uart.c - - - - - fsl_uart_edma.c - 1 - device/MK64F12/fsl_uart_edma.c - - - - - fsl_vref.c - 1 - device/MK64F12/fsl_vref.c - - - - - fsl_wdog.c - 1 - device/MK64F12/fsl_wdog.c - - - - - system_MK64F12.c - 1 - device/system_MK64F12.c - - - - - startup_MK64F12.s - 2 - device/TOOLCHAIN_ARM_STD/startup_MK64F12.s + applications\startup.c @@ -661,59 +397,237 @@ board.c 1 - board/board.c + board\board.c - - clock_config.c 1 - board/clock_config.c + board\clock_config.c - - drv_uart.c 1 - board/drv_uart.c + board\drv_uart.c - - led.c 1 - board/led.c + board\led.c - - drv_emac.c 1 - board/drv_emac.c + board\drv_emac.c - - fsl_phy.c 1 - board/fsl_phy.c + board\fsl_phy.c - Applications + Device - application.c + fsl_adc16.c 1 - applications/application.c + device\MK64F12\fsl_adc16.c - - - startup.c + fsl_clock.c 1 - applications/startup.c + device\MK64F12\fsl_clock.c + + + fsl_cmp.c + 1 + device\MK64F12\fsl_cmp.c + + + fsl_cmt.c + 1 + device\MK64F12\fsl_cmt.c + + + fsl_common.c + 1 + device\MK64F12\fsl_common.c + + + fsl_crc.c + 1 + device\MK64F12\fsl_crc.c + + + fsl_dac.c + 1 + device\MK64F12\fsl_dac.c + + + fsl_dmamux.c + 1 + device\MK64F12\fsl_dmamux.c + + + fsl_dspi.c + 1 + device\MK64F12\fsl_dspi.c + + + fsl_dspi_edma.c + 1 + device\MK64F12\fsl_dspi_edma.c + + + fsl_edma.c + 1 + device\MK64F12\fsl_edma.c + + + fsl_enet.c + 1 + device\MK64F12\fsl_enet.c + + + fsl_ewm.c + 1 + device\MK64F12\fsl_ewm.c + + + fsl_flash.c + 1 + device\MK64F12\fsl_flash.c + + + fsl_flexbus.c + 1 + device\MK64F12\fsl_flexbus.c + + + fsl_flexcan.c + 1 + device\MK64F12\fsl_flexcan.c + + + fsl_ftm.c + 1 + device\MK64F12\fsl_ftm.c + + + fsl_gpio.c + 1 + device\MK64F12\fsl_gpio.c + + + fsl_i2c.c + 1 + device\MK64F12\fsl_i2c.c + + + fsl_i2c_edma.c + 1 + device\MK64F12\fsl_i2c_edma.c + + + fsl_llwu.c + 1 + device\MK64F12\fsl_llwu.c + + + fsl_lptmr.c + 1 + device\MK64F12\fsl_lptmr.c + + + fsl_pdb.c + 1 + device\MK64F12\fsl_pdb.c + + + fsl_pit.c + 1 + device\MK64F12\fsl_pit.c + + + fsl_pmc.c + 1 + device\MK64F12\fsl_pmc.c + + + fsl_rcm.c + 1 + device\MK64F12\fsl_rcm.c + + + fsl_rnga.c + 1 + device\MK64F12\fsl_rnga.c + + + fsl_rtc.c + 1 + device\MK64F12\fsl_rtc.c + + + fsl_sai.c + 1 + device\MK64F12\fsl_sai.c + + + fsl_sai_edma.c + 1 + device\MK64F12\fsl_sai_edma.c + + + fsl_sdhc.c + 1 + device\MK64F12\fsl_sdhc.c + + + fsl_sim.c + 1 + device\MK64F12\fsl_sim.c + + + fsl_smc.c + 1 + device\MK64F12\fsl_smc.c + + + fsl_sysmpu.c + 1 + device\MK64F12\fsl_sysmpu.c + + + fsl_uart.c + 1 + device\MK64F12\fsl_uart.c + + + fsl_uart_edma.c + 1 + device\MK64F12\fsl_uart_edma.c + + + fsl_vref.c + 1 + device\MK64F12\fsl_vref.c + + + fsl_wdog.c + 1 + device\MK64F12\fsl_wdog.c + + + system_MK64F12.c + 1 + device\system_MK64F12.c + + + startup_MK64F12.s + 2 + device\TOOLCHAIN_ARM_STD\startup_MK64F12.s @@ -723,98 +637,72 @@ clock.c 1 - ../../src/clock.c + ..\..\src\clock.c - - components.c 1 - ../../src/components.c + ..\..\src\components.c - - device.c 1 - ../../src/device.c + ..\..\src\device.c - - idle.c 1 - ../../src/idle.c + ..\..\src\idle.c - - ipc.c 1 - ../../src/ipc.c + ..\..\src\ipc.c - - irq.c 1 - ../../src/irq.c + ..\..\src\irq.c - - kservice.c 1 - ../../src/kservice.c + ..\..\src\kservice.c - - mem.c 1 - ../../src/mem.c + ..\..\src\mem.c - - mempool.c 1 - ../../src/mempool.c + ..\..\src\mempool.c - - object.c 1 - ../../src/object.c + ..\..\src\object.c - - scheduler.c 1 - ../../src/scheduler.c + ..\..\src\scheduler.c - - signal.c 1 - ../../src/signal.c + ..\..\src\signal.c - - thread.c 1 - ../../src/thread.c + ..\..\src\thread.c - - timer.c 1 - ../../src/timer.c + ..\..\src\timer.c @@ -824,35 +712,27 @@ cpuport.c 1 - ../../libcpu/arm/cortex-m4/cpuport.c + ..\..\libcpu\arm\cortex-m4\cpuport.c - - context_rvds.S 2 - ../../libcpu/arm/cortex-m4/context_rvds.S + ..\..\libcpu\arm\cortex-m4\context_rvds.S - - backtrace.c 1 - ../../libcpu/arm/common/backtrace.c + ..\..\libcpu\arm\common\backtrace.c - - div0.c 1 - ../../libcpu/arm/common/div0.c + ..\..\libcpu\arm\common\div0.c - - showmem.c 1 - ../../libcpu/arm/common/showmem.c + ..\..\libcpu\arm\common\showmem.c @@ -862,49 +742,37 @@ serial.c 1 - ../../components/drivers/serial/serial.c + ..\..\components\drivers\serial\serial.c - - completion.c 1 - ../../components/drivers/src/completion.c + ..\..\components\drivers\src\completion.c - - dataqueue.c 1 - ../../components/drivers/src/dataqueue.c + ..\..\components\drivers\src\dataqueue.c - - pipe.c 1 - ../../components/drivers/src/pipe.c + ..\..\components\drivers\src\pipe.c - - ringbuffer.c 1 - ../../components/drivers/src/ringbuffer.c + ..\..\components\drivers\src\ringbuffer.c - - waitqueue.c 1 - ../../components/drivers/src/waitqueue.c + ..\..\components\drivers\src\waitqueue.c - - workqueue.c 1 - ../../components/drivers/src/workqueue.c + ..\..\components\drivers\src\workqueue.c @@ -914,91 +782,67 @@ shell.c 1 - ../../components/finsh/shell.c + ..\..\components\finsh\shell.c - - symbol.c 1 - ../../components/finsh/symbol.c + ..\..\components\finsh\symbol.c - - cmd.c 1 - ../../components/finsh/cmd.c + ..\..\components\finsh\cmd.c - - finsh_compiler.c 1 - ../../components/finsh/finsh_compiler.c + ..\..\components\finsh\finsh_compiler.c - - finsh_error.c 1 - ../../components/finsh/finsh_error.c + ..\..\components\finsh\finsh_error.c - - finsh_heap.c 1 - ../../components/finsh/finsh_heap.c + ..\..\components\finsh\finsh_heap.c - - finsh_init.c 1 - ../../components/finsh/finsh_init.c + ..\..\components\finsh\finsh_init.c - - finsh_node.c 1 - ../../components/finsh/finsh_node.c + ..\..\components\finsh\finsh_node.c - - finsh_ops.c 1 - ../../components/finsh/finsh_ops.c + ..\..\components\finsh\finsh_ops.c - - finsh_parser.c 1 - ../../components/finsh/finsh_parser.c + ..\..\components\finsh\finsh_parser.c - - finsh_var.c 1 - ../../components/finsh/finsh_var.c + ..\..\components\finsh\finsh_var.c - - finsh_vm.c 1 - ../../components/finsh/finsh_vm.c + ..\..\components\finsh\finsh_vm.c - - finsh_token.c 1 - ../../components/finsh/finsh_token.c + ..\..\components\finsh\finsh_token.c @@ -1008,268 +852,203 @@ sys_arch.c 1 - ../../components/net/lwip-2.0.2/src/arch/sys_arch.c + ..\..\components\net\lwip-2.0.2\src\arch\sys_arch.c - - api_lib.c 1 - ../../components/net/lwip-2.0.2/src/api/api_lib.c + ..\..\components\net\lwip-2.0.2\src\api\api_lib.c - - api_msg.c 1 - ../../components/net/lwip-2.0.2/src/api/api_msg.c + ..\..\components\net\lwip-2.0.2\src\api\api_msg.c - - err.c 1 - ../../components/net/lwip-2.0.2/src/api/err.c + ..\..\components\net\lwip-2.0.2\src\api\err.c - - netbuf.c 1 - ../../components/net/lwip-2.0.2/src/api/netbuf.c + ..\..\components\net\lwip-2.0.2\src\api\netbuf.c - - netdb.c 1 - ../../components/net/lwip-2.0.2/src/api/netdb.c + ..\..\components\net\lwip-2.0.2\src\api\netdb.c - - netifapi.c 1 - ../../components/net/lwip-2.0.2/src/api/netifapi.c + ..\..\components\net\lwip-2.0.2\src\api\netifapi.c - - sockets.c 1 - ../../components/net/lwip-2.0.2/src/api/sockets.c + ..\..\components\net\lwip-2.0.2\src\api\sockets.c - - tcpip.c 1 - ../../components/net/lwip-2.0.2/src/api/tcpip.c + ..\..\components\net\lwip-2.0.2\src\api\tcpip.c - - def.c 1 - ../../components/net/lwip-2.0.2/src/core/def.c + ..\..\components\net\lwip-2.0.2\src\core\def.c - - dns.c 1 - ../../components/net/lwip-2.0.2/src/core/dns.c + ..\..\components\net\lwip-2.0.2\src\core\dns.c - - inet_chksum.c 1 - ../../components/net/lwip-2.0.2/src/core/inet_chksum.c + ..\..\components\net\lwip-2.0.2\src\core\inet_chksum.c - - init.c 1 - ../../components/net/lwip-2.0.2/src/core/init.c + ..\..\components\net\lwip-2.0.2\src\core\init.c - - ip.c 1 - ../../components/net/lwip-2.0.2/src/core/ip.c + ..\..\components\net\lwip-2.0.2\src\core\ip.c - - memp.c 1 - ../../components/net/lwip-2.0.2/src/core/memp.c + ..\..\components\net\lwip-2.0.2\src\core\memp.c - - netif.c 1 - ../../components/net/lwip-2.0.2/src/core/netif.c + ..\..\components\net\lwip-2.0.2\src\core\netif.c - - pbuf.c 1 - ../../components/net/lwip-2.0.2/src/core/pbuf.c + ..\..\components\net\lwip-2.0.2\src\core\pbuf.c - - raw.c 1 - ../../components/net/lwip-2.0.2/src/core/raw.c + ..\..\components\net\lwip-2.0.2\src\core\raw.c - - stats.c 1 - ../../components/net/lwip-2.0.2/src/core/stats.c + ..\..\components\net\lwip-2.0.2\src\core\stats.c - - sys.c 1 - ../../components/net/lwip-2.0.2/src/core/sys.c + ..\..\components\net\lwip-2.0.2\src\core\sys.c - - tcp.c 1 - ../../components/net/lwip-2.0.2/src/core/tcp.c + ..\..\components\net\lwip-2.0.2\src\core\tcp.c - - tcp_in.c 1 - ../../components/net/lwip-2.0.2/src/core/tcp_in.c + ..\..\components\net\lwip-2.0.2\src\core\tcp_in.c - - tcp_out.c 1 - ../../components/net/lwip-2.0.2/src/core/tcp_out.c + ..\..\components\net\lwip-2.0.2\src\core\tcp_out.c - - timeouts.c 1 - ../../components/net/lwip-2.0.2/src/core/timeouts.c + ..\..\components\net\lwip-2.0.2\src\core\timeouts.c - - udp.c 1 - ../../components/net/lwip-2.0.2/src/core/udp.c + ..\..\components\net\lwip-2.0.2\src\core\udp.c - - ethernet.c 1 - ../../components/net/lwip-2.0.2/src/netif/ethernet.c + ..\..\components\net\lwip-2.0.2\src\netif\ethernet.c - - ethernetif.c 1 - ../../components/net/lwip-2.0.2/src/netif/ethernetif.c + ..\..\components\net\lwip-2.0.2\src\netif\ethernetif.c - - lowpan6.c 1 - ../../components/net/lwip-2.0.2/src/netif/lowpan6.c + ..\..\components\net\lwip-2.0.2\src\netif\lowpan6.c - - autoip.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/autoip.c + ..\..\components\net\lwip-2.0.2\src\core\ipv4\autoip.c - - dhcp.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/dhcp.c + ..\..\components\net\lwip-2.0.2\src\core\ipv4\dhcp.c - - etharp.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/etharp.c + ..\..\components\net\lwip-2.0.2\src\core\ipv4\etharp.c - - icmp.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/icmp.c + ..\..\components\net\lwip-2.0.2\src\core\ipv4\icmp.c - - igmp.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/igmp.c + ..\..\components\net\lwip-2.0.2\src\core\ipv4\igmp.c - - ip4.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/ip4.c + ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4.c - - ip4_addr.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/ip4_addr.c + ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_addr.c - - ip4_frag.c 1 - ../../components/net/lwip-2.0.2/src/core/ipv4/ip4_frag.c + ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_frag.c + + ::CMSIS + + - + - + - + - + +
diff --git a/bsp/frdm-k64f/rtconfig.py b/bsp/frdm-k64f/rtconfig.py index ff874e791e..1f4d8d246e 100644 --- a/bsp/frdm-k64f/rtconfig.py +++ b/bsp/frdm-k64f/rtconfig.py @@ -63,7 +63,7 @@ elif PLATFORM == 'armcc': LINK = 'armlink' TARGET_EXT = 'axf' - DEVICE = ' --device DARMSTM' + DEVICE = ' --cpu Cortex-M4.fp ' CFLAGS = DEVICE + ' --apcs=interwork' AFLAGS = DEVICE LFLAGS = DEVICE + ' --info sizes --info totals --info unused --info veneers --list rtthread-k64f.map --scatter MK64F.sct' diff --git a/bsp/frdm-k64f/template.uvprojx b/bsp/frdm-k64f/template.uvprojx index ac684902ab..cbc80c689e 100644 --- a/bsp/frdm-k64f/template.uvprojx +++ b/bsp/frdm-k64f/template.uvprojx @@ -14,8 +14,8 @@ MK64FN1M0xxx12 NXP - Keil.Kinetis_K60_DFP.1.5.0 - http://www.keil.com/pack/ + NXP.MK64F12_DFP.10.0.4 + http://mcuxpresso.nxp.com/cmsis_pack/repo/ IRAM(0x20000000,0x00030000) IRAM2(0x1FFF0000,0x00010000) IROM(0x00000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -206,8 +206,8 @@ 0 0 0 - 1 - 0 + 0 + 1 0 @@ -296,13 +296,13 @@ 0 - 0x20000000 - 0x30000 + 0x1fff0000 + 0x10000 0 - 0x1fff0000 - 0x10000 + 0x20000000 + 0x30000