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/spi/spi_init.c

@@ -23,22 +23,18 @@
 #include <bsp/irq.h>
 #include <bsp.h>
 
-#if defined( MPC83XX_BOARD_MPC8313ERDB)
+#if defined(MPC83XX_BOARD_MPC8313ERDB)
 
 #include <libchip/spi-sd-card.h>
 
-#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
+#elif defined(MPC83XX_BOARD_MPC8349EAMDS)
 
 #include <libchip/spi-flash-m25p40.h>
 
-#elif defined( MPC83XX_BOARD_HSC_CM01)
+#elif defined(MPC83XX_BOARD_HSC_CM01)
 
 #include <libchip/spi-fram-fm25l256.h>
 
-#else
-
-#warning No SPI configuration available
-
 #endif
 
 /*=========================================================================*\
@@ -296,11 +292,11 @@ rtems_status_code bsp_register_spi
 |    0 or error code                                                        |
 \*=========================================================================*/
 {
-#if defined(MPC83XX_BOARD_MPC8313ERDB)
-  rtems_status_code sc = RTEMS_SUCCESSFUL;
-#endif
-  int ret_code;
+  #if defined(MPC83XX_BOARD_MPC8313ERDB)
+    rtems_status_code sc = RTEMS_SUCCESSFUL;
+  #endif
   unsigned spi_busno;
+  int      ret_code;
 
   /*
    * init I2C library (if not already done)
@@ -311,7 +307,7 @@ rtems_status_code bsp_register_spi
    * init port pins used to address/select SPI devices
    */
 
-#if defined( MPC83XX_BOARD_MPC8313ERDB)
+#if defined(MPC83XX_BOARD_MPC8313ERDB)
 
   /*
    * Configured as master (direct connection to SD card)
@@ -335,7 +331,7 @@ rtems_status_code bsp_register_spi
   /* Open Drain */
   /* mpc83xx.gpio [0].gpdr  |= 0x0000000f; */
 
-#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
+#elif defined(MPC83XX_BOARD_MPC8349EAMDS)
 
   /*
    * GPIO1[0] is nSEL_SPI for M25P40
@@ -345,7 +341,7 @@ rtems_status_code bsp_register_spi
   mpc83xx.gpio[0].gpdir |=  (1 << (31- 0));
   mpc83xx.gpio[0].gpdr  &= ~(1 << (31- 0));
 
-#elif defined( MPC83XX_BOARD_HSC_CM01)
+#elif defined(MPC83XX_BOARD_HSC_CM01)
 
   /*
    * GPIO1[24] is SPI_A0
@@ -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
 
   /*