]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Merge with default.
authormaek <devnull@localhost>
Mon, 29 Nov 2010 15:27:37 +0000 (16:27 +0100)
committermaek <devnull@localhost>
Mon, 29 Nov 2010 15:27:37 +0000 (16:27 +0100)
1  2 
arch/arm/arm_cm3/kernel/core_cm3.h
arch/arm/arm_cm3/kernel/startup_stm32f10x.s
arch/arm/arm_cm3/kernel/stm32f10x.h
arch/arm/arm_cm3/scripts/linkscript_gcc.ldf
arch/hc1x/hcs12d/kernel/irq.c
boards/board_common.mk
common/newlib_port.c
common/printf.c
system/EcuM/EcuM.c
system/kernel/isr.c

Simple merge
Simple merge
index 3e18df7888686848fd51e6651960f98d7f9fcb2d,146db2c5e6524e587b66197e4b49e088fe6b88c4..73ca3d53bde669b1e528b412f56f8d6d456044f8
@@@ -61,13 -63,18 +63,18 @@@ SECTION
  \r
        /* Read-only data section. */\r
        .rodata :       { \r
+           . = ALIGN(4);\r
                *(.rodata .rodata.* .gnu.linkonce.r.*)\r
 -              _sidata = .;\r
+           . = ALIGN(4);\r
 +              _sidata = ALIGN(.,4);\r
        } > flash\r
  \r
-       .data : AT(ALIGN(LOADADDR(.rodata)+SIZEOF(.rodata),4)) {\r
+       .data : AT ( _sidata )\r
+       {\r
+           . = ALIGN(4);\r
                _sdata = .; \r
                *(.data .data.* .gnu.linkonce.d.* .gnu.linkonce.r.* .eh_frame)\r
+           . = ALIGN(4);\r
                _edata = .;             \r
        } > ram\r
  \r
Simple merge
index 1dd2efc0cf55cbab887e5b85bde8258b417aa652,c166eeb4f7acb046be6bf9ad6f2e203947b1684f..45dddfbb7acb13c5c02e569df7d5d46778d0e99b
@@@ -1,13 -1,23 +1,27 @@@
  obj-$(CFG_PPC) += crt0.o\r
- obj-$(CFG_HCS12D) += crt0.o\r
- vpath-$(CFG_ARM_CM3) += $(ARCH_PATH-y)kernel\r
+ obj-$(CFG_HC1X) += crt0.o\r
+ vpath-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/kernel\r
+ vpath-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers/STM32F10x_StdPeriph_Driver/src\r
+ vpath-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers/STM32_ETH_Driver/src\r
+ inc-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers/STM32F10x_StdPeriph_Driver/inc\r
+ inc-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers/STM32_ETH_Driver/inc\r
  obj-$(CFG_ARM_CM3) += core_cm3.o\r
  obj-$(CFG_ARM_CM3) += startup_stm32f10x.o\r
+ #stm32 lib files needed by drivers\r
+ obj-$(CFG_ARM_CM3) += stm32f10x_rcc.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_CAN) += stm32f10x_can.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_DIO) += stm32f10x_gpio.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_ADC) += stm32f10x_adc.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_ADC) += stm32f10x_dma.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_FLS) += stm32f10x_flash.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_PWM) += stm32f10x_tim.o\r
+ obj-$(CFG_ARM_CM3)-$(USE_LWIP) += stm32_eth.o\r
\r
 +obj-$(USE_TTY_TMS570_KEIL) += GLCD.o\r
 +obj-$(USE_TTY_TMS570_KEIL) += emif.o\r
  \r
 +# Cortex R4\r
 +obj-$(CFG_ARM_CR4) += startup_cr4.o\r
  \r
  # OS object files. \r
  # (checking if already included for compatability)\r
