From f0ee23885a4dd2837848786c8cccd44cb68f0248 Mon Sep 17 00:00:00 2001 From: Marcio Montenegro Date: Mon, 26 Feb 2018 13:48:18 -0300 Subject: [PATCH] ext: gecko: Remove arm_math stuff from efm32hg*.h Header include "arm_math.h" causes duplicate symbol error on build. Signed-off-by: Marcio Montenegro Signed-off-by: Christian Taedcke --- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg108f32.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg108f64.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg110f32.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg110f64.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg210f32.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg210f64.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg222f32.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg222f64.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg308f32.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg308f64.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg309f32.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg309f64.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg310f32.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg310f64.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg321f32.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg321f64.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg322f32.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg322f64.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg350f32.h | 2 -- .../gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg350f64.h | 2 -- 20 files changed, 40 deletions(-) diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg108f32.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg108f32.h index 8100c9a89cb..ef144f3f612 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg108f32.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg108f32.h @@ -216,8 +216,6 @@ typedef enum IRQn /** @} End of group EFM32HG108F32_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg108f64.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg108f64.h index b0a39e0a133..258cb10b3c2 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg108f64.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg108f64.h @@ -216,8 +216,6 @@ typedef enum IRQn /** @} End of group EFM32HG108F64_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg110f32.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg110f32.h index 4482a13c12b..1d6b53fcd76 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg110f32.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg110f32.h @@ -224,8 +224,6 @@ typedef enum IRQn /** @} End of group EFM32HG110F32_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg110f64.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg110f64.h index dd4c381569d..3048dcf0e85 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg110f64.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg110f64.h @@ -224,8 +224,6 @@ typedef enum IRQn /** @} End of group EFM32HG110F64_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg210f32.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg210f32.h index d0b453fc3fd..956018eb1ef 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg210f32.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg210f32.h @@ -224,8 +224,6 @@ typedef enum IRQn /** @} End of group EFM32HG210F32_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg210f64.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg210f64.h index 51ebc9db8b3..1cf4ff71976 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg210f64.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg210f64.h @@ -224,8 +224,6 @@ typedef enum IRQn /** @} End of group EFM32HG210F64_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg222f32.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg222f32.h index 1b76246e45a..8f0eee4481a 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg222f32.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg222f32.h @@ -224,8 +224,6 @@ typedef enum IRQn /** @} End of group EFM32HG222F32_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg222f64.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg222f64.h index 2c8137209f9..90afe1eb32c 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg222f64.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg222f64.h @@ -224,8 +224,6 @@ typedef enum IRQn /** @} End of group EFM32HG222F64_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg308f32.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg308f32.h index 4ecd799427d..19843a2087f 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg308f32.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg308f32.h @@ -221,8 +221,6 @@ typedef enum IRQn /** @} End of group EFM32HG308F32_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg308f64.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg308f64.h index 3c46c52e926..caff97b7556 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg308f64.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg308f64.h @@ -221,8 +221,6 @@ typedef enum IRQn /** @} End of group EFM32HG308F64_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg309f32.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg309f32.h index d76bf9df697..75f225fb543 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg309f32.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg309f32.h @@ -229,8 +229,6 @@ typedef enum IRQn /** @} End of group EFM32HG309F32_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg309f64.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg309f64.h index 65bdc0ec5a8..6a2fd8b9f09 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg309f64.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg309f64.h @@ -229,8 +229,6 @@ typedef enum IRQn /** @} End of group EFM32HG309F64_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg310f32.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg310f32.h index 16a47c4aaa4..463c624c6ea 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg310f32.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg310f32.h @@ -229,8 +229,6 @@ typedef enum IRQn /** @} End of group EFM32HG310F32_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg310f64.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg310f64.h index 830d5091955..556d752b85c 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg310f64.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg310f64.h @@ -229,8 +229,6 @@ typedef enum IRQn /** @} End of group EFM32HG310F64_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg321f32.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg321f32.h index c36722c91a3..27d702ac7b2 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg321f32.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg321f32.h @@ -226,8 +226,6 @@ typedef enum IRQn /** @} End of group EFM32HG321F32_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg321f64.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg321f64.h index a0543bce6ee..dd93df81234 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg321f64.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg321f64.h @@ -226,8 +226,6 @@ typedef enum IRQn /** @} End of group EFM32HG321F64_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg322f32.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg322f32.h index 6b7b2709ee1..615e302efa6 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg322f32.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg322f32.h @@ -229,8 +229,6 @@ typedef enum IRQn /** @} End of group EFM32HG322F32_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg322f64.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg322f64.h index be4a5680676..a125985652d 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg322f64.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg322f64.h @@ -229,8 +229,6 @@ typedef enum IRQn /** @} End of group EFM32HG322F64_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg350f32.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg350f32.h index 67c2d715f80..f70c3ea01d3 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg350f32.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg350f32.h @@ -229,8 +229,6 @@ typedef enum IRQn /** @} End of group EFM32HG350F32_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */ diff --git a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg350f64.h b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg350f64.h index 4998b6caf1a..75f2665d764 100644 --- a/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg350f64.h +++ b/ext/hal/silabs/gecko/Device/SiliconLabs/EFM32HG/Include/efm32hg350f64.h @@ -229,8 +229,6 @@ typedef enum IRQn /** @} End of group EFM32HG350F64_Part */ -#define ARM_MATH_CM0PLUS -#include "arm_math.h" /* To get __CLZ definitions etc. */ #include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */ #include "system_efm32hg.h" /* System Header */