diff options
| author | Meco Man <[email protected]> | 2020-12-28 04:13:25 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-28 04:13:25 -0600 |
| commit | 3bca2cfb418f03c529fc8563b62c19d391caf90b (patch) | |
| tree | 469dbaebaa3325f64e59b71b4063f135bb6fdfd8 /bsp/stm32 | |
| parent | 84a5f96453ee2719695b719142af08b7a51b623d (diff) | |
| parent | 936db0e396f286a7f493cdadb698cf9340a82448 (diff) | |
Merge pull request #7 from RT-Thread/master
pr
Diffstat (limited to 'bsp/stm32')
37 files changed, 149 insertions, 156 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c b/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c index a6723f8a70..b093516ca5 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c @@ -9,6 +9,7 @@ * 2020-10-14 Dozingfiretruck Porting for stm32wbxx * 2020-11-26 thread-liu add hash * 2020-11-26 thread-liu add cryp + * 2020-12-11 WKJay fix build problem */ #include <rtthread.h> @@ -628,6 +629,7 @@ static void _crypto_reset(struct rt_hwcrypto_ctx *ctx) } } +#if defined(HASH2_IN_DMA_INSTANCE) void HASH2_DMA_IN_IRQHandler(void) { extern DMA_HandleTypeDef hdma_hash_in; @@ -640,7 +642,9 @@ void HASH2_DMA_IN_IRQHandler(void) /* leave interrupt */ rt_interrupt_leave(); } +#endif +#if defined(CRYP2_IN_DMA_INSTANCE) void CRYP2_DMA_IN_IRQHandler(void) { extern DMA_HandleTypeDef hdma_cryp_in; @@ -653,7 +657,9 @@ void CRYP2_DMA_IN_IRQHandler(void) /* leave interrupt */ rt_interrupt_leave(); } +#endif +#if defined (CRYP2_OUT_DMA_INSTANCE) void CRYP2_DMA_OUT_IRQHandler(void) { extern DMA_HandleTypeDef hdma_cryp_out; @@ -666,6 +672,7 @@ void CRYP2_DMA_OUT_IRQHandler(void) /* leave interrupt */ rt_interrupt_leave(); } +#endif static const struct rt_hwcrypto_ops _ops = { diff --git a/bsp/stm32/libraries/STM32F0xx_HAL/SConscript b/bsp/stm32/libraries/STM32F0xx_HAL/SConscript index 0149cd46f2..83a63eae5e 100644 --- a/bsp/stm32/libraries/STM32F0xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F0xx_HAL/SConscript @@ -81,6 +81,6 @@ path = [cwd + '/CMSIS/Device/ST/STM32F0xx/Include', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/SConscript b/bsp/stm32/libraries/STM32F1xx_HAL/SConscript index ff87a4aa25..36c204e860 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F1xx_HAL/SConscript @@ -87,6 +87,6 @@ path = [cwd + '/CMSIS/Device/ST/STM32F1xx/Include', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32F2xx_HAL/SConscript b/bsp/stm32/libraries/STM32F2xx_HAL/SConscript index b69484d566..37aee93257 100644 --- a/bsp/stm32/libraries/STM32F2xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F2xx_HAL/SConscript @@ -82,6 +82,6 @@ path = [cwd + '/CMSIS/Device/ST/STM32F2xx/Include', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32F4xx_HAL/SConscript b/bsp/stm32/libraries/STM32F4xx_HAL/SConscript index df2d854c29..00db00252b 100644 --- a/bsp/stm32/libraries/STM32F4xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F4xx_HAL/SConscript @@ -113,6 +113,6 @@ path = [cwd + '/STM32F4xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32F7xx_HAL/SConscript b/bsp/stm32/libraries/STM32F7xx_HAL/SConscript index 096cba78c7..50ec582b66 100644 --- a/bsp/stm32/libraries/STM32F7xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F7xx_HAL/SConscript @@ -105,7 +105,7 @@ path = [cwd + '/STM32F7xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32G0xx_HAL/SConscript b/bsp/stm32/libraries/STM32G0xx_HAL/SConscript index 3d712c5d0b..c2ffc079f7 100644 --- a/bsp/stm32/libraries/STM32G0xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32G0xx_HAL/SConscript @@ -60,6 +60,6 @@ path = [cwd + '/STM32G0xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32G4xx_HAL/SConscript b/bsp/stm32/libraries/STM32G4xx_HAL/SConscript index d367a99fc3..025acb8c57 100644 --- a/bsp/stm32/libraries/STM32G4xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32G4xx_HAL/SConscript @@ -110,6 +110,6 @@ path = [cwd + '/STM32G4xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32H7xx_HAL/SConscript b/bsp/stm32/libraries/STM32H7xx_HAL/SConscript index 7e4817c62a..52b622b25e 100644 --- a/bsp/stm32/libraries/STM32H7xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32H7xx_HAL/SConscript @@ -109,7 +109,7 @@ path = [cwd + '/STM32H7xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32L0xx_HAL/SConscript b/bsp/stm32/libraries/STM32L0xx_HAL/SConscript index 84d5daca28..4da0214df9 100644 --- a/bsp/stm32/libraries/STM32L0xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32L0xx_HAL/SConscript @@ -88,6 +88,6 @@ path = [cwd + '/STM32L0xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/SConscript b/bsp/stm32/libraries/STM32L1xx_HAL/SConscript index 199d58696d..4dcd76b906 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32L1xx_HAL/SConscript @@ -77,6 +77,6 @@ path = [cwd + '/CMSIS/Device/ST/STM32L1xx/Include', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32L4xx_HAL/SConscript b/bsp/stm32/libraries/STM32L4xx_HAL/SConscript index 46b9aa7bf7..d3e360ddac 100644 --- a/bsp/stm32/libraries/STM32L4xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32L4xx_HAL/SConscript @@ -117,6 +117,6 @@ path = [cwd + '/STM32L4xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32MPxx_HAL/SConscript b/bsp/stm32/libraries/STM32MPxx_HAL/SConscript index 9e1d85e005..a991e588d0 100644 --- a/bsp/stm32/libraries/STM32MPxx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32MPxx_HAL/SConscript @@ -104,10 +104,6 @@ if GetDepend(['BSP_USING_DFSDM']): src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_dfsdm.c'] src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_dfsdm_ex.c'] -if GetDepend(['BSP_USING_SDMMC']): - src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_ll_sdmmc.c'] - src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_sd.c'] - if GetDepend(['BSP_USING_HASH']): src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_hash.c'] src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_hash_ex.c'] @@ -129,6 +125,6 @@ path = [cwd + '/STM32MP1xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32WBxx_HAL/SConscript b/bsp/stm32/libraries/STM32WBxx_HAL/SConscript index d2f47a473d..e4fe5d3259 100644 --- a/bsp/stm32/libraries/STM32WBxx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32WBxx_HAL/SConscript @@ -84,6 +84,6 @@ path = [cwd + '/STM32WBxx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript b/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript index f65574f8c4..618e45d87a 100644 --- a/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript +++ b/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd, str(Dir('#'))] -group = DefineGroup('touch', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript b/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript index f65574f8c4..618e45d87a 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript +++ b/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd, str(Dir('#'))] -group = DefineGroup('touch', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/stm32/stm32f746-st-disco/rtconfig.py b/bsp/stm32/stm32f746-st-disco/rtconfig.py index 32cb0dd9d4..de934eeac7 100644 --- a/bsp/stm32/stm32f746-st-disco/rtconfig.py +++ b/bsp/stm32/stm32f746-st-disco/rtconfig.py @@ -42,7 +42,7 @@ if PLATFORM == 'gcc': OBJCPY = PREFIX + 'objcopy' STRIP = PREFIX + 'strip' - DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv5-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections' + DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv5-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections' CFLAGS = DEVICE + ' -g -Wall' AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb ' LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/link.lds' diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript index 51c6e3b601..e57bdc9e77 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript @@ -15,6 +15,6 @@ if rtconfig.CROSS_TOOL == 'gcc': elif rtconfig.CROSS_TOOL == 'keil': LOCAL_CCFLAGS += ' --c99' -group = DefineGroup('fal', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS) +group = DefineGroup('FAL', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS) Return('group') diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c b/bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c index 2ddf367caa..3a6fac25d7 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c +++ b/bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c @@ -74,10 +74,10 @@ void HAL_MspInit(void) /* System interrupt init*/ /* USER CODE BEGIN MspInit 1 */ -#if !defined(BSP_USING_OPENAMP) - __HAL_RCC_SYSRAM_CLK_ENABLE(); - __HAL_RCC_RETRAM_CLK_ENABLE(); -#endif + if (IS_ENGINEERING_BOOT_MODE()) + { + __HAL_RCC_SYSRAM_CLK_ENABLE(); + } HAL_NVIC_SetPriority(RCC_WAKEUP_IRQn, 0, 0); HAL_NVIC_EnableIRQ(RCC_WAKEUP_IRQn); diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/board.h b/bsp/stm32/stm32mp157a-st-discovery/board/board.h index 18cab2141c..2472d96400 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/board.h +++ b/bsp/stm32/stm32mp157a-st-discovery/board/board.h @@ -23,23 +23,22 @@ extern "C" { #endif #define STM32_FLASH_START_ADRESS ((uint32_t)0x10000000) -#if defined(BSP_USING_OPENAMP) -#define STM32_FLASH_SIZE (64 * 1024) -#else -#define STM32_FLASH_SIZE (256 * 1024) -#endif +#define STM32_FLASH_SIZE (192 * 1024) #define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE)) + +#define STM32_SRAM_SIZE (64) +#define STM32_SRAM_END (0x10030000 + 64 * 1024) - -#if defined(BSP_USING_OPENAMP) -#define STM32_SRAM_BEGIN (uint32_t)0x10030000 +#if defined(__CC_ARM) || defined(__CLANG_ARM) +extern int Image$$RW_IRAM1$$ZI$$Limit; +#define HEAP_BEGIN (&Image$$RW_IRAM1$$ZI$$Limit) +#elif __ICCARM__ +#pragma section="CSTACK" +#define HEAP_BEGIN (__segment_end("CSTACK")) #else -#define STM32_SRAM_BEGIN (uint32_t)0x2FFF0000 +extern int __bss_end; +#define HEAP_BEGIN (&__bss_end) #endif -#define STM32_SRAM_SIZE (64) -#define STM32_SRAM_END (STM32_SRAM_BEGIN + (STM32_SRAM_SIZE * 1024)) - -#define HEAP_BEGIN STM32_SRAM_BEGIN #define HEAP_END STM32_SRAM_END void SystemClock_Config(void); @@ -51,4 +50,3 @@ extern void _Error_Handler(char *s, int num); #endif #endif - diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/linker_scripts/link.sct b/bsp/stm32/stm32mp157a-st-discovery/board/linker_scripts/link.sct index df7bcadf06..a64b8cc98b 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/linker_scripts/link.sct +++ b/bsp/stm32/stm32mp157a-st-discovery/board/linker_scripts/link.sct @@ -8,28 +8,20 @@ LR_VECTORS 0x00000000 0x00000400 { ; load region size_region } } -LR_IROM1 0x10000000 0x00020000 { ; load region size_region - ER_IROM1 0x10000000 0x00020000 { ; load address = execution address +LR_IROM1 0x10000000 0x00030000 { ; load region size_region + ER_IROM1 0x10000000 0x00030000 { ; load address = execution address *(InRoot$$Sections) .ANY (+RO) .ANY (+XO) } - RW_IRAM1 0x10020000 0x00050000 { ; RW data + RW_IRAM1 0x10030000 0x00010000 { ; RW data .ANY (+RW +ZI) } -; RW_IRAM2 0x10020000 0x00020000 { ; RW data -; .ANY (+RW +ZI) -; } -; RW_IRAM3 0x10040000 0x00010000 { ; RW data -; .ANY (+RW +ZI) -; } -; RW_IRAM4 0x10050000 0x00010000 { ; RW data -; .ANY (+RW +ZI) -; } -; ***** To uncomment these 4 lines if OPENAMP used ***** -; *** Create region for OPENAMP *** + + +; ***** Create region for OPENAMP ***** +; *** These 4 lines can be commented if OPENAMP is not used ***** .resource_table +0 ALIGN 4 { ; resource table *(.resource_table) - } - __OpenAMP_SHMEM__ 0x10050000 EMPTY 0x8000 {} ; Shared Memory area used by OpenAMP + } __OpenAMP_SHMEM__ 0x10040000 EMPTY 0x8000 {} ; Shared Memory area used by OpenAMP } diff --git a/bsp/stm32/stm32mp157a-st-discovery/template.uvoptx b/bsp/stm32/stm32mp157a-st-discovery/template.uvoptx index cd7d5cc09b..b43797349c 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/template.uvoptx +++ b/bsp/stm32/stm32mp157a-st-discovery/template.uvoptx @@ -10,7 +10,7 @@ <aExt>*.s*; *.src; *.a*</aExt> <oExt>*.obj; *.o</oExt> <lExt>*.lib</lExt> - <tExt>*.txt; *.h; *.inc</tExt> + <tExt>*.txt; *.h; *.inc; *.md</tExt> <pExt>*.plm</pExt> <CppX>*.cpp</CppX> <nMigrate>0</nMigrate> @@ -125,7 +125,7 @@ <SetRegEntry> <Number>0</Number> <Key>ST-LINKIII-KEIL_SWO</Key> - <Name>-U066DFF343339415043182234 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10020000 -FC1000 -FN0</Name> + <Name>-U0666FF343339415043182420 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10030000 -FC1000 -FN0</Name> </SetRegEntry> </TargetDriverDllRegistry> <Breakpoint/> diff --git a/bsp/stm32/stm32mp157a-st-discovery/template.uvprojx b/bsp/stm32/stm32mp157a-st-discovery/template.uvprojx index bc7e6847ac..8c076e73ef 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/template.uvprojx +++ b/bsp/stm32/stm32mp157a-st-discovery/template.uvprojx @@ -276,7 +276,7 @@ <OCR_RVCT4> <Type>1</Type> <StartAddress>0x10000000</StartAddress> - <Size>0x20000</Size> + <Size>0x30000</Size> </OCR_RVCT4> <OCR_RVCT5> <Type>1</Type> @@ -300,8 +300,8 @@ </OCR_RVCT8> <OCR_RVCT9> <Type>0</Type> - <StartAddress>0x10020000</StartAddress> - <Size>0x20000</Size> + <StartAddress>0x10030000</StartAddress> + <Size>0x10000</Size> </OCR_RVCT9> <OCR_RVCT10> <Type>0</Type> @@ -397,11 +397,6 @@ <Layers> <Layer> <LayName><Project Info></LayName> - <LayDesc></LayDesc> - <LayUrl></LayUrl> - <LayKeys></LayKeys> - <LayCat></LayCat> - <LayLic></LayLic> <LayTarg>0</LayTarg> <LayPrjMark>1</LayPrjMark> </Layer> diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c b/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c index 6442f98075..20f6aa2d63 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c @@ -81,10 +81,10 @@ void HAL_MspInit(void) /* System interrupt init*/ /* USER CODE BEGIN MspInit 1 */ -#if !defined(BSP_USING_OPENAMP) - __HAL_RCC_SYSRAM_CLK_ENABLE(); - __HAL_RCC_RETRAM_CLK_ENABLE(); -#endif + if (IS_ENGINEERING_BOOT_MODE()) + { + __HAL_RCC_SYSRAM_CLK_ENABLE(); + } HAL_NVIC_SetPriority(RCC_WAKEUP_IRQn, 0, 0); HAL_NVIC_EnableIRQ(RCC_WAKEUP_IRQn); diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig b/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig index d049daa951..6745682708 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig +++ b/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig @@ -60,13 +60,13 @@ menu "Onboard Peripheral Drivers" select RT_USING_SDIO select RT_USING_DFS select RT_USING_DFS_ELMFAT - select BSP_USING_PMIC if BSP_USING_SDMMC - menuconfig BSP_USING_SD_CARD + menuconfig BSP_USING_SDCARD bool "Enable sd card" + select BSP_USING_PMIC default n - if BSP_USING_SD_CARD - config SD_USING_DFS + if BSP_USING_SDCARD + config BSP_USING_SDCARD_FS bool "sd card fatfs" default y endif @@ -75,9 +75,9 @@ menu "Onboard Peripheral Drivers" bool "Enable eMMC (32 Gbits)" default n if BSP_USING_EMMC - config EMMC_USING_DFS + config BSP_USING_EMMC_FS bool "emmc card fatfs" - default n + default y endif endif @@ -86,7 +86,7 @@ menu "Onboard Peripheral Drivers" select RT_USING_AUDIO select BSP_USING_PMIC select BSP_USING_SDMMC - select BSP_USING_SD_CARD + select BSP_USING_SDCARD select SD_USING_DFS select BSP_USING_I2C select BSP_USING_I2C2 @@ -96,6 +96,8 @@ menu "Onboard Peripheral Drivers" bool "Enable CAMERA (ov5640)" select BSP_USING_MFX select BSP_USING_PMIC + select BSP_USING_SDMMC + select BSP_USING_SDCARD select BSP_USING_I2C select BSP_USING_I2C2 default n diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/SConscript b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript index 0082bddaae..61c1a8029c 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/SConscript +++ b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript @@ -25,7 +25,7 @@ if GetDepend(['BSP_USING_NAND']): if GetDepend(['BSP_USING_GBE']): src += Glob('ports/eth/drv_eth.c') -if GetDepend(['BSP_USING_SD_CARD']): +if GetDepend(['BSP_USING_SDCARD']): src += Glob('ports/drv_sdcard.c') if GetDepend(['BSP_USING_EMMC']): diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/board.c b/bsp/stm32/stm32mp157a-st-ev1/board/board.c index 0a7bda208a..362250de22 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/board.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/board.c @@ -12,6 +12,7 @@ #include "board.h" +void PeriphCommonClock_Config(void); /** * @brief System Clock Configuration * @retval None @@ -124,6 +125,12 @@ void SystemClock_Config(void) /**Set the HSE division factor for RTC clock */ __HAL_RCC_RTC_HSEDIV(24); + + /* Configure the peripherals common clocks */ + if(IS_ENGINEERING_BOOT_MODE()) + { + PeriphCommonClock_Config(); + } } diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/board.h b/bsp/stm32/stm32mp157a-st-ev1/board/board.h index 81cdaa92fb..334eea4f5c 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/board.h +++ b/bsp/stm32/stm32mp157a-st-ev1/board/board.h @@ -23,18 +23,23 @@ extern "C" { #endif #define STM32_FLASH_START_ADRESS ((uint32_t)0x10000000) -#define STM32_FLASH_SIZE (191 * 1024) +#define STM32_FLASH_SIZE (192 * 1024) #define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE)) -#if defined(BSP_USING_OPENAMP) -#define STM32_SRAM_BEGIN (uint32_t)0x10030000 + +#define STM32_SRAM_SIZE (64) +#define STM32_SRAM_END (0x10030000 + 64 * 1024) + +#if defined(__CC_ARM) || defined(__CLANG_ARM) +extern int Image$$RW_IRAM1$$ZI$$Limit; +#define HEAP_BEGIN (&Image$$RW_IRAM1$$ZI$$Limit) +#elif __ICCARM__ +#pragma section="CSTACK" +#define HEAP_BEGIN (__segment_end("CSTACK")) #else -#define STM32_SRAM_BEGIN (uint32_t)0x2FFF0000 +extern int __bss_end; +#define HEAP_BEGIN (&__bss_end) #endif -#define STM32_SRAM_SIZE (64) -#define STM32_SRAM_END (STM32_SRAM_BEGIN + (STM32_SRAM_SIZE * 1024)) - -#define HEAP_BEGIN STM32_SRAM_BEGIN #define HEAP_END STM32_SRAM_END void SystemClock_Config(void); @@ -46,4 +51,3 @@ extern void _Error_Handler(char *s, int num); #endif #endif - diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/linker_scripts/link.sct b/bsp/stm32/stm32mp157a-st-ev1/board/linker_scripts/link.sct index 40d9679d17..a64b8cc98b 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/linker_scripts/link.sct +++ b/bsp/stm32/stm32mp157a-st-ev1/board/linker_scripts/link.sct @@ -8,20 +8,20 @@ LR_VECTORS 0x00000000 0x00000400 { ; load region size_region } } -LR_IROM1 0x10000000 0x00040000 { ; load region size_region - ER_IROM1 0x10000000 0x00040000 { ; load address = execution address +LR_IROM1 0x10000000 0x00030000 { ; load region size_region + ER_IROM1 0x10000000 0x00030000 { ; load address = execution address *(InRoot$$Sections) .ANY (+RO) .ANY (+XO) } - RW_IRAM1 0x10050000 0x00010000 { ; RW data + RW_IRAM1 0x10030000 0x00010000 { ; RW data .ANY (+RW +ZI) } -;; ***** Create region for OPENAMP ***** -;; *** These 4 lines can be commented if OPENAMP is not used ***** -; .resource_table +0 ALIGN 4 { ; resource table -; *(.resource_table) -; } __OpenAMP_SHMEM__ 0x10040000 EMPTY 0x8000 {} ; Shared Memory area used by OpenAMP +; ***** Create region for OPENAMP ***** +; *** These 4 lines can be commented if OPENAMP is not used ***** + .resource_table +0 ALIGN 4 { ; resource table + *(.resource_table) + } __OpenAMP_SHMEM__ 0x10040000 EMPTY 0x8000 {} ; Shared Memory area used by OpenAMP } diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c index c348751881..38678dbdce 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c @@ -18,34 +18,34 @@ #define LOG_TAG "drv.dfsdm" #include <drv_log.h> -#define FILTER_FIFO_SIZE (1024) +#define FILTER_FIFO_SIZE (1024) #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFC8000))) +__attribute__((at(0x2FFC8000))) static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE]; #elif defined ( __GNUC__ ) -__attribute__((at(0x2FFC8000))) +static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE] __attribute__((section(".Filter0Section"))); #elif defined(__ICCARM__) #pragma location = 0x2FFC8000 +__no_init static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE]; #endif -rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE]; -#define PALY_SIZE 2048 #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFCA000))) +__attribute__((at(0x2FFC9000))) static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE]; #elif defined ( __GNUC__ ) -__attribute__((at(0x2FFCA000))) +static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE] __attribute__((section(".Filter1Section"))); #elif defined(__ICCARM__) -#pragma location = 0x2FFCA000 +#pragma location = 0x2FFC9000 +__no_init static rt_int32_t FILTER1_FIFO[FILTER_FIFO_SIZE]; #endif -static rt_int16_t PLAY_BUF[PALY_SIZE]; - + +#define PALY_SIZE 2048 #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFC9000))) +__attribute__((at(0x2FFCA000))) static rt_int16_t PLAY_BUF[PALY_SIZE]; #elif defined ( __GNUC__ ) -__attribute__((at(0x2FFC9000))) +__attribute__((at(0x2FFCA000))) __attribute__((section(".DfsdmSection"))); #elif defined(__ICCARM__) -#pragma location = 0x2FFC9000 +#pragma location = 0x2FFCA000 + __no_init static rt_int16_t PLAY_BUF[PALY_SIZE]; #endif -rt_int32_t FILTER1_FIFO[FILTER_FIFO_SIZE]; static volatile rt_uint8_t DmaLeftRecBuffCplt = 0; static volatile rt_uint8_t DmaRightRecBuffCplt = 0; diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c index f7d4eeffc2..54af52e5e0 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c @@ -49,13 +49,14 @@ struct rthw_sdio }; #define EMMC_BUFF_SIZE 4096 +#define EMMC_BUFF_ADDR 0x2FFCB000 #if defined(__CC_ARM) || defined(__CLANG_ARM) -rt_uint8_t cache_buf[SDIO_BUFF_SIZE] __attribute__((at(0x2FFCB000))); -#elif defined(__ICCARM__) -#pragma location = 0x2FFCB000 -rt_uint8_t cache_buf[EMMC_BUFF_SIZE]; +__attribute__((at(EMMC_BUFF_ADDR))) static rt_uint8_t cache_buf[EMMC_BUFF_SIZE]; #elif defined ( __GNUC__ ) -rt_uint8_t cache_buf[SDIO_BUFF_SIZE] __attribute__((at(0x2FFCB000))); +static rt_uint8_t cache_buf[EMMC_BUFF_SIZE] __attribute__((section(".eMMCSection"))); +#elif defined(__ICCARM__) +#pragma location = EMMC_BUFF_ADDR +__no_init static rt_uint8_t cache_buf[EMMC_BUFF_SIZE]; #endif #if defined(EMMC_RX_DUMP) || defined(EMMC_TX_DUMP) @@ -558,7 +559,7 @@ int rt_hw_sdio_init(void) } INIT_DEVICE_EXPORT(rt_hw_sdio_init); -#if defined(EMMC_USING_DFS) +#if defined(BSP_USING_EMMC_FS) int mnt_init(void) { rt_device_t sd = RT_NULL; diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c index b8dada9d5a..30eb0e4ad7 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c @@ -28,23 +28,22 @@ #define JPEG_LINE_SIZE 1 * 1024 #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFCC000))) +__attribute__((at(0x2FFCC000))) static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE]; #elif defined(__GNUC__) -__attribute__((at(0x2FFCC000))) +static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE] __attribute__((section(".Dcmi0Section"))); #elif defined(__ICCARM__) #pragma location = 0x2FFCC000 +__no_init static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE]; #endif -static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE]; #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFDC000))) +__attribute__((at(0x2FFDC000))) static rt_int32_t JPEG_LINE_BUF[2][JPEG_LINE_SIZE]; #elif defined(__GNUC__) -__attribute__((at(0x2FFDC000))) +static rt_int32_t JPEG_LINE_BUF[2][JPEG_LINE_SIZE] __attribute__((section(".Dcmi1Section"))); #elif defined(__ICCARM__) #pragma location = 0x2FFDC000 +__no_init static rt_int32_t JPEG_LINE_BUF[2][JPEG_LINE_SIZE]; #endif -static rt_int32_t JPEG_LINE_BUF[2][JPEG_LINE_SIZE]; - volatile rt_uint32_t jpeg_data_len = 0; volatile rt_uint8_t jpeg_data_ok = 0; diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c index ca79b806d7..3ef28f4e85 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c @@ -10,7 +10,7 @@ #include "board.h" -#if defined(BSP_USING_SD_CARD) +#if defined(BSP_USING_SDCARD) #include <dfs_fs.h> #define DRV_DEBUG @@ -41,14 +41,15 @@ struct rt_completion rx_comp; /* SYSRAM SDMMC1/2 accesses */ #define SDIO_BUFF_SIZE 512 +#define SDCARD_ADDR 0x2FFC0000 #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFC0000))) +__attribute__((at(SDCARD_ADDR))) static rt_uint32_t cache_buf[SDIO_BUFF_SIZE]; #elif defined ( __GNUC__ ) -__attribute__((at(0x2FFC0000))) +static rt_uint32_t cache_buf[SDIO_BUFF_SIZE] __attribute__((section(".SdCardSection"))); #elif defined(__ICCARM__) -#pragma location = 0x2FFC0000 +#pragma location = SDCARD_ADDR +__no_init static rt_uint32_t cache_buf[SDIO_BUFF_SIZE]; #endif -static rt_uint32_t cache_buf[SDIO_BUFF_SIZE]; #if defined(SDMMC_RX_DUMP) || defined(SDMMC_TX_DUMP) #define __is_print(ch) ((unsigned int)((ch) - ' ') < 127u - ' ') @@ -378,7 +379,7 @@ int rt_hw_sdcard_init(void) } INIT_DEVICE_EXPORT(rt_hw_sdcard_init); -#if defined(SD_USING_DFS) +#if defined(BSP_USING_SDCARD_FS) int mnt_init(void) { rt_device_t sd_dev = RT_NULL; diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c index b9cfae9fb2..14efc094e5 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c @@ -23,13 +23,13 @@ #define TX_FIFO_SIZE (4096) #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFC2000))) +__attribute__((at(0x2FFC2000))) static rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE]; #elif defined ( __GNUC__ ) -__attribute__((at(0x2FFC2000))) +static rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE] __attribute__((section(".AudioSection"))); #elif defined(__ICCARM__) #pragma location = 0x2FFC2000 +__no_init static rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE]; #endif -static rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE]; struct sound_device { @@ -348,7 +348,7 @@ static rt_err_t sound_start(struct rt_audio_device *audio, int stream) RT_ASSERT(audio != RT_NULL); snd_dev = (struct sound_device *)audio->parent.user_data; - + if (stream == AUDIO_STREAM_REPLAY) { LOG_D("open sound device"); @@ -367,15 +367,11 @@ static rt_err_t sound_start(struct rt_audio_device *audio, int stream) static rt_err_t sound_stop(struct rt_audio_device *audio, int stream) { - struct sound_device *device; RT_ASSERT(audio != RT_NULL); - device = (struct sound_device *)audio->parent.user_data; if (stream == AUDIO_STREAM_REPLAY) { HAL_SAI_DMAStop(&hsai_BlockA2); - - rt_device_close(device->decoder); LOG_D("close sound device"); } diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c index 802014ee4c..42aec448f8 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c @@ -33,22 +33,22 @@ rt_base_t level; #if defined(__ICCARM__) /* transmit buffer */ #pragma location = TX_ADD_BASE -static uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE]; +__no_init static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE]; /* Receive buffer */ #pragma location = RX_ADD_BASE -static uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE]; +__no_init static rt_uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE]; /* Transmit DMA descriptors */ #pragma location = TX_DMA_ADD_BASE -static TxDmaDesc txDmaDesc[ETH_TXBUFNB]; +__no_init static TxDmaDesc txDmaDesc[ETH_TXBUFNB]; /* Receive DMA descriptors */ #pragma location = RX_DMA_ADD_BASE -static RxDmaDesc rxDmaDesc[ETH_RXBUFNB]; +__no_init static RxDmaDesc rxDmaDesc[ETH_RXBUFNB]; #elif defined(__CC_ARM) || defined(__CLANG_ARM) /* transmit buffer */ -static uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((at(TX_ADD_BASE))); +static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((at(TX_ADD_BASE))); /* Receive buffer */ -static uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __attribute__((at(RX_ADD_BASE))); +static rt_uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __attribute__((at(RX_ADD_BASE))); /* Transmit DMA descriptors */ static TxDmaDesc txDmaDesc[ETH_TXBUFNB] __attribute__((at(TX_DMA_ADD_BASE))); /* Receive DMA descriptors */ @@ -56,13 +56,13 @@ static RxDmaDesc rxDmaDesc[ETH_RXBUFNB] __attribute__((at(RX_DMA_ADD_BASE))); #elif defined ( __GNUC__ ) /* transmit buffer */ -static uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((at(TX_ADD_BASE))); +static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((section(".TxArraySection"))); /* Receive buffer */ -static uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __attribute__((at(RX_ADD_BASE))); +static rt_uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __attribute__((section(".RxArraySection"))); /* Transmit DMA descriptors */ -static TxDmaDesc txDmaDesc[ETH_TXBUFNB] __attribute__((at(TX_DMA_ADD_BASE))); +static TxDmaDesc txDmaDesc[ETH_TXBUFNB] __attribute__((section(".TxDecripSection"))); /* Receive DMA descriptors */ -static RxDmaDesc rxDmaDesc[ETH_RXBUFNB] __attribute__((at(RX_DMA_ADD_BASE))); +static RxDmaDesc rxDmaDesc[ETH_RXBUFNB] __attribute__((section(".RxDecripSection"))); #endif //Current transmit descriptor diff --git a/bsp/stm32/stm32mp157a-st-ev1/template.uvoptx b/bsp/stm32/stm32mp157a-st-ev1/template.uvoptx index e3a94d45ec..69cfe32b14 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/template.uvoptx +++ b/bsp/stm32/stm32mp157a-st-ev1/template.uvoptx @@ -10,7 +10,7 @@ <aExt>*.s*; *.src; *.a*</aExt> <oExt>*.obj; *.o</oExt> <lExt>*.lib</lExt> - <tExt>*.txt; *.h; *.inc</tExt> + <tExt>*.txt; *.h; *.inc; *.md</tExt> <pExt>*.plm</pExt> <CppX>*.cpp</CppX> <nMigrate>0</nMigrate> @@ -125,7 +125,7 @@ <SetRegEntry> <Number>0</Number> <Key>ST-LINKIII-KEIL_SWO</Key> - <Name>-U066BFF343339415043223048 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("") -D00(00000000) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10050000 -FC1000 -FN0</Name> + <Name>-U0666FF343339415043182420 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10030000 -FC1000 -FN0</Name> </SetRegEntry> </TargetDriverDllRegistry> <Breakpoint/> diff --git a/bsp/stm32/stm32mp157a-st-ev1/template.uvprojx b/bsp/stm32/stm32mp157a-st-ev1/template.uvprojx index fc88195dc1..db224b3468 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/template.uvprojx +++ b/bsp/stm32/stm32mp157a-st-ev1/template.uvprojx @@ -276,7 +276,7 @@ <OCR_RVCT4> <Type>1</Type> <StartAddress>0x10000000</StartAddress> - <Size>0x40000</Size> + <Size>0x30000</Size> </OCR_RVCT4> <OCR_RVCT5> <Type>1</Type> @@ -300,13 +300,13 @@ </OCR_RVCT8> <OCR_RVCT9> <Type>0</Type> - <StartAddress>0x10050000</StartAddress> + <StartAddress>0x10030000</StartAddress> <Size>0x10000</Size> </OCR_RVCT9> <OCR_RVCT10> <Type>0</Type> - <StartAddress>0x0</StartAddress> - <Size>0x0</Size> + <StartAddress>0x10040000</StartAddress> + <Size>0x20000</Size> </OCR_RVCT10> </OnChipMemories> <RvctStartVector></RvctStartVector> @@ -397,11 +397,6 @@ <Layers> <Layer> <LayName><Project Info></LayName> - <LayDesc></LayDesc> - <LayUrl></LayUrl> - <LayKeys></LayKeys> - <LayCat></LayCat> - <LayLic></LayLic> <LayTarg>0</LayTarg> <LayPrjMark>1</LayPrjMark> </Layer> |