diff options
Diffstat (limited to 'c/src/lib/libcpu/powerpc')
38 files changed, 106 insertions, 180 deletions
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index e8fc76d85e..9f82006795 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -1,14 +1,14 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -## Check configure.in for conditions to set the conditionals below +## Check configure.in for conditions to set the conditionals below if shared SHARED_LIB = shared -endif +endif if mpc505 CPU_SUBDIR = mpc505 diff --git a/c/src/lib/libcpu/powerpc/mpc505/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/Makefile.am index a482efa54f..37b11c93a3 100644 --- a/c/src/lib/libcpu/powerpc/mpc505/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc505/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am index a8bfed1b4a..65edc98d9f 100644 --- a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(timer_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am index 3b5aed6f7d..0f5a304686 100644 --- a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am @@ -1,12 +1,13 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -## FIXME VPATH = @srcdir@:@srcdir@/../../ppc403/vectors +## FIXME + PGM = ${ARCH}/vectors.rel ## Assembly sources @@ -21,8 +22,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(vectors_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am index 0cde1acc1e..c5452ae7a0 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am index fb711f3414..7ac55df4a7 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -22,8 +22,6 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ $(PROJECT_INCLUDE)/libcpu/c_clock.h diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am index e1aca735af..ea6b94b5b5 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -27,8 +27,6 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(exceptions_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am index 0c3ee63743..c64da3def0 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -26,8 +26,6 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(mmu_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am index a8bfed1b4a..65edc98d9f 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(timer_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am index 819c3a6c2b..36950229a9 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -9,9 +9,9 @@ PROC_SPECIFIC_O_FILES = exceptions mmu GENERIC_FILES = # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(PROC_SPECIFIC_O_FILES), \ - ../../mpc6xx/$(piece)/$(ARCH)/*.o) $(foreach piece, $(GENERIC_FILES), \ - ../../mpc6xx/$(piece)/$(ARCH)/*.o) +OBJS = \ + $(foreach piece, $(PROC_SPECIFIC_O_FILES), ../../mpc6xx/$(piece)/$(ARCH)/*.o) \ + $(foreach piece, $(GENERIC_FILES), ../../mpc6xx/$(piece)/$(ARCH)/*.o) LIB = $(ARCH)/libcpuspec.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg diff --git a/c/src/lib/libcpu/powerpc/mpc821/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/Makefile.am index f5b09cdd4a..a5679c9061 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am index 2ed74ad76f..f8b46ecc12 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(clock_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am index 279386ae5e..b0c900fc7c 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(console_generic_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc821/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc821/console-generic/console-generic.c index 325fcbf87d..f93022f142 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/console-generic/console-generic.c +++ b/c/src/lib/libcpu/powerpc/mpc821/console-generic/console-generic.c @@ -71,7 +71,6 @@ static volatile m821BufferDescriptor_t *RxBd[NIFACES], *TxBd[NIFACES]; */ static int m821_get_brg_cd(int); unsigned char m821_get_brg_clk(int); -void m821_console_reserve_resources(rtems_configuration_table *); unsigned char m821_get_brg_clk(int); @@ -99,7 +98,7 @@ m821_get_brg_cd (int baud) /* at any time since the OS started. It needs to be fixed. FIXME */ unsigned char m821_get_brg_clk(int baud) { - static short brg_spd[4]; + static int brg_spd[4]; static char brg_used[4]; int i; @@ -370,8 +369,8 @@ m821_smc_initialize (int port) /* port is the SMC number (i.e. 1 or 2) */ /* * Put SMC in NMSI mode, connect SMC to BRG */ - m821.simode &= ~0x7000 << ((port-1) * 8); - m821.simode |= brg << (12 + ((port-1) * 8)); + m860.simode &= ~(0x7000 << ((port-1) * 16)); + m860.simode |= brg << (12 + ((port-1) * 16)); /* * Set up SMC1 parameter RAM common to all protocols @@ -677,14 +676,6 @@ m821_buf_poll_write (int minor, char *buf, int len) return 0; } -/* - * This is needed in case we use TERMIOS - */ -void m821_console_reserve_resources(rtems_configuration_table *configuration) -{ - rtems_termios_reserve_resources (configuration, 1); -} - void m821_console_initialize(void) { int i; diff --git a/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am index 2fad30df67..8a4dfbd74d 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am @@ -1,15 +1,14 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = console.h mpc821.h noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ -$(PROJECT_INCLUDE)/mpc821 \ -$(H_FILES:%=$(PROJECT_INCLUDE)/mpc821/%) +TMPINSTALL_FILES += $(PROJECT_INCLUDE)/mpc821 \ + $(H_FILES:%=$(PROJECT_INCLUDE)/mpc821/%) $(PROJECT_INCLUDE)/mpc821: $(mkinstalldirs) $@ @@ -17,6 +16,6 @@ $(PROJECT_INCLUDE)/mpc821: $(PROJECT_INCLUDE)/mpc821/%.h: %.h $(INSTALL_DATA) $< $@ -all-local: $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am index a8bfed1b4a..65edc98d9f 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(timer_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am index d82045bf32..8d8bce2c1d 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am @@ -1,12 +1,13 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -## FIXME VPATH = @srcdir@:@srcdir@/../../ppc403/vectors +## FIXME + PGM = ${ARCH}/vectors.rel ## Assembly sources @@ -21,8 +22,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(vectors_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc860/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/Makefile.am index f5b09cdd4a..a5679c9061 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am index 2ed74ad76f..f8b46ecc12 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(clock_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am index 279386ae5e..b0c900fc7c 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(console_generic_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc860/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc860/console-generic/console-generic.c index e611b3bda8..76c1cb0314 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/console-generic/console-generic.c +++ b/c/src/lib/libcpu/powerpc/mpc860/console-generic/console-generic.c @@ -74,7 +74,6 @@ static volatile m860BufferDescriptor_t *RxBd[NIFACES], *TxBd[NIFACES]; */ static int m860_get_brg_cd(int); unsigned char m860_get_brg_clk(int); -void m860_console_reserve_resources(rtems_configuration_table *); unsigned char m860_get_brg_clk(int); @@ -102,8 +101,8 @@ m860_get_brg_cd (int baud) /* at any time since the OS started. It needs to be fixed. FIXME */ unsigned char m860_get_brg_clk(int baud) { - static short brg_spd[4]; - static char brg_used[4]; + static int brg_spd[4]; + static char brg_used[4]; int i; /* first try to find a BRG that is already at the right speed */ @@ -385,8 +384,8 @@ m860_smc_initialize (int port) /* port is the SMC number (i.e. 1 or 2) */ /* * Put SMC in NMSI mode, connect SMC to BRG */ - m860.simode &= ~0x7000 << ((port-1) * 8); - m860.simode |= brg << (12 + ((port-1) * 8)); + m860.simode &= ~(0x7000 << ((port-1) * 16)); + m860.simode |= brg << (12 + ((port-1) * 16)); /* * Set up SMC1 parameter RAM common to all protocols @@ -770,14 +769,6 @@ m860_buf_poll_write (int minor, char *buf, int len) return 0; } -/* - * This is needed in case we use TERMIOS - */ -void m860_console_reserve_resources(rtems_configuration_table *configuration) -{ - rtems_termios_reserve_resources (configuration, 1); -} - void m860_console_initialize(void) { int i; diff --git a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am index 4bd4d6d7b5..ebbb1a1e51 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -9,10 +9,9 @@ MPC860_H_FILES = console.h noinst_HEADERS = $(H_FILES) $(MPC860_H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/mpc860 \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ -$(MPC860_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc860/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc860 \ + $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ + $(MPC860_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc860/%.h) $(PROJECT_INCLUDE)/mpc860: $(mkinstalldirs) $@ @@ -23,6 +22,6 @@ $(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/mpc860/%.h: %.h $(INSTALL_DATA) $< $@ -all-local: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc860/include/mpc860.h b/c/src/lib/libcpu/powerpc/mpc860/include/mpc860.h index 7daee45bf0..4a9c20f049 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/include/mpc860.h +++ b/c/src/lib/libcpu/powerpc/mpc860/include/mpc860.h @@ -112,8 +112,8 @@ * Memory controller registers */ typedef struct m860MEMCRegisters_ { - rtems_unsigned32 br; - rtems_unsigned32 or; + rtems_unsigned32 _br; + rtems_unsigned32 _or; } m860MEMCRegisters_t; /* diff --git a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am index a8bfed1b4a..65edc98d9f 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(timer_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am index d82045bf32..8d8bce2c1d 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am @@ -1,12 +1,13 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -## FIXME VPATH = @srcdir@:@srcdir@/../../ppc403/vectors +## FIXME + PGM = ${ARCH}/vectors.rel ## Assembly sources @@ -21,8 +22,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(vectors_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am index c3195b159d..1f4affe8f4 100644 --- a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am +++ b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am @@ -9,7 +9,7 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) ROOT_H_FILES = RTEMS_SCORE_H_FILES = cpu.h c_isr.inl -noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES) +noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES) S_FILES = cpu_asm.S S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) @@ -21,11 +21,9 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(PROJECT_INCLUDE)/rtems/score \ -$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ -$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \ + $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ + $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%) ##TMPINSTALL_FILES += \ ##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -55,10 +53,8 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) ## all-local: $(ARCH)/rtems.o all-local: $(TMPINSTALL_FILES) -clean-local: - $(RM) -r ../o-optimize ../o-debug ../o-profile +CLEANDIRS = ../o-optimize ../o-debug ../o-profile -EXTRA_DIST = \ -$(C_FILES) $(S_FILES) +EXTRA_DIST = $(C_FILES) $(S_FILES) include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/old-exceptions/irq_stub.S b/c/src/lib/libcpu/powerpc/old-exceptions/irq_stub.S index 76c8927305..400cccdf73 100644 --- a/c/src/lib/libcpu/powerpc/old-exceptions/irq_stub.S +++ b/c/src/lib/libcpu/powerpc/old-exceptions/irq_stub.S @@ -55,7 +55,9 @@ lis r11,_CPU_IRQ_info@ha addi r11,r11,_CPU_IRQ_info@l #endif +#if ( PPC_USE_DATA_CACHE ) dcbt r0, r11 +#endif stw r5, IP_CR(r1) stw r6, IP_CTR(r1) stw r7, IP_XER(r1) diff --git a/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am b/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am index afd66502eb..9629808140 100644 --- a/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am +++ b/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am @@ -19,14 +19,11 @@ S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(PROJECT_INCLUDE)/rtems/score \ -$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ -$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \ + $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ + $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%) -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ @@ -49,18 +46,12 @@ $(REL): $(C_O_FILES) $(S_O_FILES) test -d ../$(ARCH) || mkdir ../$(ARCH) $(make-rel) -all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) -all-local: $(ARCH)/rtems.o -all-local: $(TMPINSTALL_FILES) +all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) $(ARCH)/rtems.o $(TMPINSTALL_FILES) -clean-local: - $(RM) -r ../o-optimize ../o-debug ../o-profile +CLEANDIRS = ../o-optimize ../o-debug ../o-profile UNUSED_FILES = irq_stub.S -EXTRA_DIST = \ -TODO \ -rtems.S \ -$(C_FILES) $(S_FILES) $(UNUSED_FILES) +EXTRA_DIST = TODO rtems.S $(C_FILES) $(S_FILES) $(UNUSED_FILES) include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/old_exception_processing/irq_stub.S b/c/src/lib/libcpu/powerpc/old_exception_processing/irq_stub.S index 76c8927305..400cccdf73 100644 --- a/c/src/lib/libcpu/powerpc/old_exception_processing/irq_stub.S +++ b/c/src/lib/libcpu/powerpc/old_exception_processing/irq_stub.S @@ -55,7 +55,9 @@ lis r11,_CPU_IRQ_info@ha addi r11,r11,_CPU_IRQ_info@l #endif +#if ( PPC_USE_DATA_CACHE ) dcbt r0, r11 +#endif stw r5, IP_CR(r1) stw r6, IP_CTR(r1) stw r7, IP_XER(r1) diff --git a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am index 78d893c980..bd55ab2ed0 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am index 2ed74ad76f..f8b46ecc12 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(clock_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am index 0dede804bf..4289321d14 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(console_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/console.c b/c/src/lib/libcpu/powerpc/ppc403/console/console.c index 11177c8a42..9313a9bc90 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/console/console.c +++ b/c/src/lib/libcpu/powerpc/ppc403/console/console.c @@ -404,16 +404,6 @@ spiInitialize(void) *************** */ -/* - * Reserve resources consumed by this driver - */ -void console_reserve_resources( - rtems_configuration_table *configuration -) -{ - rtems_termios_reserve_resources (configuration, 1); -} - /* console_initialize * * This routine initializes the console IO driver. diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am index 7aa2278352..efefed93e9 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -24,8 +24,6 @@ $(PROJECT_INCLUDE)/%.h: %.h # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(ictrl_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am index a8bfed1b4a..65edc98d9f 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -17,8 +17,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(timer_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am index 65eb4ae728..ce95f92721 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -18,8 +18,6 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(vectors_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/powerpc/shared/Makefile.am b/c/src/lib/libcpu/powerpc/shared/Makefile.am index bc2d1d1ace..edbb18ae0c 100644 --- a/c/src/lib/libcpu/powerpc/shared/Makefile.am +++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am index 609b64bbfb..48af0f6dcb 100644 --- a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am +++ b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -9,8 +9,8 @@ GENERIC_FILES = shared # Use two variables so that I can make two ar command. # So far FAMILY_OBJS is empty and ar dislike it... CPU_SPECIFIC_OBJS = $(wildcard ../$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o) -FAMILY_OBJS = $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o \ - ../mpc6xx/*/$(ARCH)/*.o) +FAMILY_OBJS = \ + $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o ../mpc6xx/*/$(ARCH)/*.o) LIB = $(ARCH)/libcpu.a |