Changeset 8b9acbf0 in rtems for c/src/lib/libbsp/arm


Ignore:
Timestamp:
Sep 13, 2000, 7:42:20 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
63c5ce45
Parents:
3db37a7c
Message:

2000-09-13 Joel Sherrill <joel@…>

  • Makefile.am, bsp_specs, configure.in, console/Makefile.am, include/Makefile.am, irq/Makefile.am, irq/irq.c, start/Makefile.am, startup/Makefile.am, startup/exit.c, wrapup/Makefile.am: Made to conform to current practice concerning automake and autoconf. Corrected minor warnings.
Location:
c/src/lib/libbsp/arm/vegaplus
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/vegaplus/ChangeLog

    r3db37a7c r8b9acbf0  
     12000-09-13      Joel Sherrill <joel@OARcorp.com>
     2
     3        * Makefile.am, bsp_specs, configure.in, console/Makefile.am,
     4        include/Makefile.am, irq/Makefile.am, irq/irq.c, start/Makefile.am,
     5        startup/Makefile.am, startup/exit.c, wrapup/Makefile.am:
     6        Made to conform to current practice concerning automake and
     7        autoconf.  Corrected minor warnings.
     8
    192000-09-13      Emmanuel Raguet <raguet@crf.canon.fr>
    210
  • c/src/lib/libbsp/arm/vegaplus/Makefile.am

    r3db37a7c r8b9acbf0  
    88# wrapup is the one that actually builds and installs the library
    99#  from the individual .rel files built in other directories
    10 SUBDIRS = . include console startup start irq wrapup
     10SUBDIRS = . include irq console startup start wrapup
     11
     12include $(top_srcdir)/../../bsp.am
    1113
    1214EXTRA_DIST = bsp_specs
  • c/src/lib/libbsp/arm/vegaplus/bsp_specs

    r3db37a7c r8b9acbf0  
    2020
    2121*link:
    22 %{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -T linkcmds%s -e _start}
     22%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -N -e _start}
    2323
  • c/src/lib/libbsp/arm/vegaplus/configure.in

    r3db37a7c r8b9acbf0  
    1818RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    1919RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
    20 RTEMS_CHECK_NETWORKING
    2120RTEMS_CANONICAL_HOST
    22 
    23 dnl if this is an i386, does gas have good code16 support?
    24 RTEMS_I386_GAS_CODE16
    25 AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
    26 
    27 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
    28 
    29 AC_CONFIG_SUBDIRS(tools)
    30 
    31 AC_SUBST(RTEMS_BSP)
    3221
    3322RTEMS_PROJECT_ROOT
  • c/src/lib/libbsp/arm/vegaplus/console/Makefile.am

    r3db37a7c r8b9acbf0  
    99PGM = $(ARCH)/console.rel
    1010
    11 C_FILES = uart.c console.c printk.c
     11C_FILES = uart.c console.c
    1212C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    1313
    14 H_FILES = uart.h bspio.h
    15 
    16 console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
     14OBJS = $(C_O_FILES)
    1715
    1816include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     17include $(top_srcdir)/../../../../../../automake/compile.am
    1918include $(top_srcdir)/../../../../../../automake/lib.am
    2019
     
    2322#
    2423
    25 $(PGM): $(console_rel_OBJECTS)
     24AM_CPPFLAGS += -I $(srcdir)/../irq
     25
     26$(PGM): $(OBJS)
    2627        $(make-rel)
    2728
    28 all: $(ARCH) $(console_rel_OBJECTS) $(PGM)
     29# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
     30
     31all-local: $(ARCH) $(OBJS) $(PGM)
    2932
    3033.PRECIOUS: $(PGM)
    3134
     35EXTRA_DIST = console.c
     36
    3237include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libbsp/arm/vegaplus/include/Makefile.am

    r3db37a7c r8b9acbf0  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 H_FILES =  bsp.h registers.h
     7H_FILES = bsp.h registers.h ../../../shared/include/coverhd.h
    88
    99$(PROJECT_INCLUDE):
     
    1313        $(INSTALL_DATA) $< $@
    1414
    15 $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
     15$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
    1616        $(INSTALL_DATA) $< $@
    1717
    18 PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h)
     18TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
     19    $(PROJECT_INCLUDE)/registers.h $(PROJECT_INCLUDE)/coverhd.h
    1920
    20 all: $(PREINSTALL_FILES)
     21all-local: $(TMPINSTALL_FILES)
    2122
    22 EXTRA_DIST = bspio.h bsp.h uart.h registers.h
     23EXTRA_DIST = bsp.h registers.h
    2324
    2425include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am

    r3db37a7c r8b9acbf0  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     
    1010
    1111C_FILES = irq.c irq_init.c bsp_irq_init.c
     12C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
     13
    1214S_FILES = irq_asm.S bsp_irq_asm.S
     15S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
     16
    1317H_FILES = irq.h
    1418
    15 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    16 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
    17 
    18 irq_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
    19 
    20 $(PROJECT_INCLUDE):
    21         $(mkinstalldirs) $@
    22 
    23 $(PROJECT_INCLUDE)/%.h: %.h
    24         $(INSTALL_DATA) $< $@
    25 
    26 PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h)
     19OBJS = $(C_O_FILES) $(S_O_FILES)
    2720
    2821include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     22include $(top_srcdir)/../../../../../../automake/compile.am
    2923include $(top_srcdir)/../../../../../../automake/lib.am
    3024
     
    3327#
    3428
    35 $(PGM): $(startup_rel_OBJECTS)
     29AM_CPPFLAGS += -I$(srcdir)
     30
     31$(PGM): $(OBJS)
    3632        $(make-rel)
    3733
    38 all: $(PREINSTALL_FILES) $(ARCH) $(irq_rel_OBJECTS) $(PGM)
     34# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
     35
     36all-local: $(ARCH) $(OBJS) $(PGM)
    3937
    4038.PRECIOUS: $(PGM)
    4139
    42 EXTRA_DIST = irq.c bsp_irq_init.c bsp_irq_asm.S
     40EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c irq.h
    4341
    4442include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libbsp/arm/vegaplus/irq/irq.c

    r3db37a7c r8b9acbf0  
    4040{
    4141    rtems_irq_hdl *HdlTable;
     42    rtems_interrupt_level level;
    4243   
    4344    if (!isValidInterrupt(irq->name)) {
     
    4748     * Check if default handler is actually connected. If not issue an error.
    4849     */
    49     HdlTable = VECTOR_TABLE;
     50    HdlTable = (rtems_irq_hdl *) VECTOR_TABLE;
    5051    if (*(HdlTable + irq->name) != default_int_handler) {
    5152      return 0;
     
    8788{
    8889    rtems_irq_hdl *HdlTable;
     90    rtems_interrupt_level level;
    8991 
    9092    if (!isValidInterrupt(irq->name)) {
     
    9496     * Check if the handler is actually connected. If not issue an error.
    9597     */
    96     HdlTable = VECTOR_TABLE;
     98    HdlTable = (rtems_irq_hdl *) VECTOR_TABLE;
    9799    if (*(HdlTable + irq->name) != irq->hdl) {
    98100      return 0;
  • c/src/lib/libbsp/arm/vegaplus/start/Makefile.am

    r3db37a7c r8b9acbf0  
    1212OBJS = $(S_O_FILES)
    1313
    14 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o
    15 
    1614include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     15include $(top_srcdir)/../../../../../../automake/compile.am
    1716include $(top_srcdir)/../../../../../../automake/lib.am
    1817
     
    2120#
    2221
    23 LINKCMDS = $(top_srcdir)/startup/linkcmds
    24 
    2522$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o
    2623        $(INSTALL_DATA) $< $@
    2724
     25TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o
    2826
    29 all: $(ARCH) $(OBJS) $(TMPINSTALL_FILES)
     27all: $(ARCH) $(OBJS) $(PGMS) $(TMPINSTALL_FILES)
    3028
    3129EXTRA_DIST = start.S
  • c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am

    r3db37a7c r8b9acbf0  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     
    77VPATH = @srcdir@:@srcdir@/../../../shared
    88
    9 C_FILES = bsplibc.c bsppost.c bspstart.c exit.c bootcard.c main.c sbrk.c gnatinstallhandler.c
     9PGM = $(ARCH)/startup.rel
     10
     11C_FILES = bsplibc.c bsppost.c bspstart.c exit.c bootcard.c main.c sbrk.c \
     12    gnatinstallhandler.c
    1013C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    1114
    12 S_FILES =
    13 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
    14 
    15 startup_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
     15OBJS = $(C_O_FILES)
    1616
    1717include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     18include $(top_srcdir)/../../../../../../automake/compile.am
    1819include $(top_srcdir)/../../../../../../automake/lib.am
    1920
     
    2223#
    2324
    24 
    25 $(PGM): $(startup_rel_OBJECTS)
     25$(PGM): $(OBJS)
    2626        $(make-rel)
    2727
     
    2929        $(INSTALL_DATA) $< $@
    3030
     31# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
    3132TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
    3233
    33 all: $(ARCH) $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
     34all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
    3435
    3536.PRECIOUS: $(PGM)
    3637
    37 EXTRA_DIST = linkcmds
     38EXTRA_DIST = bspstart.c exit.c linkcmds
    3839
    3940include $(top_srcdir)/../../../../../../automake/local.am
    40 
  • c/src/lib/libbsp/arm/vegaplus/startup/exit.c

    r3db37a7c r8b9acbf0  
    1717#include <stdio.h>
    1818#include <bsp.h>
    19 #include <bspio.h>
     19#include <bspIo.h>
    2020#include <rtems/libio.h>
    2121
  • c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am

    r3db37a7c r8b9acbf0  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     
    77BSP_PIECES = console startup irq
    88
     9include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     10include $(top_srcdir)/../../../../../../automake/compile.am
     11include $(top_srcdir)/../../../../../../automake/lib.am
     12
    913# bummer; have to use $foreach since % pattern subst rules only replace 1x
    10 OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o)
     14OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
     15    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \
     16    $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel)
     17
    1118LIB = $(ARCH)/libbsp.a
    12 
    13 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    14 include $(top_srcdir)/../../../../../../automake/lib.am
    1519
    1620#
     
    1822#
    1923
    20 $(LIB): $(OBJS)
     24$(LIB): ${OBJS}
    2125        $(make-library)
    2226
     
    2630TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a
    2731
    28 all: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
    29 
    30 .PRECIOUS: $(LIB)
     32all-local: ${ARCH} $(TMPINSTALL_FILES)
    3133
    3234include $(top_srcdir)/../../../../../../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.