Skip to content

Commit 067630a

Browse files
committed
Analog devices: overwrite cmsis startup
define __PROGRAM_START so we use own startup as AD had it defined, this fixes the conflicts with CMSIS_5 update (they introduced low level init).
1 parent 2c8be47 commit 067630a

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4747
#ifdef __ARMCC_VERSION
4848
#include <rt_misc.h>
4949
#endif
50+
#define __PROGRAM_START
5051
#include <cmsis.h>
52+
#undef __PROGRAM_START
5153
#include <startup_ADuCM3029.h>
5254
#include <mbed_rtx.h>
5355

targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/system_ADuCM3029.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
3535
Portions Copyright (c) 2016 - 2017 Analog Devices, Inc.
3636
---------------------------------------------------------------------------*/
37+
#define __PROGRAM_START
3738
#include <cmsis.h>
39+
#undef __PROGRAM_START
3840
#include <adi_pwr.h>
3941
#include <adi_gpio.h>
4042
#include <startup_ADuCM3029.h>

targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4747
#ifdef __ARMCC_VERSION
4848
#include <rt_misc.h>
4949
#endif
50+
51+
#define __PROGRAM_START
5052
#include <cmsis.h>
53+
#undef __PROGRAM_START
5154
#include <startup_ADuCM4050.h>
5255
#include <mbed_rtx.h>
5356

targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ extern uint32_t Load$$LR$$LR_IROM1$$Base[];
102102
extern uint32_t __etext;
103103
extern uint32_t __data_start__;
104104
extern uint32_t __data_end__;
105-
extern uint32_t __copy_table_start__;
106-
extern uint32_t __copy_table_end__;
107-
extern uint32_t __zero_table_start__;
108-
extern uint32_t __zero_table_end__;
109105
extern uint32_t __bss_start__;
110106
extern uint32_t __bss_end__;
111107
extern uint32_t __StackTop;

targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/system_ADuCM4050.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
Portions Copyright (c) 2016 - 2017 Analog Devices, Inc.
3636
---------------------------------------------------------------------------*/
3737

38+
#define __PROGRAM_START
3839
#include <cmsis.h>
40+
#undef __PROGRAM_START
3941
#include <adi_pwr.h>
4042
#include <startup_ADuCM4050.h>
4143

0 commit comments

Comments
 (0)