You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/10/20 18:28:08 UTC
[4/4] incubator-mynewt-core git commit: olimex bsp;
move SDK defines from pkg.yml to stm32f4xx_hal_conf.h.
olimex bsp; move SDK defines from pkg.yml to stm32f4xx_hal_conf.h.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/08cede0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/08cede0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/08cede0a
Branch: refs/heads/develop
Commit: 08cede0acbf0c094c08494f67e23caa411216860
Parents: e81535e
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Thu Oct 20 11:27:11 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Thu Oct 20 11:27:11 2016 -0700
----------------------------------------------------------------------
.../include/bsp/stm32f4xx_hal_conf.h | 9 +++++++--
hw/bsp/olimex_stm32-e407_devboard/pkg.yml | 5 -----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/08cede0a/hw/bsp/olimex_stm32-e407_devboard/include/bsp/stm32f4xx_hal_conf.h
----------------------------------------------------------------------
diff --git a/hw/bsp/olimex_stm32-e407_devboard/include/bsp/stm32f4xx_hal_conf.h b/hw/bsp/olimex_stm32-e407_devboard/include/bsp/stm32f4xx_hal_conf.h
index 720cf6c..fb65323 100644
--- a/hw/bsp/olimex_stm32-e407_devboard/include/bsp/stm32f4xx_hal_conf.h
+++ b/hw/bsp/olimex_stm32-e407_devboard/include/bsp/stm32f4xx_hal_conf.h
@@ -90,12 +90,17 @@
#define HAL_PCD_MODULE_ENABLED
#define HAL_HCD_MODULE_ENABLED
#else
-#define HAL_PWR_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
#define HAL_FLASH_MODULE_ENABLED
#define HAL_GPIO_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_IWDG_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
#define HAL_RCC_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
#define HAL_CORTEX_MODULE_ENABLED
-#define HAL_IWDG_MODULE_ENABLED
#endif
/* ########################## HSE/HSI Values adaptation ##################### */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/08cede0a/hw/bsp/olimex_stm32-e407_devboard/pkg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/olimex_stm32-e407_devboard/pkg.yml b/hw/bsp/olimex_stm32-e407_devboard/pkg.yml
index 1d82560..4d23437 100644
--- a/hw/bsp/olimex_stm32-e407_devboard/pkg.yml
+++ b/hw/bsp/olimex_stm32-e407_devboard/pkg.yml
@@ -30,11 +30,6 @@ pkg.keywords:
pkg.cflags:
# STM SDK files require these defines.
- '-DSTM32F407xx'
- - '-DHAL_ADC_MODULE_ENABLED'
- - '-DHAL_DMA_MODULE_ENABLED'
- - -DHAL_I2C_MODULE_ENABLED
- - '-DHAL_SPI_MODULE_ENABLED'
- - -DHAL_TIM_MODULE_ENABLED
pkg.deps:
- boot/bootutil