libbsp/powerpc/shared and motorola_powerpc: Fix warnings

2 files changed, 41 insertions, 37 deletions

diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 9fc73c02bd..5e18b7e136 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -71,46 +71,45 @@ polledIO_rel_CPPFLAGS = $(AM_CPPFLAGS) $(polledIO_CPPFLAGS)
 polledIO_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # console
-libbsp_a_SOURCES += \
-    ../../powerpc/shared/console/uart.c \
-    ../../powerpc/shared/console/console.c \
-    ../../powerpc/shared/console/inch.c \
-    ../../powerpc/shared/console/consoleIo.h \
-    ../../powerpc/shared/console/keyboard.h \
-    ../../powerpc/shared/console/uart.h
+libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
+libbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+libbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
+libbsp_a_SOURCES += ../../powerpc/shared/console/keyboard.h
+libbsp_a_SOURCES += ../../powerpc/shared/console/uart.h
 
 include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h
 
 # irq
-libbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c \
-    ../../powerpc/shared/irq/openpic_i8259_irq.c \
-    ../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.h
+libbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c
+libbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
+libbsp_a_SOURCES += ../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.h
 
 include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h
 # motorola
-libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.h \
-    ../../powerpc/shared/motorola/motorola.c
+libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.h
+libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.c
 
 include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
 # openpic
-libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h \
-    ../../powerpc/shared/openpic/openpic.c \
-    ../../powerpc/shared/openpic/openpic.h
+libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
+libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
+libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
 
 include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
 # pci
-libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
-    ../../powerpc/shared/pci/detect_raven_bridge.c \
-    ../../powerpc/shared/pci/generic_clear_hberrs.c \
-    ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h
+libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
+libbsp_a_SOURCES += ../../powerpc/shared/pci/detect_raven_bridge.c
+libbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c
+libbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
+libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.h
 
 include_bsp_HEADERS += ../../powerpc/shared/residual/residual.h \
     ../../powerpc/shared/residual/pnp.h
 # residual
-libbsp_a_SOURCES += ../../powerpc/shared/residual/pnp.h \
-    ../../powerpc/shared/residual/residual.h \
-    ../../powerpc/shared/residual/residual.c
+libbsp_a_SOURCES += ../../powerpc/shared/residual/pnp.h
+libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.h
+libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c
 
 include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
     ../../shared/vmeUniverse/vme_am_defs.h \
@@ -120,14 +119,14 @@ include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
     ../../shared/vmeUniverse/bspVmeDmaList.h\
     ../../shared/vmeUniverse/VMEDMA.h
 # vme
-libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c \
-    ../../shared/vmeUniverse/bspVmeDmaList.c \
-    ../../shared/vmeUniverse/vmeUniverse.h \
-    ../../shared/vmeUniverse/vme_am_defs.h \
-    ../../shared/vmeUniverse/VME.h \
-    ../../powerpc/shared/vme/vmeconfig.c \
-    ../../powerpc/shared/vme/vme_universe.c \
-    ../../powerpc/shared/vme/VMEConfig.h
+libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c
+libbsp_a_SOURCES += ../../shared/vmeUniverse/bspVmeDmaList.c
+libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.h
+libbsp_a_SOURCES += ../../shared/vmeUniverse/vme_am_defs.h
+libbsp_a_SOURCES += ../../shared/vmeUniverse/VME.h
+libbsp_a_SOURCES += ../../powerpc/shared/vme/vmeconfig.c
+libbsp_a_SOURCES += ../../powerpc/shared/vme/vme_universe.c
+libbsp_a_SOURCES += ../../powerpc/shared/vme/VMEConfig.h
 
 if QEMU
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
index b47801cf46..5e5e0a4e46 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
@@ -1,7 +1,4 @@
 /*
- *  bsp.h  -- contain BSP API definition.
- *
- *  Copyright (C) 1999 Eric Valette. valette@crf.canon.fr
  *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
@@ -28,10 +25,6 @@ extern "C" {
 #endif
 
 /*
- *  confdefs.h overrides for this BSP:
- */
-
-/*
  * diagram illustrating the role of the configuration
  * constants
  *  PCI_MEM_WIN0:        CPU starting addr where PCI memory space is visible
@@ -232,6 +225,18 @@ extern int BSP_connect_clock_handler (void);
  */
 extern unsigned long _BSP_clear_hostbridge_errors(int enableMCP, int quiet);
 
+/*
+ * Prototypes for methods called only from .S for dependency tracking
+ */
+char *save_boot_params(
+  void *r3,
+  void *r4,
+  void *r5,
+  char *cmdline_start,
+  char *cmdline_end
+);
+void zero_bss(void);
+
 #endif
 
 #ifdef __cplusplus