From f6b49e7318fb9579c70a0b25b727f82b61e32efc Mon Sep 17 00:00:00 2001 From: BernardXiong Date: Sun, 31 Dec 2017 23:00:39 +0800 Subject: [PATCH] [BSP] Update to IRAM2 in frdm-k64f --- bsp/frdm-k64f/applications/startup.c | 4 +- bsp/frdm-k64f/board/board.h | 4 +- bsp/frdm-k64f/project.uvproj | 344 +++++---------------------- bsp/frdm-k64f/template.uvproj | 4 +- 4 files changed, 65 insertions(+), 291 deletions(-) diff --git a/bsp/frdm-k64f/applications/startup.c b/bsp/frdm-k64f/applications/startup.c index 53c755cbf7..430cf0f0bc 100644 --- a/bsp/frdm-k64f/applications/startup.c +++ b/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")) diff --git a/bsp/frdm-k64f/board/board.h b/bsp/frdm-k64f/board/board.h index edb3281199..fca6fd0ce2 100644 --- a/bsp/frdm-k64f/board/board.h +++ b/bsp/frdm-k64f/board/board.h @@ -23,8 +23,8 @@ // Internal SRAM memory size[Kbytes] <8-64> // 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 diff --git a/bsp/frdm-k64f/project.uvproj b/bsp/frdm-k64f/project.uvproj index adeb30d706..38dd4a8bda 100644 --- a/bsp/frdm-k64f/project.uvproj +++ b/bsp/frdm-k64f/project.uvproj @@ -1,7 +1,10 @@ + 1.1 +
### uVision Project, (C) Keil Software
+ RT-Thread @@ -12,26 +15,26 @@ MK64FN1M0xxx12 Freescale Semiconductor IRAM(0x1FFF0000-0x1FFFFFFF) IRAM2(0x20000000-0x2002FFFF) IROM(0x0-0xFFFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") FPU2 ELITTLE - + "STARTUP\Freescale\Kinetis\startup_MK64F12.s" ("Freescale MK64Xxxxxxx12 Startup Code") UL2CM3(-O2511 -S0 -C0 -FO15 -FD20000000 -FC4000 -FN1 -FF0MK_P1M0 -FS00 -FL0100000) 7425 MK64F12.H - - - - - - - - - + + + + + + + + + SFD\Freescale\Kinetis\MK64F12.sfr 0 0 - - - + + + Freescale\Kinetis\ Freescale\Kinetis\ @@ -55,8 +58,8 @@ 0 0 - - + + 0 0 0 @@ -65,21 +68,21 @@ 0 0 - - + + 0 0 0 0 - - + + 0 0 0 - + 0 @@ -93,17 +96,17 @@ 0 0 3 - - + + 1 SARMCM3.DLL - + DCM.DLL -pCM4 SARMCM3.DLL - + TCM.DLL -pCM4 @@ -143,18 +146,18 @@ 0 6 - - - - - + + + + + - - - - - + + + + + Segger\JL2CM3.dll @@ -170,10 +173,10 @@ 1 BIN\UL2CM3.DLL "" () - - - - + + + + 0 @@ -206,7 +209,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -238,8 +241,8 @@ 0 0 0 - 1 - 0 + 0 + 1 0 @@ -337,7 +340,7 @@ 0x30000 - + 1 @@ -353,12 +356,12 @@ 0 0 0 - 0 + 1 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 @@ -373,10 +376,10 @@ 0 0 - - - - + + + + @@ -388,13 +391,13 @@ 0 0x00000000 0x1FFF0000 - - - - + + + + --keep *.o(.rti_fn.*) --keep *.o(FSymTab) --keep *.o(VSymTab) - - + + @@ -407,274 +410,196 @@ 1 device/MK64F12/fsl_adc16.c - - fsl_clock.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 @@ -690,36 +615,26 @@ 1 board/board.c - - clock_config.c 1 board/clock_config.c - - drv_uart.c 1 board/drv_uart.c - - led.c 1 board/led.c - - drv_emac.c 1 board/drv_emac.c - - fsl_phy.c 1 @@ -735,8 +650,6 @@ 1 applications/application.c - - startup.c 1 @@ -752,92 +665,66 @@ 1 ../../src/clock.c - - components.c 1 ../../src/components.c - - device.c 1 ../../src/device.c - - idle.c 1 ../../src/idle.c - - ipc.c 1 ../../src/ipc.c - - irq.c 1 ../../src/irq.c - - kservice.c 1 ../../src/kservice.c - - mem.c 1 ../../src/mem.c - - mempool.c 1 ../../src/mempool.c - - object.c 1 ../../src/object.c - - scheduler.c 1 ../../src/scheduler.c - - signal.c 1 ../../src/signal.c - - thread.c 1 ../../src/thread.c - - timer.c 1 @@ -853,29 +740,21 @@ 1 ../../libcpu/arm/cortex-m4/cpuport.c - - context_rvds.S 2 ../../libcpu/arm/cortex-m4/context_rvds.S - - backtrace.c 1 ../../libcpu/arm/common/backtrace.c - - div0.c 1 ../../libcpu/arm/common/div0.c - - showmem.c 1 @@ -891,43 +770,31 @@ 1 ../../components/drivers/serial/serial.c - - completion.c 1 ../../components/drivers/src/completion.c - - dataqueue.c 1 ../../components/drivers/src/dataqueue.c - - pipe.c 1 ../../components/drivers/src/pipe.c - - ringbuffer.c 1 ../../components/drivers/src/ringbuffer.c - - waitqueue.c 1 ../../components/drivers/src/waitqueue.c - - workqueue.c 1 @@ -943,85 +810,61 @@ 1 ../../components/finsh/shell.c - - symbol.c 1 ../../components/finsh/symbol.c - - cmd.c 1 ../../components/finsh/cmd.c - - finsh_compiler.c 1 ../../components/finsh/finsh_compiler.c - - finsh_error.c 1 ../../components/finsh/finsh_error.c - - finsh_heap.c 1 ../../components/finsh/finsh_heap.c - - finsh_init.c 1 ../../components/finsh/finsh_init.c - - finsh_node.c 1 ../../components/finsh/finsh_node.c - - finsh_ops.c 1 ../../components/finsh/finsh_ops.c - - finsh_parser.c 1 ../../components/finsh/finsh_parser.c - - finsh_var.c 1 ../../components/finsh/finsh_var.c - - finsh_vm.c 1 ../../components/finsh/finsh_vm.c - - finsh_token.c 1 @@ -1037,246 +880,176 @@ 1 ../../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 - - api_msg.c 1 ../../components/net/lwip-2.0.2/src/api/api_msg.c - - err.c 1 ../../components/net/lwip-2.0.2/src/api/err.c - - netbuf.c 1 ../../components/net/lwip-2.0.2/src/api/netbuf.c - - netdb.c 1 ../../components/net/lwip-2.0.2/src/api/netdb.c - - netifapi.c 1 ../../components/net/lwip-2.0.2/src/api/netifapi.c - - sockets.c 1 ../../components/net/lwip-2.0.2/src/api/sockets.c - - tcpip.c 1 ../../components/net/lwip-2.0.2/src/api/tcpip.c - - def.c 1 ../../components/net/lwip-2.0.2/src/core/def.c - - dns.c 1 ../../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 - - init.c 1 ../../components/net/lwip-2.0.2/src/core/init.c - - ip.c 1 ../../components/net/lwip-2.0.2/src/core/ip.c - - memp.c 1 ../../components/net/lwip-2.0.2/src/core/memp.c - - netif.c 1 ../../components/net/lwip-2.0.2/src/core/netif.c - - pbuf.c 1 ../../components/net/lwip-2.0.2/src/core/pbuf.c - - raw.c 1 ../../components/net/lwip-2.0.2/src/core/raw.c - - stats.c 1 ../../components/net/lwip-2.0.2/src/core/stats.c - - sys.c 1 ../../components/net/lwip-2.0.2/src/core/sys.c - - tcp.c 1 ../../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 - - tcp_out.c 1 ../../components/net/lwip-2.0.2/src/core/tcp_out.c - - timeouts.c 1 ../../components/net/lwip-2.0.2/src/core/timeouts.c - - udp.c 1 ../../components/net/lwip-2.0.2/src/core/udp.c - - ethernet.c 1 ../../components/net/lwip-2.0.2/src/netif/ethernet.c - - ethernetif.c 1 ../../components/net/lwip-2.0.2/src/netif/ethernetif.c - - lowpan6.c 1 ../../components/net/lwip-2.0.2/src/netif/lowpan6.c - - autoip.c 1 ../../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 - - etharp.c 1 ../../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 - - igmp.c 1 ../../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 - - ip4_addr.c 1 ../../components/net/lwip-2.0.2/src/core/ipv4/ip4_addr.c - - ip4_frag.c 1 @@ -1287,4 +1060,5 @@ + diff --git a/bsp/frdm-k64f/template.uvproj b/bsp/frdm-k64f/template.uvproj index 30effdb247..f3f430d971 100644 --- a/bsp/frdm-k64f/template.uvproj +++ b/bsp/frdm-k64f/template.uvproj @@ -241,8 +241,8 @@ 0 0 0 - 1 - 0 + 0 + 1 0