powerpc/gen83xx: Fix warnings

c/src/lib/libbsp/powerpc/gen83xx/i2c/i2c_init.c

@@ -117,7 +117,7 @@ rtems_status_code bsp_register_i2c
     i2c_busno[i] = rtems_libi2c_register_bus(device_path, &desc->bus_desc);
   }
 
-#ifdef RTEMS_BSP_I2C_EEPROM_DEVICE_NAME
+#if defined(RTEMS_BSP_I2C_EEPROM_DEVICE_NAME)
   if (n > 0) {
     /*
      * register EEPROM to bus 1, Address 0x50
@@ -126,9 +126,7 @@ rtems_status_code bsp_register_i2c
                  i2c_2b_eeprom_driver_descriptor,
                  i2c_busno[0],0x50);
   }
-#endif /* RTEMS_BSP_I2C_EEPROM_DEVICE_NAME */
-
-#ifdef MPC83XX_BOARD_BR_UID
+#elif defined(MPC83XX_BOARD_BR_UID)
   if (n > 0) {
     rtems_libi2c_register_drv(
       "sc620",
@@ -137,7 +135,14 @@ rtems_status_code bsp_register_i2c
       0x70
     );
   }
-#endif /* MPC83XX_BOARD_BR_UID */
+#else
+
+  /*
+   * We have no i2c configuration for this variant but need to mark
+   * i2c_busno as used.
+   */
+   (void) i2c_busno[0]; /* avoid set but not used warning */
+#endif
 
   /*
    * FIXME: register RTC driver, when available

c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h

@@ -82,8 +82,10 @@ extern "C" {
 /* misc macros */
 #define BSP_ARRAY_CNT(arr) (sizeof(arr)/sizeof(arr[0]))
 
-/* functions */
+void *bsp_idle_thread( uintptr_t ignored );
+#define BSP_IDLE_TASK_BODY bsp_idle_thread
 
+/* functions */
 rtems_status_code bsp_register_i2c(void);
 rtems_status_code bsp_register_spi(void);
 
@@ -147,6 +149,13 @@ void cpu_init( void);
 
 void bsp_restart(void *addr);
 
+#if defined(HAS_UBOOT)
+  /* Routine to obtain U-Boot environment variables */
+  const char *bsp_uboot_getenv(
+    const char *name
+  );
+#endif
+
 #ifdef __cplusplus
 }
 #endif

c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c

@@ -17,7 +17,6 @@
 | this file integrates the IPIC irq controller                    |
 \*===============================================================*/
 
-
 #include <mpc83xx/mpc83xx.h>
 
 #include <rtems.h>
@@ -196,7 +195,8 @@ static const BSP_isrc_rsc_t mpc83xx_ipic_isrc_rsc [MPC83XX_IPIC_VECTOR_NUMBER] =
   {&mpc83xx.ipic.sipnr [1], &mpc83xx.ipic.simsr [1], 27}
 };
 
-static const uint8_t mpc83xx_ipic_mask_position_table [MPC83XX_IPIC_VECTOR_NUMBER] = {
+static const uint8_t
+    mpc83xx_ipic_mask_position_table [MPC83XX_IPIC_VECTOR_NUMBER] = {
   MPC83XX_IPIC_INVALID_MASK_POSITION,
   MPC83XX_IPIC_INVALID_MASK_POSITION,
   MPC83XX_IPIC_INVALID_MASK_POSITION,
@@ -298,7 +298,11 @@ static const uint8_t mpc83xx_ipic_mask_position_table [MPC83XX_IPIC_VECTOR_NUMBE
  */
 static mpc83xx_ipic_mask_t mpc83xx_ipic_prio2mask [MPC83XX_IPIC_VECTOR_NUMBER];
 
-rtems_status_code mpc83xx_ipic_set_mask( rtems_vector_number vector, rtems_vector_number mask_vector, bool mask)
+rtems_status_code mpc83xx_ipic_set_mask(
+  rtems_vector_number vector,
+  rtems_vector_number mask_vector,
+  bool mask
+)
 {
   uint8_t pos = 0;
   mpc83xx_ipic_mask_t *mask_entry;
@@ -306,7 +310,8 @@ rtems_status_code mpc83xx_ipic_set_mask( rtems_vector_number vector, rtems_vecto
   rtems_interrupt_level level;
 
   /* Parameter check */
-	if (!MPC83XX_IPIC_IS_VALID_VECTOR( vector) || !MPC83XX_IPIC_IS_VALID_VECTOR( mask_vector)) {
+  if (!MPC83XX_IPIC_IS_VALID_VECTOR( vector) ||
+      !MPC83XX_IPIC_IS_VALID_VECTOR( mask_vector)) {
     return RTEMS_INVALID_NUMBER;
   } else if (vector == mask_vector) {
     return RTEMS_RESOURCE_IN_USE;
@@ -346,7 +351,10 @@ rtems_status_code mpc83xx_ipic_set_mask( rtems_vector_number vector, rtems_vecto
   return RTEMS_SUCCESSFUL;
 }
 
-rtems_status_code mpc83xx_ipic_set_highest_priority_interrupt( rtems_vector_number vector, int type)
+rtems_status_code mpc83xx_ipic_set_highest_priority_interrupt(
+  rtems_vector_number vector,
+  int type
+)
 {
   rtems_interrupt_level level;
   uint32_t reg = 0;
@@ -494,7 +502,7 @@ static int BSP_irq_handle_at_ipic( unsigned excNum)
  * Fill the array mpc83xx_ipic_prio2mask to allow masking of lower prio sources
  * to implement nested interrupts.
  */
-rtems_status_code mpc83xx_ipic_calc_prio2mask( void)
+static rtems_status_code mpc83xx_ipic_calc_prio2mask(void)
 {
   rtems_status_code rc = RTEMS_SUCCESSFUL;
 
@@ -507,7 +515,7 @@ rtems_status_code mpc83xx_ipic_calc_prio2mask( void)
 /*
  * Activate the interrupt controller
  */
-rtems_status_code mpc83xx_ipic_initialize( void)
+static rtems_status_code mpc83xx_ipic_initialize(void)
 {
   /*
    * mask off all interrupts
@@ -562,7 +570,10 @@ rtems_status_code mpc83xx_ipic_initialize( void)
   return mpc83xx_ipic_calc_prio2mask();
 }
 
-int mpc83xx_exception_handler( BSP_Exception_frame *frame, unsigned exception_number)
+static int mpc83xx_exception_handler(
+  BSP_Exception_frame *frame,
+  unsigned exception_number
+)
 {
   return BSP_irq_handle_at_ipic( exception_number);
 }

c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c

@@ -35,10 +35,6 @@
 
 #include <libchip/spi-fram-fm25l256.h>
 
-#else
-
-#warning No SPI configuration available
-
 #endif
 
 /*=========================================================================*\
@@ -299,8 +295,8 @@ rtems_status_code bsp_register_spi
   #if defined(MPC83XX_BOARD_MPC8313ERDB)
     rtems_status_code sc = RTEMS_SUCCESSFUL;
   #endif
-  int ret_code;
   unsigned spi_busno;
+  int      ret_code;
 
   /*
    * init I2C library (if not already done)
@@ -358,6 +354,12 @@ rtems_status_code bsp_register_spi
   mpc83xx.gpio[0].gpdir |=  (0xf << (31-27));
   mpc83xx.gpio[0].gpdr  &= ~(0xf << (31-27));
 
+#else
+
+  /*
+   * There is no SPI configuration information for this variant.
+   */
+  (void) spi_busno; /* avoid set but not used warning */
 #endif
 
   /*