Changeset bb6ef078 in rtems


Ignore:
Timestamp:
Nov 21, 2009, 4:06:21 PM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
5d01adfb
Parents:
4eee8434
Message:

2009-11-21 Fernando Nicodemos <fgnicodemos@…>

  • Makefile.am, configure.ac, console/uarts.c: Add initial support for Kit637 version of CSB637.
  • README.kit637_v6, make/custom/kit637_v6.cfg: New files.
Location:
c/src/lib/libbsp/arm/csb337
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • c/src/lib/libbsp/arm/csb337/ChangeLog

    r4eee8434 rbb6ef078  
     12009-11-21      Fernando Nicodemos <fgnicodemos@terra.com.br>
     2
     3        * Makefile.am, configure.ac, console/uarts.c: Add initial support for
     4        Kit637 version of CSB637.
     5        * README.kit637_v6, make/custom/kit637_v6.cfg: New files.
     6
    172009-11-03      Ralf Corsépius <ralf.corsepius@rtems.org>
    28

  • c/src/lib/libbsp/arm/csb337/Makefile.am

    r4eee8434 rbb6ef078  
    1313include_HEADERS = include/bsp.h
    1414include_HEADERS += ../../shared/include/tm27.h
     15if ENABLE_LCD
    1516include_HEADERS += include/sed1356.h
     17endif
    1618
     19if ENABLE_UMON
    1720include_umondir = $(includedir)/umon
    1821include_umon_HEADERS  = ../../shared/umon/cli.h
    … …  
    2225include_rtemsdir = $(includedir)/rtems
    2326include_rtems_HEADERS  = ../../shared/umon/umon.h
     27endif
    2428
    2529nodist_include_HEADERS = include/bspopts.h
    … …  
    3640
    3741noinst_LIBRARIES = libbspstart.a
     42
    3843libbspstart_a_SOURCES = start/start.S
    3944project_lib_DATA = start.$(OBJEXT)
    … …  
    4247EXTRA_DIST = startup/linkcmds.csb337
    4348EXTRA_DIST += startup/linkcmds.csb637
     49EXTRA_DIST += README
     50EXTRA_DIST += README.kit637_v6
    4451
    4552noinst_LIBRARIES += libbsp.a
    46 libbsp_a_SOURCES =
    4753
    4854# startup
    49 libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
     55libbsp_a_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
    5056    ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
    5157    ../../shared/bsppretaskinghook.c startup/bspstart.c \
    … …  
    6167libbsp_a_SOURCES += ../shared/abort/abort.c
    6268# umon
     69if ENABLE_UMON
    6370libbsp_a_SOURCES += ../../shared/umon/umonrtemsglue.c  \
    6471    ../../shared/umon/monlib.c ../../shared/umon/tfsDriver.c \
    6572    ../../shared/umon/umoncons.c startup/umonsupp.c
     73endif
     74if ENABLE_UMON_CONSOLE
     75libbsp_a_SOURCES += ../../shared/umon/umoncons.c
     76endif
    6677
    6778if HAS_NETWORKING
    … …  
    7687    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
    7788    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dbgu.rel \
     89    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/usart.rel \
    7890    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
    7991    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/pmc.rel \

  • c/src/lib/libbsp/arm/csb337/configure.ac

    r4eee8434 rbb6ef078  
    1919AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
    2020
     21RTEMS_BSPOPTS_SET([csb637],[kit637_v6],[1])
    2122RTEMS_BSPOPTS_SET([csb637],[csb637],[1])
    2223RTEMS_BSPOPTS_SET([csb637],[*],[0])
    … …  
    2526 csb637 variant.])
    2627
     28RTEMS_BSPOPTS_SET([ENABLE_LCD],[kit637_v6],[0])
    2729RTEMS_BSPOPTS_SET([ENABLE_LCD],[*],[0])
    2830RTEMS_BSPOPTS_HELP([ENABLE_LCD],
    … …  
    3032AM_CONDITIONAL(ENABLE_LCD,test "$ENABLE_LCD" = "1")
    3133
     34RTEMS_BSPOPTS_SET([ENABLE_UMON],[*],[1])
     35RTEMS_BSPOPTS_HELP([ENABLE_UMON],
     36[If defined, enable use of the uMon console.])
     37AM_CONDITIONAL(ENABLE_UMON,test "$ENABLE_UMON" = "1")
     38
    3239RTEMS_BSPOPTS_SET([ENABLE_UMON_CONSOLE],[*],[1])
    3340RTEMS_BSPOPTS_HELP([ENABLE_UMON_CONSOLE],
    3441[If defined, enable use of the MicroMonitor console device.])
    35 AM_CONDITIONAL(ENABLE_LCD,test "$ENABLE_UMON_CONSOLE" = "1")
     42AM_CONDITIONAL(ENABLE_UMON_CONSOLE,test "$ENABLE_UMON_CONSOLE" = "1")
     43
     44## If ENABLE_UMON is 0 and ENABLE_UMON_CONSOLE is 1, then it is an error.
     45## TODO: Catch this error.
     46
     47RTEMS_BSPOPTS_SET([ENABLE_USART0],[*],[1])
     48RTEMS_BSPOPTS_HELP([ENABLE_USART0],
     49[If defined, enable use of the USART 0.])
     50AM_CONDITIONAL(ENABLE_USART0,test "$ENABLE_USART0" = "1")
     51
     52RTEMS_BSPOPTS_SET([ENABLE_USART1],[*],[1])
     53RTEMS_BSPOPTS_HELP([ENABLE_USART1],
     54[If defined, enable use of the USART 1.])
     55AM_CONDITIONAL(ENABLE_USART1,test "$ENABLE_USART1" = "1")
     56
     57RTEMS_BSPOPTS_SET([ENABLE_USART2],[*],[1])
     58RTEMS_BSPOPTS_HELP([ENABLE_USART2],
     59[If defined, enable use of the USART 2.])
     60AM_CONDITIONAL(ENABLE_USART2,test "$ENABLE_USART2" = "1")
     61
     62RTEMS_BSPOPTS_SET([ENABLE_USART3],[*],[1])
     63RTEMS_BSPOPTS_HELP([ENABLE_USART3],
     64[If defined, enable use of the USART 3.])
     65AM_CONDITIONAL(ENABLE_USART3,test "$ENABLE_USART3" = "1")
    3666
    3767RTEMS_BSP_CLEANUP_OPTIONS(1, 1)

  • c/src/lib/libbsp/arm/csb337/console/uarts.c

    r4eee8434 rbb6ef078  
    11/*
    2  *  Console driver for CSB337
     2 *  Console driver for for KIT637_V6 (CSB637)
    33 *
    44 *  This driver uses the shared console driver in
    … …  
    77 *  Copyright (c) 2003 by Cogent Computer Systems
    88 *  Written by Jay Monkman <jtm@lopingdog.com>
     9 *
     10 * Modified by Fernando Nicodemos <fgnicodemos@terra.com.br>
     11 * from NCB - Sistemas Embarcados Ltda. (Brazil)
    912 *
    1013 *  The license and distribution terms for this file may be
    … …  
    1215 *  http://www.rtems.com/license/LICENSE.
    1316 *
    14  *  FrameBuffer Console Device Support added By Joel Sherrill, 2009.
     17 *  Modified and FrameBuffer Console Device Support added by
     18 *  Joel Sherrill, 2009.
    1519 *
    1620 *  $Id$
    17  */
     21*/
    1822
    1923#include <bsp.h>
    … …  
    3135rtems_device_minor_number  Console_Port_Minor = 0;
    3236extern console_fns dbgu_fns;
     37
    3338#if ENABLE_LCD
    3439  extern console_fns fbcons_fns;
    35   #define LCD_DEVICE    1
    36 #else
    37   #define LCD_DEVICE    0
    38 #endif
    39 
    40 #if ENABLE_UMON_CONSOLE
     40  #define LCD_DEV 1
     41#else
     42  #define LCD_DEV 0
     43#endif
     44
     45#if (ENABLE_UMON && ENABLE_UMON_CONSOLE)
    4146  extern console_fns umoncons_fns;
    42   #define UMON_CONSOLE_DEVICE 1
    43 #else
    44   #define UMON_CONSOLE_DEVICE 0
    45 #endif
    46 
    47 #define NUM_DEVS   (1 + LCD_DEVICE + UMON_CONSOLE_DEVICE)
     47  #define UMON_CONS_DEV 1
     48#else
     49  #define UMON_CONS_DEV 0
     50#endif
     51
     52#if ENABLE_USART0 || ENABLE_USART1 || ENABLE_USART2 || ENABLE_USART3
     53  extern console_fns usart_polling_fns;
     54#endif
     55
     56#if ENABLE_USART0
     57  #define USART0_DEV 1
     58#else
     59  #define USART0_DEV 0
     60#endif
     61
     62#if ENABLE_USART1
     63  #define USART1_DEV 1
     64#else
     65  #define USART1_DEV 0
     66#endif
     67
     68#if ENABLE_USART2
     69  #define USART2_DEV 1
     70#else
     71  #define USART2_DEV 0
     72#endif
     73
     74#if ENABLE_USART3
     75  #define USART3_DEV 1
     76#else
     77  #define USART3_DEV 0
     78#endif
     79
     80#define NUM_DEVS \
     81  (1 + LCD_DEV + UMON_CONS_DEV + \
     82  USART0_DEV + USART1_DEV + USART2_DEV + USART3_DEV)
    4883
    4984/* These are used by code in console.c */
    … …  
    101136  },
    102137#endif
    103 #if ENABLE_UMON_CONSOLE
     138#if ENABLE_UMON
    104139  {
    105140    "/dev/umon",       /* sDeviceName */
    … …  
    120155    0,                 /* ulClock - NOT USED */
    121156    0                  /* ulIntVector - NOT USED */
     157  },
     158#endif
     159#if ENABLE_USART0
     160  {
     161    "/dev/com1",       /* sDeviceName */
     162    SERIAL_CUSTOM,     /* deviceType */
     163    &usart_polling_fns,/* pDeviceFns */
     164    NULL,              /* deviceProbe */
     165    NULL,              /* pDeviceFlow */
     166    0,                 /* ulMargin - NOT USED */
     167    0,                 /* ulHysteresis - NOT USED */
     168    NULL,              /* pDeviceParams */
     169    USART0_BASE,       /* ulCtrlPort1  - Pointer to USART 0 regs */
     170    0,                 /* ulCtrlPort2  - NOT USED */
     171    0,                 /* ulDataPort  - NOT USED */
     172    NULL,              /* getRegister - NOT USED */
     173    NULL,              /* setRegister - NOT USED */
     174    NULL,              /* getData - NOT USED */
     175    NULL,              /* setData - NOT USED */
     176    0,                 /* ulClock - NOT USED */
     177    0                  /* ulIntVector - NOT USED */
     178  },
     179#endif
     180#if ENABLE_USART1
     181  {
     182    "/dev/com2",       /* sDeviceName */
     183    SERIAL_CUSTOM,     /* deviceType */
     184    &usart_polling_fns,/* pDeviceFns */
     185    NULL,              /* deviceProbe */
     186    NULL,              /* pDeviceFlow */
     187    0,                 /* ulMargin - NOT USED */
     188    0,                 /* ulHysteresis - NOT USED */
     189    NULL,              /* pDeviceParams */
     190    USART1_BASE,       /* ulCtrlPort1  - Pointer to USART 1 regs */
     191    0,                 /* ulCtrlPort2  - NOT USED */
     192    0,                 /* ulDataPort  - NOT USED */
     193    NULL,              /* getRegister - NOT USED */
     194    NULL,              /* setRegister - NOT USED */
     195    NULL,              /* getData - NOT USED */
     196    NULL,              /* setData - NOT USED */
     197    0,                 /* ulClock - NOT USED */
     198    0                  /* ulIntVector - NOT USED */
     199  },
     200#endif
     201#if ENABLE_USART2
     202  {
     203    "/dev/com3",       /* sDeviceName */
     204    SERIAL_CUSTOM,     /* deviceType */
     205    &usart_polling_fns,/* pDeviceFns */
     206    NULL,              /* deviceProbe */
     207    NULL,              /* pDeviceFlow */
     208    0,                 /* ulMargin - NOT USED */
     209    0,                 /* ulHysteresis - NOT USED */
     210    NULL,              /* pDeviceParams */
     211    USART2_BASE,       /* ulCtrlPort1  - Pointer to USART 2 regs */
     212    0,                 /* ulCtrlPort2  - NOT USED */
     213    0,                 /* ulDataPort  - NOT USED */
     214    NULL,              /* getRegister - NOT USED */
     215    NULL,              /* setRegister - NOT USED */
     216    NULL,              /* getData - NOT USED */
     217    NULL,              /* setData - NOT USED */
     218    0,                 /* ulClock - NOT USED */
     219    0                  /* ulIntVector - NOT USED */
     220  },
     221#endif
     222#if ENABLE_USART3
     223  {
     224    "/dev/com4",       /* sDeviceName */
     225    SERIAL_CUSTOM,     /* deviceType */
     226    &usart_polling_fns,/* pDeviceFns */
     227    NULL,              /* deviceProbe */
     228    NULL,              /* pDeviceFlow */
     229    0,                 /* ulMargin - NOT USED */
     230    0,                 /* ulHysteresis - NOT USED */
     231    NULL,              /* pDeviceParams */
     232    USART3_BASE,       /* ulCtrlPort1  - Pointer to USART 3 regs */
     233    0,                 /* ulCtrlPort2  - NOT USED */
     234    0,                 /* ulDataPort  - NOT USED */
     235    NULL,              /* getRegister - NOT USED */
     236    NULL,              /* setRegister - NOT USED */
     237    NULL,              /* getData - NOT USED */
     238    NULL,              /* setData - NOT USED */
     239    0,                 /* ulClock - NOT USED */
     240    0                  /* ulIntVector - NOT USED */
    122241  }
    123242#endif
    124243};
    125 
    126244
    127245console_tbl *BSP_get_uart_from_minor(int minor)
Note: See TracChangeset for help on using the changeset viewer.