libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1439 from Guozhanxin/imx1050 

[BSP][RT1050] fix EVK .scf issue. | 修复 官方板分散加载文件问题.
This commit is contained in:
Tanek 2018-05-20 15:04:24 +08:00 committed by GitHub
parent 1ad1bd3c37 3a3187933d
commit a99b09658e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bsp/imxrt1052-evk/Kconfig
View File

@ -23,20 +23,32 @@ config SOC_IMXRT1052
select ARCH_ARM_CORTEX_M7 select ARCH_ARM_CORTEX_M7
default y default y
config BOARD_USING_HYPERFLASH
bool
default n
config BOARD_USING_QSPIFLASH
bool
default n
# RT1050 board select! # RT1050 board select!
choice choice
prompt "RT1050 Board select" prompt "RT1050 Board select"
default BOARD_RT1050_EVK default BOARD_RT1050_EVK
config BOARD_RT1050_EVK config BOARD_RT1050_EVK
bool "RT1050_EVK" bool "RT1050_EVK"
select BOARD_USING_HYPERFLASH
config BOARD_RT1050_FIRE config BOARD_RT1050_FIRE
bool "RT1050_FIRE" bool "RT1050_FIRE"
select BOARD_USING_QSPIFLASH
config BOARD_RT1050_ShareBoard config BOARD_RT1050_ShareBoard
bool "RT1050_ShareBoard" bool "RT1050_ShareBoard"
select BOARD_USING_QSPIFLASH
config BOARD_RT1050_ATK config BOARD_RT1050_ATK
bool "RT1050_ATK" bool "RT1050_ATK"
select BOARD_USING_QSPIFLASH
config BOARD_RT1050_SeeedStudio config BOARD_RT1050_SeeedStudio
bool "RT1050_SeeedStudio" bool "RT1050_SeeedStudio"
select BOARD_USING_HYPERFLASH
endchoice endchoice
menu "RT1050 Bsp Config" menu "RT1050 Bsp Config"

4
bsp/imxrt1052-evk/Libraries/arm/MIMXRT1052xxxxx_flexspi_nor.scf
View File

@ -73,7 +73,9 @@
#define Heap_Size 0x0400 #define Heap_Size 0x0400
#endif #endif
#if (defined(BOARD_RT1050_EVK)) || (defined(BOARD_RT1050_SeeedStudio)) #include "../../rtconfig.h"
#if (defined(BOARD_USING_HYPERFLASH))
LR_m_rom_config m_flash_config_start m_flash_config_size ; load region size_region LR_m_rom_config m_flash_config_start m_flash_config_size ; load region size_region
{ {
RW_m_config_text m_flash_config_start m_flash_config_size ; load address = execution address RW_m_config_text m_flash_config_start m_flash_config_size ; load address = execution address

1
bsp/imxrt1052-evk/rtconfig.h
View File

@ -192,6 +192,7 @@
/* example package: hello */ /* example package: hello */
#define SOC_IMXRT1052 #define SOC_IMXRT1052
#define BOARD_USING_HYPERFLASH
#define BOARD_RT1050_EVK #define BOARD_RT1050_EVK
/* RT1050 Bsp Config */ /* RT1050 Bsp Config */

4
bsp/imxrt1052-evk/xip/SConscript
View File

@ -2,7 +2,7 @@ Import('RTT_ROOT')
Import('rtconfig') Import('rtconfig')
from building import * from building import *
if GetDepend('BOARD_RT1050_EVK') or GetDepend('BOARD_RT1050_SeeedStudio'): if GetDepend('BOARD_USING_HYPERFLASH'):
cwd = GetCurrentDir() cwd = GetCurrentDir()
src = Glob('*.c') src = Glob('*.c')
CPPPATH = [cwd] CPPPATH = [cwd]
@ -18,6 +18,6 @@ if GetDepend('BOARD_RT1050_EVK') or GetDepend('BOARD_RT1050_SeeedStudio'):
group = DefineGroup('xip', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS) group = DefineGroup('xip', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS)
Return('group') Return('group')
if GetDepend('BOARD_RT1050_FIRE') or GetDepend('BOARD_RT1050_ATK') or GetDepend('RT1050_ShareBoard'): if GetDepend('BOARD_USING_QSPIFLASH'):
group = [] group = []
Return('group') Return('group')