Changeset 344ba65 in rtems


Ignore:
Timestamp:
Sep 6, 2007, 1:23:43 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
ce40d30
Parents:
ee8933f2
Message:

2007-09-06 Daniel Hellstrom <daniel@…>

  • Makefile.am, preinstall.am: New files, split of printk.
  • console/console.c, console/debugputs.c: Split printk support out.
  • include/spacewire.h: Removed.
  • Makefile.am, preinstall.am: Use the following new drivers from sparc/shared: PCI, b1553BRM, SpaceWire?(GRSPW), CAN (GRCAN), Raw UART.
Location:
c/src/lib/libbsp/sparc/leon3
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/leon3/ChangeLog

    ree8933f2 r344ba65  
     12007-09-06      Daniel Hellstrom <daniel@gaisler.com>
     2
     3        * Makefile.am, preinstall.am: New files, split of printk.
     4        * console/console.c, console/debugputs.c: Split printk support out.
     5        * include/spacewire.h: Removed.
     6        * Makefile.am, preinstall.am: Use the following new drivers from
     7        sparc/shared: PCI, b1553BRM, SpaceWire(GRSPW), CAN (GRCAN), Raw UART.
     8
    192007-09-06      Daniel Hellstrom <daniel@gaisler.com>
    210
  • c/src/lib/libbsp/sparc/leon3/Makefile.am

    ree8933f2 r344ba65  
    1212include_HEADERS = include/bsp.h
    1313include_HEADERS += include/tm27.h
     14include_HEADERS += ../../sparc/shared/include/debug_defs.h
    1415
    1516nodist_include_HEADERS = include/bspopts.h
     
    2425include_HEADERS += include/leon.h
    2526include_HEADERS += include/coverhd.h
    26 include_HEADERS += include/spacewire.h
    2727
    2828EXTRA_DIST = ../../sparc/shared/start.S
     
    5656
    5757noinst_PROGRAMS += console.rel
    58 console_rel_SOURCES = console/console.c console/consolereserveresources.c \
    59     console/debugputs.c
     58console_rel_SOURCES = console/console.c console/consolereserveresources.c
    6059console_rel_CPPFLAGS = $(AM_CPPFLAGS)
    6160console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     61
     62noinst_PROGRAMS += debugio.rel
     63debugio_rel_SOURCES = console/debugputs.c
     64debugio_rel_CPPFLAGS = $(AM_CPPFLAGS)
     65debugio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6266
    6367noinst_PROGRAMS += clock.rel
     
    6569clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    6670clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     71
     72# PCI
     73include_HEADERS += ../../sparc/shared/include/pci.h
     74noinst_PROGRAMS += pci.rel
     75pci_rel_SOURCES = pci/pci.c ../../sparc/shared/pci/pcifinddevice.c
     76pci_rel_CPPFLAGS = $(AM_CPPFLAGS)
     77pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     78
     79# B1553BRM
     80include_HEADERS += ../../sparc/shared/include/b1553brm.h ../../sparc/shared/include/b1553brm_pci.h
     81noinst_PROGRAMS += brm.rel
     82brm_rel_SOURCES = ../../sparc/shared/1553/b1553brm.c ../../sparc/shared/1553/b1553brm_pci.c
     83brm_rel_CPPFLAGS = $(AM_CPPFLAGS)
     84brm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     85
     86# CAN
     87include_HEADERS += ../../sparc/shared/include/occan.h ../../sparc/shared/include/occan_pci.h ../../sparc/shared/include/grcan.h
     88noinst_PROGRAMS += can.rel
     89can_rel_SOURCES = ../../sparc/shared/can/occan.c ../../sparc/shared/can/occan_pci.c  ../../sparc/shared/can/grcan.c
     90can_rel_CPPFLAGS = $(AM_CPPFLAGS)
     91can_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     92
     93# SpaceWire
     94include_HEADERS += ../../sparc/shared/include/grspw.h ../../sparc/shared/include/grspw_pci.h
     95noinst_PROGRAMS += spw.rel
     96spw_rel_SOURCES = ../../sparc/shared/spw/grspw.c ../../sparc/shared/spw/grspw_pci.c
     97spw_rel_CPPFLAGS = $(AM_CPPFLAGS)
     98spw_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     99
     100# UART
     101include_HEADERS += ../../sparc/shared/include/apbuart.h ../../sparc/shared/include/apbuart_pci.h
     102noinst_PROGRAMS += uart.rel
     103uart_rel_SOURCES = ../../sparc/shared/uart/apbuart.c ../../sparc/shared/uart/apbuart_pci.c
     104uart_rel_CPPFLAGS = $(AM_CPPFLAGS)
     105uart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     106
    67107
    68108if HAS_NETWORKING
     
    97137noinst_LIBRARIES = libbsp.a
    98138libbsp_a_SOURCES =
    99 libbsp_a_LIBADD = startup.rel amba.rel console.rel clock.rel timer.rel \
    100     gnatsupp.rel
     139libbsp_a_LIBADD = startup.rel amba.rel console.rel clock.rel debugio.rel \
     140  timer.rel gnatsupp.rel brm.rel can.rel spw.rel uart.rel pci.rel
    101141
    102142if HAS_NETWORKING
  • c/src/lib/libbsp/sparc/leon3/console/console.c

    ree8933f2 r344ba65  
    228228}
    229229
    230 /* putchar/getchar for printk */
    231 
    232 static void bsp_out_char(char c)
    233 {
    234   console_outbyte_polled(0, c);
    235 }
    236 
    237 BSP_output_char_function_type BSP_output_char = bsp_out_char;
    238 
    239 static char bsp_in_char(void)
    240 {
    241   int tmp;
    242 
    243   while ((tmp = console_inbyte_nonblocking(0)) < 0);
    244   return (char) tmp;
    245 }
    246 
    247 BSP_polling_getchar_function_type BSP_poll_char = bsp_in_char;
  • c/src/lib/libbsp/sparc/leon3/console/debugputs.c

    ree8933f2 r344ba65  
    7070  return -1;
    7171}
     72
     73/* putchar/getchar for printk */
     74
     75static void bsp_out_char(char c)
     76{
     77  console_outbyte_polled(0, c);
     78}
     79
     80BSP_output_char_function_type BSP_output_char = bsp_out_char;
     81
     82static char bsp_in_char(void)
     83{
     84  int tmp;
     85
     86  while ((tmp = console_inbyte_nonblocking(0)) < 0);
     87  return (char) tmp;
     88}
     89
     90BSP_polling_getchar_function_type BSP_poll_char = bsp_in_char;
  • c/src/lib/libbsp/sparc/leon3/preinstall.am

    ree8933f2 r344ba65  
    5353PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    5454
    55 $(PROJECT_INCLUDE)/spacewire.h: include/spacewire.h $(PROJECT_INCLUDE)/$(dirstamp)
    56         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/spacewire.h
    57 PREINSTALL_FILES += $(PROJECT_INCLUDE)/spacewire.h
    58 
    5955$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    6056        $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
     
    7369        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp.h
    7470PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp.h
     71
     72
     73# PCI
     74$(PROJECT_INCLUDE)/pci.h: ../../sparc/shared/include/pci.h $(PROJECT_INCLUDE)/$(dirstamp)
     75        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h
     76PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.h
     77
     78
     79# DEBUG
     80$(PROJECT_INCLUDE)/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/$(dirstamp)
     81        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/debug_defs.h
     82PREINSTALL_FILES += $(PROJECT_INCLUDE)/debug_defs.h
     83
     84
     85# SpaceWire
     86$(PROJECT_INCLUDE)/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/$(dirstamp)
     87        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw.h
     88PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw.h
     89
     90$(PROJECT_INCLUDE)/grspw_pci.h: ../../sparc/shared/include/grspw_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
     91        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw_pci.h
     92PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw_pci.h
     93
     94
     95# B1553BRM
     96$(PROJECT_INCLUDE)/b1553brm_pci.h: ../../sparc/shared/include/b1553brm_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
     97        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553brm_pci.h
     98PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553brm_pci.h
     99
     100$(PROJECT_INCLUDE)/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/$(dirstamp)
     101        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553brm.h
     102PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553brm.h
     103
     104
     105# CAN
     106$(PROJECT_INCLUDE)/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/$(dirstamp)
     107        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/occan.h
     108PREINSTALL_FILES += $(PROJECT_INCLUDE)/occan.h
     109
     110$(PROJECT_INCLUDE)/occan_pci.h: ../../sparc/shared/include/occan_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
     111        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/occan_pci.h
     112PREINSTALL_FILES += $(PROJECT_INCLUDE)/occan_pci.h
     113
     114$(PROJECT_INCLUDE)/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/$(dirstamp)
     115        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grcan.h
     116PREINSTALL_FILES += $(PROJECT_INCLUDE)/grcan.h
     117
     118
     119# UART
     120$(PROJECT_INCLUDE)/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/$(dirstamp)
     121        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart.h
     122PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart.h
     123
     124$(PROJECT_INCLUDE)/apbuart_pci.h: ../../sparc/shared/include/apbuart_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
     125        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart_pci.h
     126PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart_pci.h
Note: See TracChangeset for help on using the changeset viewer.