You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ut...@apache.org on 2018/03/19 16:37:32 UTC
[mynewt-core] 03/04: Fixed merge issues and header file dependencies.

This is an automated email from the ASF dual-hosted git repository.

utzig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit d2827e5f886f01afcba9ca2cede358d7a9383a9f
Author: Markus Lampert <ma...@bibi.ca>
AuthorDate: Thu Mar 15 14:57:09 2018 -0700

    Fixed merge issues and header file dependencies.
---
 hw/mcu/stm/stm32f1xx/include/mcu/stm32f1_bsp.h | 3 +++
 hw/mcu/stm/stm32f3xx/include/mcu/stm32f3_bsp.h | 1 +
 hw/mcu/stm/stm32f3xx/pkg.yml                   | 6 ++++++
 hw/mcu/stm/stm32f4xx/include/mcu/stm32f4_bsp.h | 3 +++
 hw/mcu/stm/stm32f7xx/include/mcu/stm32f7_bsp.h | 3 +++
 hw/mcu/stm/stm32l1xx/include/mcu/stm32l1_bsp.h | 3 +++
 6 files changed, 19 insertions(+)

diff --git a/hw/mcu/stm/stm32f1xx/include/mcu/stm32f1_bsp.h b/hw/mcu/stm/stm32f1xx/include/mcu/stm32f1_bsp.h
index 503d508..2008405 100644
--- a/hw/mcu/stm/stm32f1xx/include/mcu/stm32f1_bsp.h
+++ b/hw/mcu/stm/stm32f1xx/include/mcu/stm32f1_bsp.h
@@ -20,6 +20,9 @@
 #ifndef __MCU_STM32F1_BSP_H_
 #define __MCU_STM32F1_BSP_H_
 
+#include <hal/hal_gpio.h>
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/hw/mcu/stm/stm32f3xx/include/mcu/stm32f3_bsp.h b/hw/mcu/stm/stm32f3xx/include/mcu/stm32f3_bsp.h
index a816405..ec5a83f 100644
--- a/hw/mcu/stm/stm32f3xx/include/mcu/stm32f3_bsp.h
+++ b/hw/mcu/stm/stm32f3xx/include/mcu/stm32f3_bsp.h
@@ -20,6 +20,7 @@
 #ifndef __MCU_STM32F3_BSP_H_
 #define __MCU_STM32F3_BSP_H_
 
+#include <hal/hal_gpio.h>
 #include <stdint.h>
 
 #ifdef __cplusplus
diff --git a/hw/mcu/stm/stm32f3xx/pkg.yml b/hw/mcu/stm/stm32f3xx/pkg.yml
index bb5fa98..b98c64e 100644
--- a/hw/mcu/stm/stm32f3xx/pkg.yml
+++ b/hw/mcu/stm/stm32f3xx/pkg.yml
@@ -27,6 +27,12 @@ pkg.keywords:
 
 pkg.type: sdk
 
+pkg.ign_files:
+    - ".*template.*"
+
+pkg.ign_dirs:
+    - "Device"
+
 pkg.deps:
     - hw/hal
     - hw/mcu/stm/stm32_common
diff --git a/hw/mcu/stm/stm32f4xx/include/mcu/stm32f4_bsp.h b/hw/mcu/stm/stm32f4xx/include/mcu/stm32f4_bsp.h
index e4ce083..3db39b0 100644
--- a/hw/mcu/stm/stm32f4xx/include/mcu/stm32f4_bsp.h
+++ b/hw/mcu/stm/stm32f4xx/include/mcu/stm32f4_bsp.h
@@ -20,6 +20,9 @@
 #ifndef __MCU_STM32F4_BSP_H_
 #define __MCU_STM32F4_BSP_H_
 
+#include <hal/hal_gpio.h>
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/hw/mcu/stm/stm32f7xx/include/mcu/stm32f7_bsp.h b/hw/mcu/stm/stm32f7xx/include/mcu/stm32f7_bsp.h
index 98dac5b..85a365f 100644
--- a/hw/mcu/stm/stm32f7xx/include/mcu/stm32f7_bsp.h
+++ b/hw/mcu/stm/stm32f7xx/include/mcu/stm32f7_bsp.h
@@ -20,6 +20,9 @@
 #ifndef __MCU_STM32F7_BSP_H_
 #define __MCU_STM32F7_BSP_H_
 
+#include <hal/hal_gpio.h>
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/hw/mcu/stm/stm32l1xx/include/mcu/stm32l1_bsp.h b/hw/mcu/stm/stm32l1xx/include/mcu/stm32l1_bsp.h
index 88eff31..ac55390 100644
--- a/hw/mcu/stm/stm32l1xx/include/mcu/stm32l1_bsp.h
+++ b/hw/mcu/stm/stm32l1xx/include/mcu/stm32l1_bsp.h
@@ -20,6 +20,9 @@
 #ifndef __MCU_STM32L1_BSP_H_
 #define __MCU_STM32L1_BSP_H_
 
+#include <hal/hal_gpio.h>
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-- 
To stop receiving notification emails like this one, please contact
utzig@apache.org.