Skip to content

Commit a994f47

Browse files
sg-sg-
authored
Merge pull request #2640 from jeromecoutant/PR_F0_RB
[NUCLEO_F072RB-NUCLEO_F070RB] RTOS issues
2 parents 6fce892 + 968d44d commit a994f47

File tree

11 files changed

+27
-21
lines changed

11 files changed

+27
-21
lines changed

‎TESTS/mbedmicro-rtos-mbed/mutex/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
*/
1717
#if (defined(TARGET_STM32L053R8) || defined(TARGET_STM32L053C8)) && defined(TOOLCHAIN_GCC)
1818
#define STACK_SIZE DEFAULT_STACK_SIZE/4
19-
#elif (defined(TARGET_STM32F030R8) || defined(TARGET_STM32F070RB)) && defined(TOOLCHAIN_GCC)
19+
#elif defined(TARGET_STM32F030R8) && defined(TOOLCHAIN_GCC)
2020
#define STACK_SIZE DEFAULT_STACK_SIZE/4
2121
#elif defined(TARGET_STM32F334R8) && defined(TOOLCHAIN_IAR)
2222
#define STACK_SIZE DEFAULT_STACK_SIZE/4
2323
#elif defined(TARGET_STM32F030R8) && defined(TOOLCHAIN_IAR)
2424
#define STACK_SIZE DEFAULT_STACK_SIZE/4
25-
#elif defined(TARGET_STM32F070RB) && defined(TOOLCHAIN_IAR)
25+
#elif defined(TARGET_STM32F070RB)
2626
#define STACK_SIZE DEFAULT_STACK_SIZE/2
27-
#elif defined(TARGET_STM32F072RB) && defined(TOOLCHAIN_IAR)
27+
#elif defined(TARGET_STM32F072RB)
2828
#define STACK_SIZE DEFAULT_STACK_SIZE/2
2929
#elif defined(TARGET_STM32F302R8) && defined(TOOLCHAIN_IAR)
3030
#define STACK_SIZE DEFAULT_STACK_SIZE/2

‎TESTS/mbedmicro-rtos-mbed/semaphore/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
*/
1818
#if (defined(TARGET_STM32L053R8) || defined(TARGET_STM32L053C8)) && defined(TOOLCHAIN_GCC)
1919
#define STACK_SIZE DEFAULT_STACK_SIZE/16
20-
#elif (defined(TARGET_STM32F030R8) || defined(TARGET_STM32F070RB)) && defined(TOOLCHAIN_GCC)
20+
#elif defined(TARGET_STM32F030R8) && defined(TOOLCHAIN_GCC)
2121
#define STACK_SIZE DEFAULT_STACK_SIZE/8
2222
#elif defined(TARGET_STM32F334R8) && (defined(TOOLCHAIN_GCC) || defined(TOOLCHAIN_IAR))
2323
#define STACK_SIZE DEFAULT_STACK_SIZE/4
2424
#elif defined(TARGET_STM32F103RB) && defined(TOOLCHAIN_IAR)
2525
#define STACK_SIZE DEFAULT_STACK_SIZE/4
2626
#elif defined(TARGET_STM32F030R8) && defined(TOOLCHAIN_IAR)
2727
#define STACK_SIZE DEFAULT_STACK_SIZE/4
28-
#elif defined(TARGET_STM32F070RB) && defined(TOOLCHAIN_IAR)
28+
#elif defined(TARGET_STM32F070RB)
2929
#define STACK_SIZE DEFAULT_STACK_SIZE/2
30-
#elif defined(TARGET_STM32F072RB) && defined(TOOLCHAIN_IAR)
30+
#elif defined(TARGET_STM32F072RB)
3131
#define STACK_SIZE DEFAULT_STACK_SIZE/2
3232
#elif defined(TARGET_STM32F302R8) && defined(TOOLCHAIN_IAR)
3333
#define STACK_SIZE DEFAULT_STACK_SIZE/2

‎TESTS/mbedmicro-rtos-mbed/threads/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
*/
1818
#if defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832)
1919
#define STACK_SIZE 512
20+
#elif (defined(TARGET_STM32F070RB) || defined(TARGET_STM32F072RB))
21+
#define STACK_SIZE 512
2022
#else
2123
#define STACK_SIZE DEFAULT_STACK_SIZE
2224
#endif

