CM3: add support to the IAR Embedded Workbench(TM) compiler

[bertos.git] / bertos / cpu / cortex-m3 / hw / init_cm3.c

diff --git a/bertos/cpu/cortex-m3/hw/init_cm3.c b/bertos/cpu/cortex-m3/hw/init_cm3.c
index 079f08a31728acfd35feff4b0f11a8a895b3792d..4ce2f86f9ff9baf226e3617666757ccdbc776c8c 100644 (file)
--- a/bertos/cpu/cortex-m3/hw/init_cm3.c
+++ b/bertos/cpu/cortex-m3/hw/init_cm3.c
@@ -35,25 +35,26 @@
  * \author Andrea Righi <arighi@develer.com>
  */
 
+#include "cfg/cfg_proc.h" /* CONFIG_KERN_PREEMPT */
+#include "switch_ctx_cm3.h"
+
 #include <cfg/compiler.h>
-#include <cfg/cfg_proc.h> /* CONFIG_KERN_PREEMPT */
-#include <kern/proc_p.h>
 #include <cfg/debug.h>
+
 #include <cpu/attr.h> /* PAUSE */
 #include <cpu/irq.h> /* IRQ_DISABLE */
 #include <cpu/types.h>
+
 #include <drv/irq_cm3.h>
-#include "switch_ctx_cm3.h"
+#include <drv/clock_cm3.h>
 
-#if CPU_CM3_LM3S
-#include <drv/clock_lm3s.h>
-#include <io/lm3s.h>
-#elif CPU_CM3_STM32
-#include <drv/clock_stm32.h>
-#include <io/stm32.h>
-#endif
+#include <kern/proc_p.h>
+
+#include <io/cm3.h>
 
+#ifndef __IAR_SYSTEMS_ICC__
 extern size_t __text_end, __data_start, __data_end, __bss_start, __bss_end;
+#endif
 
 extern void __init2(void);
 
@@ -65,35 +66,13 @@ void __init2(void)
         */
        IRQ_DISABLE;
 
-#if CPU_CM3_LM3S
-       /*
-        * PLL may not function properly at default LDO setting.
-        *
-        * Description:
-        *
-        * In designs that enable and use the PLL module, unstable device
-        * behavior may occur with the LDO set at its default of 2.5 volts or
-        * below (minimum of 2.25 volts). Designs that do not use the PLL
-        * module are not affected.
-        *
-        * Workaround: Prior to enabling the PLL module, it is recommended that
-        * the default LDO voltage setting of 2.5 V be adjusted to 2.75 V using
-        * the LDO Power Control (LDOPCTL) register.
-        *
-        * Silicon Revision Affected: A1, A2
-        *
-        * See also: Stellaris LM3S1968 A2 Errata documentation.
-        */
-       if (REVISION_IS_A1 | REVISION_IS_A2)
-               HWREG(SYSCTL_LDOPCTL) = SYSCTL_LDOPCTL_2_75V;
-#endif
        /* Set the appropriate clocking configuration */
        clock_init();
 
        /* Initialize IRQ vector table in RAM */
        sysirq_init();
 
-#if CONFIG_KERN_PREEMPT
+#if (CONFIG_KERN && CONFIG_KERN_PREEMPT)
        /*
         * Voluntary context switch handler.
         *