You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2019/03/29 09:01:00 UTC
[mynewt-core] branch master updated: [STM32] Enable timer0 for all
BSPs
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new 38de6d5 [STM32] Enable timer0 for all BSPs
new 4c9ec92 Merge pull request #1729 from utzig/stm32-bsps-enable-timer0
38de6d5 is described below
commit 38de6d5294edd8752fea93fbf62360fd6becb8d3
Author: Fabio Utzig <ut...@apache.org>
AuthorDate: Thu Mar 28 07:32:02 2019 -0300
[STM32] Enable timer0 for all BSPs
---
hw/bsp/b-l072z-lrwan1/src/hal_bsp.c | 5 +++++
hw/bsp/b-l072z-lrwan1/syscfg.yml | 2 +-
hw/bsp/bluepill/src/hal_bsp.c | 5 +++++
hw/bsp/bluepill/syscfg.yml | 2 +-
hw/bsp/nucleo-f072rb/src/hal_bsp.c | 5 +++++
hw/bsp/nucleo-f072rb/syscfg.yml | 2 +-
hw/bsp/nucleo-f401re/src/hal_bsp.c | 5 +++++
hw/bsp/nucleo-f401re/syscfg.yml | 2 +-
hw/bsp/olimex-p103/src/hal_bsp.c | 5 +++++
hw/bsp/olimex-p103/syscfg.yml | 2 +-
hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c | 5 +++++
hw/bsp/olimex_stm32-e407_devboard/syscfg.yml | 2 +-
hw/bsp/stm32f4discovery/syscfg.yml | 2 +-
hw/bsp/stm32l152discovery/src/hal_bsp.c | 5 +++++
hw/bsp/stm32l152discovery/syscfg.yml | 2 +-
15 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/hw/bsp/b-l072z-lrwan1/src/hal_bsp.c b/hw/bsp/b-l072z-lrwan1/src/hal_bsp.c
index d700a07..a352ae3 100644
--- a/hw/bsp/b-l072z-lrwan1/src/hal_bsp.c
+++ b/hw/bsp/b-l072z-lrwan1/src/hal_bsp.c
@@ -139,6 +139,11 @@ hal_bsp_init(void)
hal_timer_init(2, TIM21);
#endif
+#if (MYNEWT_VAL(OS_CPUTIME_TIMER_NUM) >= 0)
+ rc = os_cputime_init(MYNEWT_VAL(OS_CPUTIME_FREQ));
+ assert(rc == 0);
+#endif
+
#if MYNEWT_VAL(SPI_1_MASTER)
rc = hal_spi_init(1, &spi1_cfg, HAL_SPI_TYPE_MASTER);
assert(rc == 0);
diff --git a/hw/bsp/b-l072z-lrwan1/syscfg.yml b/hw/bsp/b-l072z-lrwan1/syscfg.yml
index ada6a40..6344c10 100644
--- a/hw/bsp/b-l072z-lrwan1/syscfg.yml
+++ b/hw/bsp/b-l072z-lrwan1/syscfg.yml
@@ -28,7 +28,7 @@ syscfg.defs:
TIMER_0:
description: 'Whether to enable TIMER_0'
- value: 0
+ value: 1
TIMER_1:
description: 'Whether to enable TIMER_1'
diff --git a/hw/bsp/bluepill/src/hal_bsp.c b/hw/bsp/bluepill/src/hal_bsp.c
index 1a0912f..e9702c4 100644
--- a/hw/bsp/bluepill/src/hal_bsp.c
+++ b/hw/bsp/bluepill/src/hal_bsp.c
@@ -192,6 +192,11 @@ hal_bsp_init(void)
hal_timer_init(2, TIM4);
#endif
+#if (MYNEWT_VAL(OS_CPUTIME_TIMER_NUM) >= 0)
+ rc = os_cputime_init(MYNEWT_VAL(OS_CPUTIME_FREQ));
+ assert(rc == 0);
+#endif
+
#if MYNEWT_VAL(SPI_0_MASTER)
rc = hal_spi_init(0, &spi0_cfg, HAL_SPI_TYPE_MASTER);
assert(rc == 0);
diff --git a/hw/bsp/bluepill/syscfg.yml b/hw/bsp/bluepill/syscfg.yml
index ee2a793..36e2469 100644
--- a/hw/bsp/bluepill/syscfg.yml
+++ b/hw/bsp/bluepill/syscfg.yml
@@ -28,7 +28,7 @@ syscfg.defs:
TIMER_0:
description: 'Timer 0'
- value: 0
+ value: 1
TIMER_1:
description: 'Timer 1'
diff --git a/hw/bsp/nucleo-f072rb/src/hal_bsp.c b/hw/bsp/nucleo-f072rb/src/hal_bsp.c
index 07d9102..706d5c6 100644
--- a/hw/bsp/nucleo-f072rb/src/hal_bsp.c
+++ b/hw/bsp/nucleo-f072rb/src/hal_bsp.c
@@ -194,4 +194,9 @@ hal_bsp_init(void)
rc = hal_timer_init(2, TIM17);
assert(rc == 0);
#endif
+
+#if (MYNEWT_VAL(OS_CPUTIME_TIMER_NUM) >= 0)
+ rc = os_cputime_init(MYNEWT_VAL(OS_CPUTIME_FREQ));
+ assert(rc == 0);
+#endif
}
diff --git a/hw/bsp/nucleo-f072rb/syscfg.yml b/hw/bsp/nucleo-f072rb/syscfg.yml
index 487a6e5..4c8dfc1 100644
--- a/hw/bsp/nucleo-f072rb/syscfg.yml
+++ b/hw/bsp/nucleo-f072rb/syscfg.yml
@@ -31,7 +31,7 @@ syscfg.defs:
TIMER_0:
description: 'Support for TIMER_0'
- value: 0
+ value: 1
TIMER_1:
description: 'Support for TIMER_1'
value: 0
diff --git a/hw/bsp/nucleo-f401re/src/hal_bsp.c b/hw/bsp/nucleo-f401re/src/hal_bsp.c
index e8aba90..a623e43 100644
--- a/hw/bsp/nucleo-f401re/src/hal_bsp.c
+++ b/hw/bsp/nucleo-f401re/src/hal_bsp.c
@@ -159,6 +159,11 @@ hal_bsp_init(void)
#if MYNEWT_VAL(TIMER_0)
hal_timer_init(0, TIM9);
#endif
+
+#if (MYNEWT_VAL(OS_CPUTIME_TIMER_NUM) >= 0)
+ rc = os_cputime_init(MYNEWT_VAL(OS_CPUTIME_FREQ));
+ assert(rc == 0);
+#endif
}
/**
diff --git a/hw/bsp/nucleo-f401re/syscfg.yml b/hw/bsp/nucleo-f401re/syscfg.yml
index 073ed2d..5c97486 100644
--- a/hw/bsp/nucleo-f401re/syscfg.yml
+++ b/hw/bsp/nucleo-f401re/syscfg.yml
@@ -32,7 +32,7 @@ syscfg.defs:
TIMER_0:
description: 'TIMER_0'
- value: 0
+ value: 1
syscfg.vals:
REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
diff --git a/hw/bsp/olimex-p103/src/hal_bsp.c b/hw/bsp/olimex-p103/src/hal_bsp.c
index 1a0912f..e9702c4 100644
--- a/hw/bsp/olimex-p103/src/hal_bsp.c
+++ b/hw/bsp/olimex-p103/src/hal_bsp.c
@@ -192,6 +192,11 @@ hal_bsp_init(void)
hal_timer_init(2, TIM4);
#endif
+#if (MYNEWT_VAL(OS_CPUTIME_TIMER_NUM) >= 0)
+ rc = os_cputime_init(MYNEWT_VAL(OS_CPUTIME_FREQ));
+ assert(rc == 0);
+#endif
+
#if MYNEWT_VAL(SPI_0_MASTER)
rc = hal_spi_init(0, &spi0_cfg, HAL_SPI_TYPE_MASTER);
assert(rc == 0);
diff --git a/hw/bsp/olimex-p103/syscfg.yml b/hw/bsp/olimex-p103/syscfg.yml
index 15c4ba2..42c693a 100644
--- a/hw/bsp/olimex-p103/syscfg.yml
+++ b/hw/bsp/olimex-p103/syscfg.yml
@@ -28,7 +28,7 @@ syscfg.defs:
TIMER_0:
description: 'Timer 0'
- value: 0
+ value: 1
TIMER_1:
description: 'Timer 1'
diff --git a/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c b/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c
index a05b169..830f6e6 100644
--- a/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c
+++ b/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c
@@ -455,6 +455,11 @@ hal_bsp_init(void)
hal_timer_init(0, TIM9);
#endif
+#if (MYNEWT_VAL(OS_CPUTIME_TIMER_NUM) >= 0)
+ rc = os_cputime_init(MYNEWT_VAL(OS_CPUTIME_FREQ));
+ assert(rc == 0);
+#endif
+
#if MYNEWT_VAL(ETH_0)
rc = stm32_eth_init(ð_cfg);
assert(rc == 0);
diff --git a/hw/bsp/olimex_stm32-e407_devboard/syscfg.yml b/hw/bsp/olimex_stm32-e407_devboard/syscfg.yml
index 0bb96c9..4664503 100644
--- a/hw/bsp/olimex_stm32-e407_devboard/syscfg.yml
+++ b/hw/bsp/olimex_stm32-e407_devboard/syscfg.yml
@@ -41,7 +41,7 @@ syscfg.defs:
TIMER_0:
description: 'TIMER_0'
- value: 0
+ value: 1
ETH_0:
description: 'Ethernet driver for LwIP'
diff --git a/hw/bsp/stm32f4discovery/syscfg.yml b/hw/bsp/stm32f4discovery/syscfg.yml
index b92ec7a..b744b96 100644
--- a/hw/bsp/stm32f4discovery/syscfg.yml
+++ b/hw/bsp/stm32f4discovery/syscfg.yml
@@ -32,7 +32,7 @@ syscfg.defs:
TIMER_0:
description: 'Timer 0'
- value: 0
+ value: 1
TIMER_1:
description: 'Timer 1'
value: 0
diff --git a/hw/bsp/stm32l152discovery/src/hal_bsp.c b/hw/bsp/stm32l152discovery/src/hal_bsp.c
index 78f832f..4f47958 100644
--- a/hw/bsp/stm32l152discovery/src/hal_bsp.c
+++ b/hw/bsp/stm32l152discovery/src/hal_bsp.c
@@ -185,6 +185,11 @@ hal_bsp_init(void)
hal_timer_init(2, TIM11);
#endif
+#if (MYNEWT_VAL(OS_CPUTIME_TIMER_NUM) >= 0)
+ rc = os_cputime_init(MYNEWT_VAL(OS_CPUTIME_FREQ));
+ assert(rc == 0);
+#endif
+
#if MYNEWT_VAL(SPI_1_MASTER)
rc = hal_spi_init(1, &spi1_cfg, HAL_SPI_TYPE_MASTER);
assert(rc == 0);
diff --git a/hw/bsp/stm32l152discovery/syscfg.yml b/hw/bsp/stm32l152discovery/syscfg.yml
index 7e8fdb3..8ec97cd 100644
--- a/hw/bsp/stm32l152discovery/syscfg.yml
+++ b/hw/bsp/stm32l152discovery/syscfg.yml
@@ -28,7 +28,7 @@ syscfg.defs:
TIMER_0:
description: 'Timer 0'
- value: 0
+ value: 1
TIMER_1:
description: 'Timer 1'