2004-10-21 Ralf Corsepius <ralf_corsepius@rtems.org>

	* Makefile.am: Build networking.rel conditionally.
	Reformat. Cosmetics.
	* wrapup/Makefile.am: Build networking.rel conditionally.
	* startup/bspstart.c: Eliminate RTEMS fixed size types.

4 files changed, 28 insertions, 12 deletions

diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index 0094cafcf5..0e290ed42d 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,5 +1,12 @@
 2004-10-21	Ralf Corsepius <ralf_corsepius@rtems.org>
 
+	* Makefile.am: Build networking.rel conditionally.
+	Reformat. Cosmetics.
+	* wrapup/Makefile.am: Build networking.rel conditionally.
+	* startup/bspstart.c: Eliminate RTEMS fixed size types.
+
+2004-10-21	Ralf Corsepius <ralf_corsepius@rtems.org>
+
 	* startup/bspstart.c: Remove BSP_build_date.
 
 2004-10-21	Ralf Corsepius <ralf_corsepius@rtems.org>
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index c0670ed35b..f5118de6bf 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -103,7 +103,8 @@ include_bsp_HEADERS += irq/irq.h
 
 EXTRA_PROGRAMS += irq.rel
 CLEANFILES += irq.rel
-irq_rel_SOURCES = irq/irq_init.c irq/GT64260Int.c irq/irq.c ../../powerpc/shared/irq/irq_asm.S
+irq_rel_SOURCES = irq/irq_init.c irq/GT64260Int.c irq/irq.c \
+    ../../powerpc/shared/irq/irq_asm.S
 irq_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
@@ -169,6 +170,7 @@ GT64260_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 noinst_DATA += GT64260$(LIB_VARIANT).rel
 
 ##
+if HAS_NETWORKING
 include_bsp_HEADERS += network/GT64260eth.h network/GT64260ethreg.h
 
 EXTRA_PROGRAMS += network.rel
@@ -184,7 +186,7 @@ network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
 network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 noinst_DATA += network$(LIB_VARIANT).rel
-
+endif
 ##
 include_bsp_HEADERS += vme/VME.h vme/VMEConfig.h
 include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h
@@ -222,7 +224,9 @@ mvme5500start_g___OBJEXT__SOURCES = $(mvme5500start___OBJEXT__SOURCES)
 mvme5500start_g___OBJEXT__CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
 mvme5500start_g___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-project_lib_DATA += mvme5500start$(LIB_VARIANT).rel
+project_lib_DATA += mvme5500start$(LIB_VARIANT).$(OBJEXT)
+
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 ###
 
@@ -309,6 +313,7 @@ $(PROJECT_INCLUDE)/bsp/VPD.h: GT64260/VPD.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VPD.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VPD.h
 
+if HAS_NETWORKING
 $(PROJECT_INCLUDE)/bsp/GT64260eth.h: network/GT64260eth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/GT64260eth.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/GT64260eth.h
@@ -316,6 +321,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/GT64260eth.h
 $(PROJECT_INCLUDE)/bsp/GT64260ethreg.h: network/GT64260ethreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/GT64260ethreg.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/GT64260ethreg.h
+endif
 
 $(PROJECT_INCLUDE)/bsp/VME.h: vme/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
@@ -333,9 +339,9 @@ $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT): rtems_crti$(LIB_VARIANT).$(OB
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT)
 
-$(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).rel: mvme5500start$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).rel
+$(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).$(OBJEXT): mvme5500start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).$(OBJEXT)
 
 CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
index 695629e4a6..df56f7e873 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
@@ -170,7 +170,7 @@ char *rtems_progname;
  
 extern void bsp_postdriver_hook(void); /* see c/src/lib/libbsp/shared/bsppost.c */
 
-extern void bsp_libc_init( void *, unsigned32, int );
+extern void bsp_libc_init( void *, uint32_t, int );
 
 /*
  *  Function:   bsp_pretasking_hook
@@ -365,7 +365,7 @@ void bsp_start( void )
   stack = ((unsigned char*) __rtems_end) + INIT_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
 
  /* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */
-  *((unsigned32 *)stack) = 0;
+  *((uint32_t *)stack) = 0;
 
   /* fill stack with pattern for debugging */
   __asm__ __volatile__("mr %0, %%r1":"=r"(r1sp));
@@ -383,10 +383,10 @@ void bsp_start( void )
   intrStack = ((unsigned char*) __rtems_end) + INIT_STACK_SIZE + INTR_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
 
   /* make sure it's properly aligned */
-  (unsigned32)intrStack &= ~(CPU_STACK_ALIGNMENT-1);
+  (uint32_t)intrStack &= ~(CPU_STACK_ALIGNMENT-1);
 
   /* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */
-  *((unsigned32 *)intrStack) = 0;
+  *((uint32_t *)intrStack) = 0;
 
   _write_SPRG1((unsigned int)intrStack);
   _write_SPRG0(PPC_BSP_HAS_FIXED_PR288);
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am
index fb71378cca..57259149d1 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am
@@ -10,8 +10,11 @@ ___libbsp_a_SOURCES =
 ___libbsp_a_LIBADD = ../pclock$(LIB_VARIANT).rel ../console$(LIB_VARIANT).rel \
     ../irq$(LIB_VARIANT).rel ../pci$(LIB_VARIANT).rel \
     ../startup$(LIB_VARIANT).rel ../tod$(LIB_VARIANT).rel \
-    ../vectors$(LIB_VARIANT).rel ../GT64260$(LIB_VARIANT).rel \
-    ../network$(LIB_VARIANT).rel ../vme$(LIB_VARIANT).rel
+    ../vectors$(LIB_VARIANT).rel ../GT64260$(LIB_VARIANT).rel
+if HAS_NETWORKING
+    ../network$(LIB_VARIANT).rel
+endif
+___libbsp_a_LIBADD += ../vme$(LIB_VARIANT).rel
 
 EXTRA_LIBRARIES += ../libbsp_g.a
 CLEANFILES += ../libbsp_g.a