‎libraries/tests/rtos/mbed/basic/main.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
*/
1414
#if (defined(TARGET_STM32L053R8) || defined(TARGET_STM32L053C8)) && defined(TOOLCHAIN_GCC)
1515
#define STACK_SIZE DEFAULT_STACK_SIZE/2
16-
#elif (defined(TARGET_STM32F030R8) || defined(TARGET_STM32F070RB)) && defined(TOOLCHAIN_GCC)
16+
#elif defined(TARGET_STM32F030R8) && defined(TOOLCHAIN_GCC)
17+
#define STACK_SIZE DEFAULT_STACK_SIZE/2
18+
#elif defined(TARGET_STM32F070RB) || defined(TARGET_STM32F072RB)
1719
#define STACK_SIZE DEFAULT_STACK_SIZE/2
1820
#elif (defined(TARGET_STM32F030R8)) && defined(TOOLCHAIN_IAR)
1921
#define STACK_SIZE DEFAULT_STACK_SIZE/2

‎libraries/tests/rtos/mbed/isr/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#define STACK_SIZE 1536
2929
#elif defined(TARGET_MCU_NRF51822)
3030
#define STACK_SIZE 768
31+
#elif (defined(TARGET_STM32F070RB) || defined(TARGET_STM32F072RB))
32+
#define STACK_SIZE DEFAULT_STACK_SIZE/2
3133
#else
3234
#define STACK_SIZE DEFAULT_STACK_SIZE
3335
#endif

