From 067630a2dd4978cf7529c0eccfc810ddfeeb0669 Mon Sep 17 00:00:00 2001
From: Martin Kojtal <martin.kojtal@arm.com>
Date: Wed, 13 May 2020 11:39:28 +0100
Subject: [PATCH] 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).
---
 .../TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c         | 2 ++
 .../TARGET_EV_COG_AD3029LZ/device/system_ADuCM3029.c          | 2 ++
 .../TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c         | 3 +++
 .../TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.h         | 4 ----
 .../TARGET_EV_COG_AD4050LZ/device/system_ADuCM4050.c          | 2 ++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c
index 5ed935626a..d696e595ef 100755
--- a/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c
+++ b/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c
@@ -47,7 +47,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifdef __ARMCC_VERSION
 #include <rt_misc.h>
 #endif
+#define __PROGRAM_START
 #include <cmsis.h>
+#undef __PROGRAM_START
 #include <startup_ADuCM3029.h>
 #include <mbed_rtx.h>
 
diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/system_ADuCM3029.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/system_ADuCM3029.c
index b7697925cf..220c78d634 100755
--- a/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/system_ADuCM3029.c
+++ b/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/device/system_ADuCM3029.c
@@ -34,7 +34,9 @@
 
    Portions Copyright (c) 2016 - 2017 Analog Devices, Inc.
    ---------------------------------------------------------------------------*/
+#define __PROGRAM_START
 #include <cmsis.h>
+#undef __PROGRAM_START
 #include <adi_pwr.h>
 #include <adi_gpio.h>
 #include <startup_ADuCM3029.h>
diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c
index 96cbd39135..9194fd1bf9 100755
--- a/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c
+++ b/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c
@@ -47,7 +47,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifdef __ARMCC_VERSION
 #include <rt_misc.h>
 #endif
+
+#define __PROGRAM_START
 #include <cmsis.h>
+#undef __PROGRAM_START
 #include <startup_ADuCM4050.h>
 #include <mbed_rtx.h>
 
diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.h b/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.h
index 77a728fd42..2450681c6e 100755
--- a/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.h
+++ b/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.h
@@ -102,10 +102,6 @@ extern uint32_t Load$$LR$$LR_IROM1$$Base[];
 extern uint32_t __etext;
 extern uint32_t __data_start__;
 extern uint32_t __data_end__;
-extern uint32_t __copy_table_start__;
-extern uint32_t __copy_table_end__;
-extern uint32_t __zero_table_start__;
-extern uint32_t __zero_table_end__;
 extern uint32_t __bss_start__;
 extern uint32_t __bss_end__;
 extern uint32_t __StackTop;
diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/system_ADuCM4050.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/system_ADuCM4050.c
index 92bf7e6ac2..720903fa37 100755
--- a/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/system_ADuCM4050.c
+++ b/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/device/system_ADuCM4050.c
@@ -35,7 +35,9 @@
    Portions Copyright (c) 2016 - 2017 Analog Devices, Inc.
    ---------------------------------------------------------------------------*/
 
+#define __PROGRAM_START
 #include <cmsis.h>
+#undef __PROGRAM_START
 #include <adi_pwr.h>
 #include <startup_ADuCM4050.h>