Merge pull request #2652 from yangjie11/yj_fix_branch
[bsp]support AC6 for some bsp and stm32 bsp templates.
This commit is contained in:
commit
e88e4eb99c
|
@ -17,7 +17,7 @@
|
||||||
#define ES32F0_SRAM_SIZE 0x8000
|
#define ES32F0_SRAM_SIZE 0x8000
|
||||||
#define ES32F0_SRAM_END (0x20000000 + ES32F0_SRAM_SIZE)
|
#define ES32F0_SRAM_END (0x20000000 + ES32F0_SRAM_SIZE)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#define ES32F0_SRAM_SIZE 0x8000
|
#define ES32F0_SRAM_SIZE 0x8000
|
||||||
#define ES32F0_SRAM_END (0x20000000 + ES32F0_SRAM_SIZE)
|
#define ES32F0_SRAM_END (0x20000000 + ES32F0_SRAM_SIZE)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -25,7 +25,7 @@ extern char __ICFEDIT_region_RAM_end__;
|
||||||
#define GD32_SRAM_END (0x20000000 + GD32_SRAM_SIZE * 1024)
|
#define GD32_SRAM_END (0x20000000 + GD32_SRAM_SIZE * 1024)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __ARMCC_VERSION
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN (&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN (&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#define SRAM_SIZE 0x2000
|
#define SRAM_SIZE 0x2000
|
||||||
|
|
||||||
#define SRAM_END (SRAM_BASE + SRAM_SIZE)
|
#define SRAM_END (SRAM_BASE + SRAM_SIZE)
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -29,7 +29,7 @@ extern int finsh_system_init(void);
|
||||||
extern void finsh_set_device(const char* device);
|
extern void finsh_set_device(const char* device);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define M451_SRAM_BEGIN (&Image$$RW_IRAM1$$ZI$$Limit)
|
#define M451_SRAM_BEGIN (&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -29,7 +29,7 @@ extern void finsh_system_init(void);
|
||||||
extern void finsh_set_device(const char* device);
|
extern void finsh_set_device(const char* device);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
#pragma section="HEAP"
|
#pragma section="HEAP"
|
||||||
|
@ -78,7 +78,7 @@ void rtthread_startup(void)
|
||||||
rt_system_timer_init();
|
rt_system_timer_init();
|
||||||
|
|
||||||
#ifdef RT_USING_HEAP
|
#ifdef RT_USING_HEAP
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)CHIP_SRAM_END);
|
rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)CHIP_SRAM_END);
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
rt_system_heap_init(__segment_end("HEAP"), (void*)CHIP_SRAM_END);
|
rt_system_heap_init(__segment_end("HEAP"), (void*)CHIP_SRAM_END);
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 32
|
#define STM32_SRAM_SIZE 32
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 20
|
#define STM32_SRAM_SIZE 20
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -29,7 +29,7 @@ extern "C" {
|
||||||
#define STM32_SRAM1_START (0x20000000)
|
#define STM32_SRAM1_START (0x20000000)
|
||||||
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_SIZE * 1024)
|
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 32
|
#define STM32_SRAM_SIZE 32
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -27,7 +27,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 20
|
#define STM32_SRAM_SIZE 20
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 64
|
#define STM32_SRAM_SIZE 64
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -29,7 +29,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 64
|
#define STM32_SRAM_SIZE 64
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#define STM32_SRAM_SIZE 20
|
#define STM32_SRAM_SIZE 20
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern "C" {
|
||||||
#define STM32_FLASH_SIZE (512 * 1024)
|
#define STM32_FLASH_SIZE (512 * 1024)
|
||||||
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
|
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 64
|
#define STM32_SRAM_SIZE 64
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 20
|
#define STM32_SRAM_SIZE 20
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 64
|
#define STM32_SRAM_SIZE 64
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -27,7 +27,7 @@ extern "C" {
|
||||||
#define STM32_FLASH_SIZE (1024 * 1024)
|
#define STM32_FLASH_SIZE (1024 * 1024)
|
||||||
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
|
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 36
|
#define STM32_SRAM_SIZE 36
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern "C" {
|
||||||
#define STM32_SRAM_SIZE 8
|
#define STM32_SRAM_SIZE 8
|
||||||
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
#define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024)
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -39,7 +39,7 @@ extern "C" {
|
||||||
#define STM32_FLASH_SIZE (1024 * 1024)
|
#define STM32_FLASH_SIZE (1024 * 1024)
|
||||||
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
|
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
|
||||||
|
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define SRAM_END (SRAM_BASE + SRAM_SIZE)
|
#define SRAM_END (SRAM_BASE + SRAM_SIZE)
|
||||||
#ifdef __CC_ARM
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
||||||
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
extern int Image$$RW_IRAM1$$ZI$$Limit;
|
||||||
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit)
|
||||||
#elif __ICCARM__
|
#elif __ICCARM__
|
||||||
|
|
Loading…
Reference in New Issue