ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add ARMC6 feature to EV_COG_AD4050LZ and EV_COG_AD3029LZ

pull/5627/head
Edmund Hsu 2017-11-21 14:02:34 +11:00
parent a519b8449b
commit 7c8cbd6ca2
17 changed files with 30 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c
View File

@ -45,7 +45,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*****************************************************************************/ *****************************************************************************/
#include <stdint.h> #include <stdint.h>
#ifdef __CC_ARM #ifdef __ARMCC_VERSION
#include <rt_misc.h> #include <rt_misc.h>
#endif #endif
#include <cmsis.h> #include <cmsis.h>
@ -61,8 +61,8 @@ extern void SramInit(void);
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
Checksum options Checksum options
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if defined (__CC_ARM) #if defined (__ARMCC_VERSION)
__attribute__ ((at(0x000001A0u))) __attribute__((section(".ARM.__at_0x000001A0")))
#elif defined( __ICCARM__) #elif defined( __ICCARM__)
__root __root
#endif /* __ICCARM__ */ #endif /* __ICCARM__ */
@ -151,7 +151,7 @@ const pFunc SECTION_PLACE(IVT_NAME[104],VECTOR_SECTION) =
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Initialize .bss and .data for GNU * Initialize .bss and .data for GNU
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if defined( __GNUC__) && !defined (__CC_ARM) #if defined( __GNUC__) && !defined (__ARMCC_VERSION)
void zero_bss(void) void zero_bss(void)
{ {
uint32_t *pSrc, *pDest; uint32_t *pSrc, *pDest;
@ -248,7 +248,7 @@ void Reset_Handler(void)
may reside in DSRAM bank B. */ may reside in DSRAM bank B. */
SramInit(); SramInit();
#if defined(__GNUC__) && !defined (__CC_ARM) #if defined(__GNUC__) && !defined (__ARMCC_VERSION)
/* Clear the bss section for GCC build only */ /* Clear the bss section for GCC build only */
zero_bss(); zero_bss();
#endif #endif
@ -263,7 +263,7 @@ void Reset_Handler(void)
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
Default Handler for Exceptions / Interrupts Default Handler for Exceptions / Interrupts
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if defined(__CC_ARM) || defined (__GNUC__) #if defined(__ARMCC_VERSION) || defined (__GNUC__)
void Default_Handler(void) void Default_Handler(void)
{ {
while(1); while(1);

10
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.h
View File

@ -63,16 +63,14 @@ RESET_EXCPT_HNDLR
#define VECTOR_SECTION ".vectors" #define VECTOR_SECTION ".vectors"
#ifdef __CC_ARM #ifdef __ARMCC_VERSION
extern unsigned Image$$ADUCM_HEAP$$Base[];
extern unsigned Image$$ADUCM_HEAP$$ZI$$Limit[];
void Default_Handler(void); void Default_Handler(void);
#define SECTION_NAME(sectionname) __attribute__ ((section(sectionname))) #define SECTION_NAME(sectionname) __attribute__((section(sectionname)))
#define SECTION_PLACE(def,sectionname) def __attribute__ ((section(sectionname))) #define SECTION_PLACE(def,sectionname) def __attribute__((section(sectionname)))
#define IVT_NAME __Vectors #define IVT_NAME __Vectors
#define RESET_EXCPT_HNDLR __main #define RESET_EXCPT_HNDLR __main
#define COMPILER_NAME "ARMCC" #define COMPILER_NAME "ARMCC"
#define WEAK_FUNCTION(x) void x (void) __attribute__ ((weak, alias("Default_Handler"))); #define WEAK_FUNCTION(x) void x (void) __attribute__((weak, alias("Default_Handler")));
#elif defined(__ICCARM__) #elif defined(__ICCARM__)
#pragma diag_suppress=Pm093,Pm140 #pragma diag_suppress=Pm093,Pm140

2
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/trng_api.c
View File

@ -55,7 +55,7 @@
#define TRNG_PRESCALER 2 #define TRNG_PRESCALER 2
/* RNG Device memory */ /* RNG Device memory */
static uint8_t RngDevMem[ADI_RNG_MEMORY_SIZE]; static uint32_t RngDevMem[(ADI_RNG_MEMORY_SIZE + 3)/4];
void trng_init(trng_t *obj) void trng_init(trng_t *obj)
{ {

4
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/bsp/ADuCM3029_typedefs.h
View File

@ -62,10 +62,6 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma diag_suppress=Pm008,Pm093 #pragma diag_suppress=Pm008,Pm093
#endif /* __ICCARM__ */ #endif /* __ICCARM__ */
#if defined (__CC_ARM)
#pragma anon_unions
#endif /* __CC_ARM */
#define __ADI_NO_DECL_STRUCT_ADI_CRYPT_CFG_t__ #define __ADI_NO_DECL_STRUCT_ADI_CRYPT_CFG_t__
#include <sys/ADuCM302x_typedefs.h> #include <sys/ADuCM302x_typedefs.h>

2
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/bsp/crypto/adi_crypto.c
View File

@ -123,7 +123,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define __ADI_BYTE_SWAP(X) __REV(X) #define __ADI_BYTE_SWAP(X) __REV(X)
#elif defined (__GNUC__) #elif defined (__GNUC__)
#define __ADI_BYTE_SWAP(X) __builtin_bswap32(X) #define __ADI_BYTE_SWAP(X) __builtin_bswap32(X)
#elif defined (__CC_ARM) #elif defined (__ARMCC_VERSION)
#define __ADI_BYTE_SWAP(X) __rev(X) #define __ADI_BYTE_SWAP(X) __rev(X)
#else #else
#error "This toolchain is not supported" #error "This toolchain is not supported"

2
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/bsp/dma/adi_dma.c
View File

@ -272,7 +272,7 @@ ADI_DMA_RESULT adi_dma_RegisterCallback (
/* ARM Cortex-M3/M4, GNU-ARM compiler */ /* ARM Cortex-M3/M4, GNU-ARM compiler */
#define ADI_CLZ(X) __builtin_clz(X) #define ADI_CLZ(X) __builtin_clz(X)
#elif defined(__CC_ARM) #elif defined(__ARMCC_VERSION)
/* ARM Cortex-M3/M4, Keil compiler */ /* ARM Cortex-M3/M4, Keil compiler */
#define ADI_CLZ(X) __clz(X) #define ADI_CLZ(X) __clz(X)

4
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/bsp/drivers/general/adi_drivers_general.h
View File

@ -82,10 +82,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define ADI_ALIGNED_ATTRIBUTE(num) #define ADI_ALIGNED_ATTRIBUTE(num)
#define ADI_ALIGNED_PRAGMA(num) PRAGMA(data_alignment=num) #define ADI_ALIGNED_PRAGMA(num) PRAGMA(data_alignment=num)
#define ADI_UNUSED_ATTRIBUTE #define ADI_UNUSED_ATTRIBUTE
#elif defined (__CC_ARM) #elif defined (__ARMCC_VERSION)
/* Keil uses a decorator which is placed in the same position as pragmas */ /* Keil uses a decorator which is placed in the same position as pragmas */
#define ADI_ALIGNED_ATTRIBUTE(num) #define ADI_ALIGNED_ATTRIBUTE(num)
#define ADI_ALIGNED_PRAGMA(num) __align(##num) #define ADI_ALIGNED_PRAGMA(num) __attribute__((aligned(num)))
#define ADI_UNUSED_ATTRIBUTE ATTRIBUTE(unused) #define ADI_UNUSED_ATTRIBUTE ATTRIBUTE(unused)
#else #else
#error "Toolchain not supported" #error "Toolchain not supported"

11
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/bsp/sys/ADuCM302x_device.h
View File

@ -25,12 +25,6 @@
/* pickup register bitfield and bit masks */ /* pickup register bitfield and bit masks */
#include "ADuCM302x_typedefs.h" #include "ADuCM302x_typedefs.h"
#if defined ( __CC_ARM )
#pragma push
#pragma anon_unions
#endif
#ifndef __IO #ifndef __IO
#ifdef __cplusplus #ifdef __cplusplus
#define __I volatile /* read-only */ #define __I volatile /* read-only */
@ -1209,9 +1203,4 @@ typedef enum
#pragma diag(pop) #pragma diag(pop)
#endif /* _MISRA_RULES */ #endif /* _MISRA_RULES */
#if defined (__CC_ARM)
#pragma pop
#endif
#endif #endif

11
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/bsp/sys/ADuCM302x_typedefs.h
View File

@ -22,12 +22,6 @@
#include <stdint.h> #include <stdint.h>
#endif /* _LANGUAGE_C */ #endif /* _LANGUAGE_C */
#if defined ( __CC_ARM )
#pragma push
#pragma anon_unions
#endif
#if defined (_MISRA_RULES) #if defined (_MISRA_RULES)
/* /*
anonymous unions violate ISO 9899:1990 and therefore MISRA Rule 1.1. anonymous unions violate ISO 9899:1990 and therefore MISRA Rule 1.1.
@ -9556,9 +9550,4 @@ typedef struct _ADI_NVIC_INTCID3_t {
#pragma diag(pop) #pragma diag(pop)
#endif /* _MISRA_RULES */ #endif /* _MISRA_RULES */
#if defined (__CC_ARM)
#pragma pop
#endif
#endif #endif

12
targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c
View File

@ -44,7 +44,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*****************************************************************************/ *****************************************************************************/
#ifdef __CC_ARM #ifdef __ARMCC_VERSION
#include <stdint.h> #include <stdint.h>
#include <rt_misc.h> #include <rt_misc.h>
#endif #endif
@ -55,8 +55,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
Checksum options Checksum options
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if defined (__CC_ARM) #if defined (__ARMCC_VERSION)
__attribute__ ((at(0x000001A0u))) __attribute__((section(".ARM.__at_0x000001A0")))
#elif defined(__ICCARM__) #elif defined(__ICCARM__)
__root __root
#endif #endif
@ -155,7 +155,7 @@ const pFunc SECTION_PLACE(IVT_NAME[104],VECTOR_SECTION) = {
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Initialize .bss and .data for GNU * Initialize .bss and .data for GNU
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if defined( __GNUC__) && !defined (__CC_ARM) #if defined( __GNUC__) && !defined (__ARMCC_VERSION)
void zero_bss(void) void zero_bss(void)
{ {
uint32_t *pSrc, *pDest; uint32_t *pSrc, *pDest;
@ -251,7 +251,7 @@ void Reset_Handler(void)
/* Initialize SRAM configuration. */ /* Initialize SRAM configuration. */
SramInit(); SramInit();
#if defined(__GNUC__) && !defined (__CC_ARM) #if defined(__GNUC__) && !defined (__ARMCC_VERSION)
zero_bss(); zero_bss();
#endif #endif
@ -265,7 +265,7 @@ void Reset_Handler(void)
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
Default Handler for Exceptions / Interrupts Default Handler for Exceptions / Interrupts
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if defined(__CC_ARM) || defined (__GNUC__) #if defined(__ARMCC_VERSION) || defined (__GNUC__)
void Default_Handler(void) void Default_Handler(void)
{ {
while(1); while(1);

10
targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.h
View File

@ -63,16 +63,14 @@ RESET_EXCPT_HNDLR
#include <adi_types.h> #include <adi_types.h>
#define VECTOR_SECTION ".vectors" #define VECTOR_SECTION ".vectors"
#ifdef __CC_ARM #ifdef __ARMCC_VERSION
extern unsigned Image$$ADUCM_HEAP$$Base[];
extern unsigned Image$$ADUCM_HEAP$$ZI$$Limit[];
void Default_Handler(void); void Default_Handler(void);
#define SECTION_NAME(sectionname) __attribute__ ((section(sectionname))) #define SECTION_NAME(sectionname) __attribute__((section(sectionname)))
#define SECTION_PLACE(def,sectionname) def __attribute__ ((section(sectionname))) #define SECTION_PLACE(def,sectionname) def __attribute__((section(sectionname)))
#define IVT_NAME __Vectors #define IVT_NAME __Vectors
#define RESET_EXCPT_HNDLR __main #define RESET_EXCPT_HNDLR __main
#define COMPILER_NAME "ARMCC" #define COMPILER_NAME "ARMCC"
#define WEAK_FUNCTION(x) void x (void) __attribute__ ((weak, alias("Default_Handler"))); #define WEAK_FUNCTION(x) void x (void) __attribute__((weak, alias("Default_Handler")));
#elif defined(__ICCARM__) #elif defined(__ICCARM__)
/* /*
* IAR MISRA C 2004 error suppressions: * IAR MISRA C 2004 error suppressions:

2
targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/bsp/crypto/adi_crypto.c
View File

@ -121,7 +121,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define __ADI_BYTE_SWAP(X) __REV(X) #define __ADI_BYTE_SWAP(X) __REV(X)
#elif defined (__GNUC__) #elif defined (__GNUC__)
#define __ADI_BYTE_SWAP(X) __builtin_bswap32(X) #define __ADI_BYTE_SWAP(X) __builtin_bswap32(X)
#elif defined (__CC_ARM) #elif defined (__ARMCC_VERSION)
#define __ADI_BYTE_SWAP(X) __rev(X) #define __ADI_BYTE_SWAP(X) __rev(X)
#else #else
#error "This toolchain is not supported" #error "This toolchain is not supported"

2
targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/bsp/dma/adi_dma.c
View File

@ -272,7 +272,7 @@ ADI_DMA_RESULT adi_dma_RegisterCallback (
/* ARM Cortex-M3/M4, GNU-ARM compiler */ /* ARM Cortex-M3/M4, GNU-ARM compiler */
#define ADI_CLZ(X) __builtin_clz(X) #define ADI_CLZ(X) __builtin_clz(X)
#elif defined(__CC_ARM) #elif defined(__ARMCC_VERSION)
/* ARM Cortex-M3/M4, Keil compiler */ /* ARM Cortex-M3/M4, Keil compiler */
#define ADI_CLZ(X) __clz(X) #define ADI_CLZ(X) __clz(X)

4
targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/bsp/drivers/general/adi_drivers_general.h
View File

@ -82,10 +82,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define ADI_ALIGNED_ATTRIBUTE(num) #define ADI_ALIGNED_ATTRIBUTE(num)
#define ADI_ALIGNED_PRAGMA(num) PRAGMA(data_alignment=num) #define ADI_ALIGNED_PRAGMA(num) PRAGMA(data_alignment=num)
#define ADI_UNUSED_ATTRIBUTE #define ADI_UNUSED_ATTRIBUTE
#elif defined (__CC_ARM) #elif defined (__ARMCC_VERSION)
/* Keil uses a decorator which is placed in the same position as pragmas */ /* Keil uses a decorator which is placed in the same position as pragmas */
#define ADI_ALIGNED_ATTRIBUTE(num) #define ADI_ALIGNED_ATTRIBUTE(num)
#define ADI_ALIGNED_PRAGMA(num) __align(##num) #define ADI_ALIGNED_PRAGMA(num) __attribute__((aligned(num)))
#define ADI_UNUSED_ATTRIBUTE ATTRIBUTE(unused) #define ADI_UNUSED_ATTRIBUTE ATTRIBUTE(unused)
#else #else
#error "Toolchain not supported" #error "Toolchain not supported"

11
targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/bsp/sys/adi_ADuCM4050_device.h
View File

@ -25,12 +25,6 @@
/* pickup register bitfield and bit masks */ /* pickup register bitfield and bit masks */
#include "adi_ADuCM4050_typedefs.h" #include "adi_ADuCM4050_typedefs.h"
#if defined ( __CC_ARM )
#pragma push
#pragma anon_unions
#endif
#ifndef __IO #ifndef __IO
#ifdef __cplusplus #ifdef __cplusplus
#define __I volatile /* read-only */ #define __I volatile /* read-only */
@ -1330,9 +1324,4 @@ typedef enum
#pragma diag(pop) #pragma diag(pop)
#endif /* _MISRA_RULES */ #endif /* _MISRA_RULES */
#if defined (__CC_ARM)
#pragma pop
#endif
#endif #endif

11
targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/bsp/sys/adi_ADuCM4050_typedefs.h
View File

@ -22,12 +22,6 @@
#include <stdint.h> #include <stdint.h>
#endif /* _LANGUAGE_C */ #endif /* _LANGUAGE_C */
#if defined ( __CC_ARM )
#pragma push
#pragma anon_unions
#endif
#if defined (_MISRA_RULES) #if defined (_MISRA_RULES)
/* /*
anonymous unions violate ISO 9899:1990 and therefore MISRA Rule 1.1. anonymous unions violate ISO 9899:1990 and therefore MISRA Rule 1.1.
@ -11244,9 +11238,4 @@ typedef struct _ADI_NVIC_INTCID3_t {
#pragma diag(pop) #pragma diag(pop)
#endif /* _MISRA_RULES */ #endif /* _MISRA_RULES */
#if defined (__CC_ARM)
#pragma pop
#endif
#endif #endif

2
targets/targets.json
View File

@ -622,7 +622,7 @@
}, },
"EV_COG_AD4050LZ": { "EV_COG_AD4050LZ": {
"inherits": ["Target"], "inherits": ["Target"],
"core": "Cortex-M4", "core": "Cortex-M4F",
"supported_toolchains": ["ARM", "GCC_ARM", "IAR"], "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
"macros": ["__ADUCM4050__", "EV_COG_AD4050LZ"], "macros": ["__ADUCM4050__", "EV_COG_AD4050LZ"],
"extra_labels": ["Analog_Devices", "ADUCM4X50", "ADUCM4050", "EV_COG_AD4050LZ", "FLASH_CMSIS_ALGO"], "extra_labels": ["Analog_Devices", "ADUCM4X50", "ADUCM4050", "EV_COG_AD4050LZ", "FLASH_CMSIS_ALGO"],