‎libraries/tests/rtos/mbed/mail/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ typedef struct {
3636
#define STACK_SIZE 1536
3737
#elif defined(TARGET_MCU_NRF51822)
3838
#define STACK_SIZE 768
39+
#elif (defined(TARGET_STM32F070RB) || defined(TARGET_STM32F072RB))
40+
#define STACK_SIZE DEFAULT_STACK_SIZE/2
3941
#else
4042
#define STACK_SIZE DEFAULT_STACK_SIZE
4143
#endif

‎libraries/tests/rtos/mbed/mutex/main.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
*/
1717
#if (defined(TARGET_STM32L053R8) || defined(TARGET_STM32L053C8)) && defined(TOOLCHAIN_GCC)
1818
#define STACK_SIZE DEFAULT_STACK_SIZE/4
19-
#elif (defined(TARGET_STM32F030R8) || defined(TARGET_STM32F070RB)) && defined(TOOLCHAIN_GCC)
19+
#elif (defined(TARGET_STM32F030R8)) && defined(TOOLCHAIN_GCC)
2020
#define STACK_SIZE DEFAULT_STACK_SIZE/4
2121
#elif defined(TARGET_STM32F334R8) && defined(TOOLCHAIN_IAR)
2222
#define STACK_SIZE DEFAULT_STACK_SIZE/4
2323
#elif defined(TARGET_STM32F030R8) && defined(TOOLCHAIN_IAR)
2424
#define STACK_SIZE DEFAULT_STACK_SIZE/4
25-
#elif defined(TARGET_STM32F070RB) && defined(TOOLCHAIN_IAR)
26-
#define STACK_SIZE DEFAULT_STACK_SIZE/2
27-
#elif defined(TARGET_STM32F072RB) && defined(TOOLCHAIN_IAR)
25+
#elif (defined(TARGET_STM32F070RB) || defined(TARGET_STM32F072RB))
2826
#define STACK_SIZE DEFAULT_STACK_SIZE/2
2927
#elif defined(TARGET_STM32F302R8) && defined(TOOLCHAIN_IAR)
3028
#define STACK_SIZE DEFAULT_STACK_SIZE/2

‎libraries/tests/rtos/mbed/queue/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ typedef struct {
3636
#define STACK_SIZE 1536
3737
#elif defined(TARGET_MCU_NRF51822)
3838
#define STACK_SIZE 768
39+
#elif (defined(TARGET_STM32F070RB) || defined(TARGET_STM32F072RB))
40+
#define STACK_SIZE DEFAULT_STACK_SIZE/2
3941
#else
4042
#define STACK_SIZE DEFAULT_STACK_SIZE
4143
#endif

‎libraries/tests/rtos/mbed/semaphore/main.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,16 @@
1717
*/
1818
#if (defined(TARGET_STM32L053R8) || defined(TARGET_STM32L053C8)) && defined(TOOLCHAIN_GCC)
1919
#define STACK_SIZE DEFAULT_STACK_SIZE/16
20-
#elif (defined(TARGET_STM32F030R8) || defined(TARGET_STM32F070RB)) && defined(TOOLCHAIN_GCC)
20+
#elif (defined(TARGET_STM32F030R8)) && defined(TOOLCHAIN_GCC)
2121
#define STACK_SIZE DEFAULT_STACK_SIZE/8
22+
#elif (defined(TARGET_STM32F072RB) || defined(TARGET_STM32F070RB))
23+
#define STACK_SIZE DEFAULT_STACK_SIZE/2
2224
#elif defined(TARGET_STM32F334R8) && (defined(TOOLCHAIN_GCC) || defined(TOOLCHAIN_IAR))
2325
#define STACK_SIZE DEFAULT_STACK_SIZE/4
2426
#elif defined(TARGET_STM32F103RB) && defined(TOOLCHAIN_IAR)
2527
#define STACK_SIZE DEFAULT_STACK_SIZE/4
2628
#elif defined(TARGET_STM32F030R8) && defined(TOOLCHAIN_IAR)
2729
#define STACK_SIZE DEFAULT_STACK_SIZE/4
28-
#elif defined(TARGET_STM32F070RB) && defined(TOOLCHAIN_IAR)
29-
#define STACK_SIZE DEFAULT_STACK_SIZE/2
30-
#elif defined(TARGET_STM32F072RB) && defined(TOOLCHAIN_IAR)
31-
#define STACK_SIZE DEFAULT_STACK_SIZE/2
3230
#elif defined(TARGET_STM32F302R8) && defined(TOOLCHAIN_IAR)
3331
#define STACK_SIZE DEFAULT_STACK_SIZE/2
3432
#elif defined(TARGET_STM32F303K8) && defined(TOOLCHAIN_IAR)

‎libraries/tests/rtos/mbed/signals/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#define STACK_SIZE 1536
2828
#elif defined(TARGET_MCU_NRF51822)
2929
#define STACK_SIZE 768
30+
#elif (defined(TARGET_STM32F070RB) || defined(TARGET_STM32F072RB))
31+
#define STACK_SIZE DEFAULT_STACK_SIZE/2
3032
#else
3133
#define STACK_SIZE DEFAULT_STACK_SIZE
3234
#endif

‎rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ __attribute__((used)) void _mutex_release (OS_ID *mutex) {
352352
extern void pre_main (void);
353353

354354
#if defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832) || defined (TARGET_STM32F334R8) ||\
355+
defined(TARGET_STM32F070RB) || defined(TARGET_STM32F072RB) || \
355356
defined(TARGET_STM32F302R8) || defined(TARGET_STM32F303K8) || defined (TARGET_STM32F334C8)
356357
static uint32_t thread_stack_main[DEFAULT_STACK_SIZE / sizeof(uint32_t)];
357358
#else
@@ -499,9 +500,6 @@ osThreadDef_t os_thread_def_main = {(os_pthread)pre_main, osPriorityNormal, 1U,
499500
#elif defined(TARGET_STM32F429ZI) || defined(TARGET_UBLOX_C029)
500501
#define INITIAL_SP (0x20030000UL)
501502

502-
#elif defined(TARGET_STM32F072RB)
503-
#define INITIAL_SP (0x20004000UL)
504-
505503
#elif defined(TARGET_STM32F091RC)
506504
#define INITIAL_SP (0x20008000UL)
507505

@@ -532,8 +530,8 @@ osThreadDef_t os_thread_def_main = {(os_pthread)pre_main, osPriorityNormal, 1U,
532530
#elif defined(TARGET_STM32F446RE) || defined(TARGET_STM32F446VE) || defined(TARGET_STM32F446ZE)
533531
#define INITIAL_SP (0x20020000UL)
534532

535-
#elif defined(TARGET_STM32F070RB)
536-
#define INITIAL_SP (0x20002000UL)
533+
#elif defined(TARGET_STM32F072RB) || defined(TARGET_STM32F070RB)
534+
#define INITIAL_SP (0x20004000UL)
537535

538536
#elif defined(TARGET_STM32L432KC)
539537
#define INITIAL_SP (0x2000C000UL)

0 commit comments

Comments
 (0)