From 872f9af6aed49fa088d89152b983506285e1d34b Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Thu, 6 Aug 2015 00:03:45 -0700 Subject: [PATCH] stmhal: Use CMSIS_MCU definition from mpconfigboard.mk This needs to land afte #1407 lands, since #1407 is where the CMSIS_MCU was defined. --- stmhal/Makefile | 1 + stmhal/boards/CERB40/stm32f4xx_hal_conf.h | 1 - stmhal/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h | 1 - stmhal/boards/HYDRABUS/stm32f4xx_hal_conf.h | 1 - stmhal/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h | 1 - stmhal/boards/PYBV10/stm32f4xx_hal_conf.h | 1 - stmhal/boards/PYBV3/stm32f4xx_hal_conf.h | 1 - stmhal/boards/PYBV4/stm32f4xx_hal_conf.h | 1 - stmhal/boards/STM32F4DISC/stm32f4xx_hal_conf.h | 1 - stmhal/boards/STM32F7DISC/stm32f7xx_hal_conf.h | 1 - 10 files changed, 1 insertion(+), 9 deletions(-) diff --git a/stmhal/Makefile b/stmhal/Makefile index c3460c8c50..5f31be577d 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -49,6 +49,7 @@ CFLAGS_MCU_f4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 -DMCU_SERIES CFLAGS_MCU_f7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7 -DMCU_SERIES_F7 CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_MOD) +CFLAGS += -D$(CMSIS_MCU) CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES)) CFLAGS += $(COPT) CFLAGS += -Iboards/$(BOARD) diff --git a/stmhal/boards/CERB40/stm32f4xx_hal_conf.h b/stmhal/boards/CERB40/stm32f4xx_hal_conf.h index e878bde3de..d968dc7543 100644 --- a/stmhal/boards/CERB40/stm32f4xx_hal_conf.h +++ b/stmhal/boards/CERB40/stm32f4xx_hal_conf.h @@ -46,7 +46,6 @@ /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ -#define STM32F405xx #define USE_USB_FS /* ########################## Module Selection ############################## */ diff --git a/stmhal/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h b/stmhal/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h index 044862a0e2..fcbb6637a9 100644 --- a/stmhal/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h +++ b/stmhal/boards/ESPRUINO_PICO/stm32f4xx_hal_conf.h @@ -46,7 +46,6 @@ /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ -#define STM32F401xE #define USE_USB_FS /* ########################## Module Selection ############################## */ diff --git a/stmhal/boards/HYDRABUS/stm32f4xx_hal_conf.h b/stmhal/boards/HYDRABUS/stm32f4xx_hal_conf.h index 04dbd0724c..dffaaa9062 100644 --- a/stmhal/boards/HYDRABUS/stm32f4xx_hal_conf.h +++ b/stmhal/boards/HYDRABUS/stm32f4xx_hal_conf.h @@ -46,7 +46,6 @@ /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ -#define STM32F405xx #define USE_USB_FS /* ########################## Module Selection ############################## */ diff --git a/stmhal/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h b/stmhal/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h index cbea896142..46f7935c52 100644 --- a/stmhal/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h +++ b/stmhal/boards/NETDUINO_PLUS_2/stm32f4xx_hal_conf.h @@ -46,7 +46,6 @@ /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ -#define STM32F405xx #define USE_USB_FS /* ########################## Module Selection ############################## */ diff --git a/stmhal/boards/PYBV10/stm32f4xx_hal_conf.h b/stmhal/boards/PYBV10/stm32f4xx_hal_conf.h index 5a0c3d03af..5b5359667b 100644 --- a/stmhal/boards/PYBV10/stm32f4xx_hal_conf.h +++ b/stmhal/boards/PYBV10/stm32f4xx_hal_conf.h @@ -46,7 +46,6 @@ /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ -#define STM32F405xx #define USE_USB_FS /* ########################## Module Selection ############################## */ diff --git a/stmhal/boards/PYBV3/stm32f4xx_hal_conf.h b/stmhal/boards/PYBV3/stm32f4xx_hal_conf.h index 04dbd0724c..dffaaa9062 100644 --- a/stmhal/boards/PYBV3/stm32f4xx_hal_conf.h +++ b/stmhal/boards/PYBV3/stm32f4xx_hal_conf.h @@ -46,7 +46,6 @@ /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ -#define STM32F405xx #define USE_USB_FS /* ########################## Module Selection ############################## */ diff --git a/stmhal/boards/PYBV4/stm32f4xx_hal_conf.h b/stmhal/boards/PYBV4/stm32f4xx_hal_conf.h index 04dbd0724c..dffaaa9062 100644 --- a/stmhal/boards/PYBV4/stm32f4xx_hal_conf.h +++ b/stmhal/boards/PYBV4/stm32f4xx_hal_conf.h @@ -46,7 +46,6 @@ /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ -#define STM32F405xx #define USE_USB_FS /* ########################## Module Selection ############################## */ diff --git a/stmhal/boards/STM32F4DISC/stm32f4xx_hal_conf.h b/stmhal/boards/STM32F4DISC/stm32f4xx_hal_conf.h index b62fd1c5c0..dffaaa9062 100644 --- a/stmhal/boards/STM32F4DISC/stm32f4xx_hal_conf.h +++ b/stmhal/boards/STM32F4DISC/stm32f4xx_hal_conf.h @@ -46,7 +46,6 @@ /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ -#define STM32F407xx #define USE_USB_FS /* ########################## Module Selection ############################## */ diff --git a/stmhal/boards/STM32F7DISC/stm32f7xx_hal_conf.h b/stmhal/boards/STM32F7DISC/stm32f7xx_hal_conf.h index 5c6b22dd02..fb33add2ba 100644 --- a/stmhal/boards/STM32F7DISC/stm32f7xx_hal_conf.h +++ b/stmhal/boards/STM32F7DISC/stm32f7xx_hal_conf.h @@ -46,7 +46,6 @@ /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ -#define STM32F746xx #define USE_USB_FS /* ########################## Module Selection ############################## */