Changeset acc25ee in rtems


Ignore:
Timestamp:
Dec 2, 1999, 2:31:19 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
3a96054
Parents:
4cf56006
Message:

Merged of mcp750 and mvme2307 BSP by Eric Valette <valette@…>.
As part of this effort, the mpc750 libcpu code is now shared with the
ppc6xx.

Files:
122 added
3 deleted
37 edited
1 moved

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/cpu/powerpc/Makefile.in

    r4cf56006 racc25ee  
    2121SHARED_LIB = shared
    2222
    23 ifeq ($(RTEMS_CPU_MODEL),mpc750)
    24 CPUDIR = mpc750
    25 else 
    26 CPUDIR = other_cpu
    27 endif 
     23ifeq ($(RTEMS_PPC_EXCEPTION_PROCESSING_MODEL),new)
     24CPUDIR = new_exception_processing
     25else
     26CPUDIR = old_exception_processing
     27endif
    2828
    2929SUBDIRS = $(CPUDIR) $(SHARED_LIB)
  • c/src/exec/score/cpu/powerpc/rtems/score/ppc.h

    r4cf56006 racc25ee  
    186186#define PPC_LOW_POWER_MODE PPC_LOW_POWER_MODE_STANDARD
    187187
    188 #elif defined(ppc604)
     188#elif defined(mpc604)
    189189/*
    190190 *  Submitted with original port -- book checked only.
     
    476476
    477477
    478 #elif defined(ppc604)
     478#elif defined(mpc604)
    479479#define PPC_IRQ_ADDR_BRK (PPC_STD_IRQ_LAST+1) /*0x1300- Inst. addr break  */
    480480#define PPC_IRQ_SYS_MGT  (PPC_STD_IRQ_LAST+2) /*0x1400- System Management */
  • c/src/exec/score/cpu/powerpc/shared/ppc.h

    r4cf56006 racc25ee  
    186186#define PPC_LOW_POWER_MODE PPC_LOW_POWER_MODE_STANDARD
    187187
    188 #elif defined(ppc604)
     188#elif defined(mpc604)
    189189/*
    190190 *  Submitted with original port -- book checked only.
     
    476476
    477477
    478 #elif defined(ppc604)
     478#elif defined(mpc604)
    479479#define PPC_IRQ_ADDR_BRK (PPC_STD_IRQ_LAST+1) /*0x1300- Inst. addr break  */
    480480#define PPC_IRQ_SYS_MGT  (PPC_STD_IRQ_LAST+2) /*0x1400- System Management */
  • c/src/exec/score/cpu/powerpc/wrap/Makefile.in

    r4cf56006 racc25ee  
    2424
    2525# C source names, if any, go here -- minus the .c
    26 C_PIECES = cpu ppccache
     26C_PIECES =
    2727C_FILES = $(C_PIECES:%=%.c)
    2828C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
  • c/src/lib/libbsp/powerpc/mcp750/Makefile.in

    r4cf56006 racc25ee  
    3030#  from the individual .rel files built in other directories
    3131SUBDIRS = clock console include pci residual openpic irq vectors start \
    32     startup bootloader $(NETWORK) wrapup
     32    startup bootloader $(NETWORK) motorola wrapup
    3333
    3434Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../console
     14VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/console:@srcdir@/../../shared/bootloader
    1515
    1616# C source names, if any, go here -- minus the .c
     
    7878bootloader : ${OBJS} $(IMAGES) $(BINARY_LOADED) ppcboot.lds
    7979        $(LD) -o bootloader $(OBJS) --just-symbols=$(BINARY_LOADED) \
    80         -b binary $(IMAGES) -T @srcdir@/ppcboot.lds \
     80        -b binary $(IMAGES) -T @srcdir@/../../shared/bootloader/ppcboot.lds \
    8181         -Map bootloader.map
    8282
  • c/src/lib/libbsp/powerpc/mcp750/clock/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
    15 
    16 PGM = ${ARCH}/clock.rel
     14VPATH = @srcdir@:@srcdir@/../../shared/clock
    1715
    1816# C source names, if any, go here -- minus the .c
     
    5957CLOBBER_ADDITIONS +=
    6058
    61 $(PGM): ${OBJS}
    62         $(make-rel)
    63 
    64 all: ${ARCH} $(SRCS) $(PGM)
     59all: ${ARCH} $(SRCS) $(OBJS)
    6560
    6661# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
  • c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in

    r4cf56006 racc25ee  
    11#
    2 #  $Id:
     2#  $Id$
    33#
    44
     
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@:@srcdir@/../../../shared
     14VPATH = @srcdir@:@srcdir@/../../shared/console:@srcdir@/../../../shared
    1515
    1616# C source names, if any, go here -- minus the .c
    17 C_PIECES = polled_io uart console inch console_reserve_resources
     17C_PIECES = polled_io uart console inch
    1818C_FILES = $(C_PIECES:%=%.c)
    1919C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2020
    21 H_FILES = $(srcdir)/consoleIo.h $(srcdir)/keyboard.h $(srcdir)/uart.h
     21H_FILES = $(srcdir)/../../shared/console/consoleIo.h $(srcdir)/../../shared/console/keyboard.h $(srcdir)/../../shared/console/uart.h
    2222
    2323# Assembly source names, if any, go here -- minus the .s
     
    4949
    5050CPPFLAGS += -DSTATIC_LOG_ALLOC
     51CFLAGS +=
    5152#
    5253# Add your list of files to delete here.  The config files
     
    5758#
    5859
    59 preinstall:
    60         @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
    61         @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
    62 
    63 all: ${ARCH} $(SRCS) preinstall ${OBJS}
     60all: ${ARCH} $(SRCS) ${OBJS}
    6461
    6562Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • c/src/lib/libbsp/powerpc/mcp750/include/Makefile.in

    r4cf56006 racc25ee  
    1414VPATH = @srcdir@
    1515
    16 H_FILES = $(srcdir)/nvram.h $(srcdir)/bsp.h
     16H_FILES = $(srcdir)/../../shared/include/nvram.h \
     17    $(srcdir)/../../shared/include/bsp.h
     18
     19BSP_H_FILES = $(srcdir)/../../shared/console/consoleIo.h \
     20    $(srcdir)/../../shared/console/uart.h \
     21    $(srcdir)/../../shared/irq/irq.h \
     22    $(srcdir)/../../shared/motorola/motorola.h
    1723
    1824#
     
    4450preinstall:
    4551        $(mkinstalldirs) $(PROJECT_INCLUDE)
     52        $(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
    4653        @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
     54        @$(INSTALL_CHANGE) -m 644 $(BSP_H_FILES) $(PROJECT_INCLUDE)/bsp
    4755
    4856all: $(SRCS) preinstall
  • c/src/lib/libbsp/powerpc/mcp750/irq/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
     14VPATH = @srcdir@:@srcdir@/../../shared/irq
    1515
    1616# C source names, if any, go here -- minus the .c
     
    1919C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2020
    21 H_FILES = $(srcdir)/irq.h
     21H_FILES = $(srcdir)/../../shared/irq/irq.h
    2222
    2323# Assembly source names, if any, go here -- minus the .s
     
    6262CLOBBER_ADDITIONS +=
    6363
    64 preinstall:
    65         @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
    66         @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
    67 
    68 all: ${ARCH} $(SRCS) preinstall ${OBJS}
     64all: ${ARCH} $(SRCS) ${OBJS}
    6965
    7066install: all
  • c/src/lib/libbsp/powerpc/mcp750/openpic/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
    15 
    16 PGM = ${ARCH}/openpic.rel
     14VPATH = @srcdir@:@srcdir@/../../shared/openpic
    1715
    1816# C source names, if any, go here -- minus the .c
     
    2119C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2220
    23 H_FILES = $(srcdir)/openpic.h
     21H_FILES = $(srcdir)/../../shared/openpic/openpic.h
    2422
    2523SRCS = $(C_FILES) $(H_FILES)
     
    6159CLOBBER_ADDITIONS +=
    6260
    63 $(PGM): ${OBJS}
    64         $(make-rel)
    65 
    6661preinstall:
    6762        @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
    6863        @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
    6964
    70 all: ${ARCH} $(SRCS) preinstall $(PGM)
     65all: ${ARCH} $(SRCS) preinstall $(OBJS)
    7166
    7267# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
  • c/src/lib/libbsp/powerpc/mcp750/pci/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
    15 
    16 PGM = ${ARCH}/pci.rel
     14VPATH = @srcdir@:@srcdir@/../../shared/pci
    1715
    1816# C source names, if any, go here -- minus the .c
    19 C_PIECES = $(PCI_C_PIECES)
     17C_PIECES = pci
    2018C_FILES = $(C_PIECES:%=%.c)
    2119C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2220
    23 H_FILES = $(srcdir)/pci.h
     21H_FILES = $(srcdir)/../../shared/pci/pci.h
    2422
    2523SRCS = $(C_FILES) $(H_FILES)
     
    3634$(INSTALLDIRS):
    3735        @$(mkinstalldirs) $(INSTALLDIRS)
    38 
    39 PCI_C_PIECES = pci
    4036
    4137#
     
    6157CLOBBER_ADDITIONS +=
    6258
    63 $(PGM): ${OBJS}
    64         $(make-rel)
    65 
    6659preinstall:
    6760        @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
    6861        @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
    6962
    70 all: ${ARCH} $(SRCS) preinstall $(PGM)
     63all: ${ARCH} $(SRCS) preinstall $(OBJS)
    7164
    7265# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
  • c/src/lib/libbsp/powerpc/mcp750/residual/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
    15 
    16 PGM = ${ARCH}/residual.rel
     14VPATH = @srcdir@:@srcdir@/../../shared/residual
    1715
    1816# C source names, if any, go here -- minus the .c
     
    2119C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2220
    23 H_FILES = $(srcdir)/pnp.h $(srcdir)/residual.h
     21H_FILES = $(srcdir)/../../shared/residual/pnp.h $(srcdir)/../../shared/residual/residual.h
    2422
    2523SRCS = $(C_FILES) $(H_FILES)
     
    6563        @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
    6664
    67 $(PGM): ${OBJS}
    68         $(make-rel)
    69 
    70 all: ${ARCH} $(SRCS) preinstall $(PGM)
     65all: ${ARCH} $(SRCS) preinstall $(OBJS)
    7166
    7267# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
  • c/src/lib/libbsp/powerpc/mcp750/start/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
     14VPATH = @srcdir@:@srcdir@/../../shared/start
    1515
    1616PGM = ${ARCH}/start.o
  • c/src/lib/libbsp/powerpc/mcp750/startup/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared
     14VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
    1515
    1616# C source names, if any, go here -- minus the .c
  • c/src/lib/libbsp/powerpc/mcp750/vectors/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@:@srcdir@/../console:
    15 
    16 PGM = ${ARCH}/vectors.rel
     14VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../shared/vectors
    1715
    1816# C source names, if any, go here -- minus the .c
     
    2119C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2220
    23 H_FILES = $(srcdir)/vectors.h
     21H_FILES = $(srcdir)/../../shared/vectors/vectors.h
    2422
    2523# Assembly source names, if any, go here -- minus the .s
  • c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in

    r4cf56006 racc25ee  
    1919
    2020BSP_PIECES = clock console irq openpic pci residual startup $(NETWORK) \
    21     vectors
     21    vectors motorola
    2222GENERIC_PIECES =
    2323
  • c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in

    r4cf56006 racc25ee  
    3030#  from the individual .rel files built in other directories
    3131SUBDIRS = clock console include pci residual openpic irq vectors start \
    32     startup bootloader $(NETWORK) wrapup
     32    startup bootloader $(NETWORK) motorola wrapup
    3333
    3434Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../console
     14VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/console:@srcdir@/../../shared/bootloader
    1515
    1616# C source names, if any, go here -- minus the .c
     
    7878bootloader : ${OBJS} $(IMAGES) $(BINARY_LOADED) ppcboot.lds
    7979        $(LD) -o bootloader $(OBJS) --just-symbols=$(BINARY_LOADED) \
    80         -b binary $(IMAGES) -T @srcdir@/ppcboot.lds \
     80        -b binary $(IMAGES) -T @srcdir@/../../shared/bootloader/ppcboot.lds \
    8181         -Map bootloader.map
    8282
  • c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
    15 
    16 PGM = ${ARCH}/clock.rel
     14VPATH = @srcdir@:@srcdir@/../../shared/clock
    1715
    1816# C source names, if any, go here -- minus the .c
     
    5957CLOBBER_ADDITIONS +=
    6058
    61 $(PGM): ${OBJS}
    62         $(make-rel)
    63 
    64 all: ${ARCH} $(SRCS) $(PGM)
     59all: ${ARCH} $(SRCS) $(OBJS)
    6560
    6661# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
  • c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in

    r4cf56006 racc25ee  
    11#
    2 #  $Id:
     2#  $Id$
    33#
    44
     
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@:@srcdir@/../../../shared
     14VPATH = @srcdir@:@srcdir@/../../shared/console:@srcdir@/../../../shared
    1515
    1616# C source names, if any, go here -- minus the .c
    17 C_PIECES = polled_io uart console inch console_reserve_resources
     17C_PIECES = polled_io uart console inch
    1818C_FILES = $(C_PIECES:%=%.c)
    1919C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2020
    21 H_FILES = $(srcdir)/consoleIo.h $(srcdir)/keyboard.h $(srcdir)/uart.h
     21H_FILES = $(srcdir)/../../shared/console/consoleIo.h $(srcdir)/../../shared/console/keyboard.h $(srcdir)/../../shared/console/uart.h
    2222
    2323# Assembly source names, if any, go here -- minus the .s
     
    4949
    5050CPPFLAGS += -DSTATIC_LOG_ALLOC
     51CFLAGS +=
    5152#
    5253# Add your list of files to delete here.  The config files
     
    5758#
    5859
    59 preinstall:
    60         @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
    61         @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
    62 
    63 all: ${ARCH} $(SRCS) preinstall ${OBJS}
     60all: ${ARCH} $(SRCS) ${OBJS}
    6461
    6562Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in

    r4cf56006 racc25ee  
    1414VPATH = @srcdir@
    1515
    16 H_FILES = $(srcdir)/nvram.h $(srcdir)/bsp.h
     16H_FILES = $(srcdir)/../../shared/include/nvram.h \
     17    $(srcdir)/../../shared/include/bsp.h
     18
     19BSP_H_FILES = $(srcdir)/../../shared/console/consoleIo.h \
     20    $(srcdir)/../../shared/console/uart.h \
     21    $(srcdir)/../../shared/irq/irq.h \
     22    $(srcdir)/../../shared/motorola/motorola.h
    1723
    1824#
     
    4450preinstall:
    4551        $(mkinstalldirs) $(PROJECT_INCLUDE)
     52        $(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
    4653        @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
     54        @$(INSTALL_CHANGE) -m 644 $(BSP_H_FILES) $(PROJECT_INCLUDE)/bsp
    4755
    4856all: $(SRCS) preinstall
  • c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
     14VPATH = @srcdir@:@srcdir@/../../shared/irq
    1515
    1616# C source names, if any, go here -- minus the .c
     
    1919C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2020
    21 H_FILES = $(srcdir)/irq.h
     21H_FILES = $(srcdir)/../../shared/irq/irq.h
    2222
    2323# Assembly source names, if any, go here -- minus the .s
     
    6262CLOBBER_ADDITIONS +=
    6363
    64 preinstall:
    65         @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
    66         @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
    67 
    68 all: ${ARCH} $(SRCS) preinstall ${OBJS}
     64all: ${ARCH} $(SRCS) ${OBJS}
    6965
    7066install: all
  • c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
    15 
    16 PGM = ${ARCH}/openpic.rel
     14VPATH = @srcdir@:@srcdir@/../../shared/openpic
    1715
    1816# C source names, if any, go here -- minus the .c
     
    2119C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2220
    23 H_FILES = $(srcdir)/openpic.h
     21H_FILES = $(srcdir)/../../shared/openpic/openpic.h
    2422
    2523SRCS = $(C_FILES) $(H_FILES)
     
    6159CLOBBER_ADDITIONS +=
    6260
    63 $(PGM): ${OBJS}
    64         $(make-rel)
    65 
    6661preinstall:
    6762        @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
    6863        @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
    6964
    70 all: ${ARCH} $(SRCS) preinstall $(PGM)
     65all: ${ARCH} $(SRCS) preinstall $(OBJS)
    7166
    7267# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
  • c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
    15 
    16 PGM = ${ARCH}/pci.rel
     14VPATH = @srcdir@:@srcdir@/../../shared/pci
    1715
    1816# C source names, if any, go here -- minus the .c
    19 C_PIECES = $(PCI_C_PIECES)
     17C_PIECES = pci
    2018C_FILES = $(C_PIECES:%=%.c)
    2119C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2220
    23 H_FILES = $(srcdir)/pci.h
     21H_FILES = $(srcdir)/../../shared/pci/pci.h
    2422
    2523SRCS = $(C_FILES) $(H_FILES)
     
    3634$(INSTALLDIRS):
    3735        @$(mkinstalldirs) $(INSTALLDIRS)
    38 
    39 PCI_C_PIECES = pci
    4036
    4137#
     
    6157CLOBBER_ADDITIONS +=
    6258
    63 $(PGM): ${OBJS}
    64         $(make-rel)
    65 
    6659preinstall:
    6760        @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
    6861        @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
    6962
    70 all: ${ARCH} $(SRCS) preinstall $(PGM)
     63all: ${ARCH} $(SRCS) preinstall $(OBJS)
    7164
    7265# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
  • c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
    15 
    16 PGM = ${ARCH}/residual.rel
     14VPATH = @srcdir@:@srcdir@/../../shared/residual
    1715
    1816# C source names, if any, go here -- minus the .c
     
    2119C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2220
    23 H_FILES = $(srcdir)/pnp.h $(srcdir)/residual.h
     21H_FILES = $(srcdir)/../../shared/residual/pnp.h $(srcdir)/../../shared/residual/residual.h
    2422
    2523SRCS = $(C_FILES) $(H_FILES)
     
    6563        @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
    6664
    67 $(PGM): ${OBJS}
    68         $(make-rel)
    69 
    70 all: ${ARCH} $(SRCS) preinstall $(PGM)
     65all: ${ARCH} $(SRCS) preinstall $(OBJS)
    7166
    7267# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
  • c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@
     14VPATH = @srcdir@:@srcdir@/../../shared/start
    1515
    1616PGM = ${ARCH}/start.o
  • c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared
     14VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
    1515
    1616# C source names, if any, go here -- minus the .c
  • c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.in

    r4cf56006 racc25ee  
    1212PROJECT_ROOT = @PROJECT_ROOT@
    1313
    14 VPATH = @srcdir@:@srcdir@/../console:
    15 
    16 PGM = ${ARCH}/vectors.rel
     14VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../shared/vectors
    1715
    1816# C source names, if any, go here -- minus the .c
     
    2119C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2220
    23 H_FILES = $(srcdir)/vectors.h
     21H_FILES = $(srcdir)/../../shared/vectors/vectors.h
    2422
    2523# Assembly source names, if any, go here -- minus the .s
  • c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in

    r4cf56006 racc25ee  
    1919
    2020BSP_PIECES = clock console irq openpic pci residual startup $(NETWORK) \
    21     vectors
     21    vectors motorola
    2222GENERIC_PIECES =
    2323
  • c/src/lib/libbsp/powerpc/shared/console/console.c

    r4cf56006 racc25ee  
    4646 */
    4747
    48 extern int BSPConsolePort;
     48int BSPConsolePort = BSP_UART_COM1;
    4949
    5050/* int BSPConsolePort = BSP_UART_COM2;  */
    51 extern int BSPBaseBaud;
     51int BSPBaseBaud    = 115200;
    5252
    5353/*-------------------------------------------------------------------------+
     
    8585}
    8686
    87 /*
    8887void console_reserve_resources(rtems_configuration_table *conf)
    8988{
     
    9594  return;
    9695}
    97 */
    9896
    9997void __assert (const char *file, int line, const char *msg)
  • c/src/lib/libcpu/powerpc/Makefile.in

    r4cf56006 racc25ee  
    1919INSTALL_CHANGE = @INSTALL_CHANGE@
    2020
    21 ifeq ($(wildcard $(RTEMS_CPU_MODEL)),$(RTEMS_CPU_MODEL))
    22 SHARED_LIB = shared
    23 endif
     21ifeq ($(RTEMS_CPU_MODEL),mpc750)
     22SHARED_LIB = shared mpc6xx
     23endif
     24ifeq ($(RTEMS_CPU_MODEL),mpc604)
     25SHARED_LIB = shared mpc6xx
     26endif
    2427
    2528SUBDIRS = $(SHARED_LIB) $(wildcard $(RTEMS_CPU_MODEL)) wrapup
  • c/src/lib/libcpu/powerpc/shared/Makefile.in

    r4cf56006 racc25ee  
    1515
    1616# C source names, if any, go here -- minus the .c
    17 C_PIECES =
     17C_PIECES = cpuIdent
    1818C_FILES = $(C_PIECES:%=%.c)
    1919C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
  • c/src/lib/libcpu/powerpc/shared/cpu.h

    r4cf56006 racc25ee  
    170170#define SR15    15
    171171
     172#ifndef ASM
     173typedef enum {
     174  PPC_601       = 0x1,
     175  PPC_603       = 0x3,
     176  PPC_604       = 0x4,
     177  PPC_603e      = 0x6,
     178  PPC_603ev     = 0x7,
     179  PPC_750       = 0x8,
     180  PPC_604e      = 0x9,
     181  PPC_604r      = 0xA,
     182  PPC_620       = 0x16,
     183  PPC_860       = 0x50,
     184  PPC_821       = PPC_860,
     185  PPC_UNKNOWN   = 0xff
     186} ppc_cpu_id_t;
     187
     188typedef unsigned short ppc_cpu_revision_t;
     189
     190extern ppc_cpu_id_t get_ppc_cpu_type();
     191extern ppc_cpu_id_t current_ppc_cpu;
     192extern ppc_cpu_revision_t get_ppc_cpu_revision();
     193extern ppc_cpu_revision_t current_ppc_revision;
     194#endif
     195
    172196#define _CPU_MSR_GET( _msr_value ) \
    173197  do { \
  • c/src/lib/libcpu/powerpc/wrapup/Makefile.in

    r4cf56006 racc25ee  
    1919# So far FAMILY_OBJ is empty and ar dislike it...
    2020CPU_SPECIFIC_OBJS = $(wildcard ../$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
    21 FAMILY_OBJS = $(wildcard ../shared/*/$(ARCH)/*.o)
     21FAMILY_OBJS = $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o ../mpc6xx/*/$(ARCH)/*.o)
    2222
    2323LIB = $(ARCH)/libcpu.a
  • cpukit/score/cpu/powerpc/rtems/score/ppc.h

    r4cf56006 racc25ee  
    186186#define PPC_LOW_POWER_MODE PPC_LOW_POWER_MODE_STANDARD
    187187
    188 #elif defined(ppc604)
     188#elif defined(mpc604)
    189189/*
    190190 *  Submitted with original port -- book checked only.
     
    476476
    477477
    478 #elif defined(ppc604)
     478#elif defined(mpc604)
    479479#define PPC_IRQ_ADDR_BRK (PPC_STD_IRQ_LAST+1) /*0x1300- Inst. addr break  */
    480480#define PPC_IRQ_SYS_MGT  (PPC_STD_IRQ_LAST+2) /*0x1400- System Management */
  • make/custom/mcp750.cfg

    r4cf56006 racc25ee  
    99RTEMS_CPU=powerpc
    1010RTEMS_CPU_MODEL=mpc750
     11RTEMS_PPC_EXCEPTION_PROCESSING_MODEL=new
    1112
    1213# This is the actual bsp directory used during the build process.
  • make/custom/mvme2307.cfg

    r4cf56006 racc25ee  
    88
    99RTEMS_CPU=powerpc
    10 RTEMS_CPU_MODEL=ppc604
     10RTEMS_CPU_MODEL=mpc604
    1111
    1212# This is the actual bsp directory used during the build process.
Note: See TracChangeset for help on using the changeset viewer.