index e039002a2f4b4e9444d99e160d6b9ab4ea875a14,6db2292ce807b46626db85af8745081c874d0cf9..28d7a11c25e1affc31360f79867f486b3d620156
@@@ -80,124 -80,15 +80,131 @@@ static volatile char g_TConn __attribut
  \r
  #endif\r
  \r
 +#ifdef USE_TTY_CODE_COMPOSER\r
 +\r
 +#define _DTOPEN    (0xF0)\r
 +#define _DTCLOSE   (0xF1)\r
 +#define _DTREAD    (0xF2)\r
 +#define _DTWRITE   (0xF3)\r
 +#define _DTLSEEK   (0xF4)\r
 +#define _DTUNLINK  (0xF5)\r
 +#define _DTGETENV  (0xF6)\r
 +#define _DTRENAME  (0xF7)\r
 +#define _DTGETTIME (0xF8)\r
 +#define _DTGETCLK  (0xF9)\r
 +#define _DTSYNC    (0xFF)\r
 +\r
 +#define LOADSHORT(x,y,z)  { x[(z)]   = (unsigned short) (y); \\r
 +                            x[(z)+1] = (unsigned short) (y) >> 8;  }\r
 +\r
 +#define UNLOADSHORT(x,z) ((short) ( (short) x[(z)] +             \\r
 +                                 ((short) x[(z)+1] << 8)))\r
 +\r
 +#define PACKCHAR(val, base, byte) ( (base)[(byte)] = (val) )\r
 +\r
 +#define UNPACKCHAR(base, byte)    ( (base)[byte] )\r
 +\r
 +\r
 +static unsigned char parmbuf[8];\r
 +#define BUFSIZ 512\r
 +#define CC_BUFFER_SIZE ((BUFSIZ)+32)\r
 +volatile unsigned int _CIOBUF_[CC_BUFFER_SIZE] __attribute__ ((section (".cio")));\r
 +\r
 +/***************************************************************************/\r
 +/*                                                                         */\r
 +/*  WRITEMSG()  -  Sends the passed data and parameters on to the host.    */\r
 +/*                                                                         */\r
 +/***************************************************************************/\r
 +void writemsg(unsigned char  command,\r
 +              register const unsigned char *parm,\r
 +              register const          char *data,\r
 +              unsigned int            length)\r
 +{\r
 +   volatile unsigned char *p = (volatile unsigned char *)(_CIOBUF_+1);\r
 +   unsigned int i;\r
 +\r
 +   /***********************************************************************/\r
 +   /* THE LENGTH IS WRITTEN AS A TARGET INT                               */\r
 +   /***********************************************************************/\r
 +   _CIOBUF_[0] = length;\r
 +\r
 +   /***********************************************************************/\r
 +   /* THE COMMAND IS WRITTEN AS A TARGET BYTE                             */\r
 +   /***********************************************************************/\r
 +   *p++ = command;\r
 +\r
 +   /***********************************************************************/\r
 +   /* PACK THE PARAMETERS AND DATA SO THE HOST READS IT AS BYTE STREAM    */\r
 +   /***********************************************************************/\r
 +   for (i = 0; i < 8; i++)      PACKCHAR(*parm++, p, i);\r
 +   for (i = 0; i < length; i++) PACKCHAR(*data++, p, i+8);\r
 +\r
 +   /***********************************************************************/\r
 +   /* THE BREAKPOINT THAT SIGNALS THE HOST TO DO DATA TRANSFER            */\r
 +   /***********************************************************************/\r
 +   __asm("     .global C$$IO$$");\r
 +   __asm("C$$IO$$: nop");\r
 +}\r
 +\r
 +/***************************************************************************/\r
 +/*                                                                         */\r
 +/*  READMSG()   -  Reads the data and parameters passed from the host.     */\r
 +/*                                                                         */\r
 +/***************************************************************************/\r
 +void readmsg(register unsigned char *parm,\r
 +           register char          *data)\r
 +{\r
 +   volatile unsigned char *p = (volatile unsigned char *)(_CIOBUF_+1);\r
 +   unsigned int   i;\r
 +   unsigned int   length;\r
 +\r
 +   /***********************************************************************/\r
 +   /* THE LENGTH IS READ AS A TARGET INT                                  */\r
 +   /***********************************************************************/\r
 +   length = _CIOBUF_[0];\r
 +\r
 +   /***********************************************************************/\r
 +   /* UNPACK THE PARAMETERS AND DATA                                      */\r
 +   /***********************************************************************/\r
 +   for (i = 0; i < 8; i++) *parm++ = UNPACKCHAR(p, i);\r
 +   if (data != NULL)\r
 +      for (i = 0; i < length; i++) *data++ = UNPACKCHAR(p, i+8);\r
 +}\r
 +\r
 +/****************************************************************************/\r
 +/* HOSTWRITE()  -  Pass the write command and its arguments to the host.    */\r
 +/****************************************************************************/\r
 +int HOSTwrite(int dev_fd, const char *buf, unsigned count)\r
 +{\r
 +   int result;\r
 +\r
 +   if (count > BUFSIZ) count = BUFSIZ;\r
 +\r
 +   LOADSHORT(parmbuf,dev_fd,0);\r
 +   LOADSHORT(parmbuf,count,2);\r
 +   writemsg(_DTWRITE,parmbuf,(char *)buf,count);\r
 +   readmsg(parmbuf,NULL);\r
 +\r
 +   result = UNLOADSHORT(parmbuf,0);\r
 +\r
 +   return result;\r
 +}\r
 +\r
 +#endif\r
 +\r
 +#ifdef USE_TTY_TMS570_KEIL\r
 +#include "GLCD.h"\r
 +#endif\r
 +\r
  #define FILE_RAMLOG           3\r
  \r
+ /* Location MUST match NoICE configuration */\r
+ #ifdef USE_TTY_NOICE\r
+ static volatile char VUART_TX __attribute__ ((section (".noice_port")));\r
+ static volatile char VUART_RX __attribute__ ((section (".noice_port")));\r
+ volatile unsigned char START_VUART = 0;\r
+ #endif\r
\r
  /*\r
   * T32 stuff\r
   */\r
diff --cc common/printf.c
Simple merge
Simple merge
Simple merge