]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Merged in from jonte-1
authortojo <tobias.johansson@arccore.com>
Mon, 22 Nov 2010 13:29:44 +0000 (14:29 +0100)
committertojo <tobias.johansson@arccore.com>
Mon, 22 Nov 2010 13:29:44 +0000 (14:29 +0100)
1  2 
boards/board_common.mk
boards/stm32_stm3210c/build_config.mk
system/kernel/isr.c

index bbf5cb7b1a3ad21c4671a3dfcd9c91a1f8c5fc25,d2c18ec93f93bd797d8df0274af8f94f804452bd..2c3c8acb29efcf56e83164e2e6866ef7b39f9e1a
@@@ -198,11 -198,6 +198,10 @@@ obj-$(USE_TCF) += streams.
  inc-$(USE_TCF) += $(ROOTDIR)/common/tcf\r
  vpath-$(USE_TCF) += $(ROOTDIR)/common/tcf\r
  \r
- obj-y += arc.o\r
 +#SLEEP\r
 +obj-$(USE_SLEEP) += sleep.o\r
 +\r
 +\r
  # Newlib overrides (overridden by default)\r
  ifneq ($(CFG_STANDARD_NEWLIB),y)\r
  obj-y += xtoa.o\r
index 2fb364042303e74339fd65583172b88f54ad2a05,88bcede3771db22ac5db6975acc9a32ab787899c..d221a668a9d72a8ce2c0cb1fcf78542a7b7d9fd6
@@@ -27,9 -27,9 +27,9 @@@ CFG+=STM32_C
  \r
  MOD_AVAIL+=ADC CAN DIO MCU FLS PORT PWM     \r
  # System + Communication + Diagnostic\r
- MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM\r
+ MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE\r
  # Additional\r
 -MOD_AVAIL+=RAMLOG TCF LWIP\r
 +MOD_AVAIL+=RAMLOG TCF LWIP SLEEP RTE\r
  \r
  #\r
  # Extra defines \r
index 563cbf900d99edae656c77a8ded0a28d4575f314,7a7560151ae0615f1f792bbca0b9f2c892f2fb62..1fcf30fec3f8e53c9a419ce4ddd0ef7063bb2652
@@@ -261,9 -186,9 +261,6 @@@ void *Os_Isr( void *stack, void *isr_p 
                        PRETASKHOOK();
                } else {
                        OS_DEBUG(D_TASK,"Found candidate %s\n",new_pcb->name);
--#if defined(CFG_ARM_CM3)
--                      Irq_EOI2();
--#endif
                        Os_TaskSwapContextTo(NULL,new_pcb);
                }
        } else {