[PATCH 08/62] powerpc/gen83xx: Fix unused variable warnings

[Joel Sherrill]

---
 c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c      | 2 ++
 c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c b/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c
index 4e0fc6c..96ec4d7 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c
@@ -414,10 +414,12 @@ rtems_status_code bsp_interrupt_vector_disable( rtems_vector_number irqnum)
 static int BSP_irq_handle_at_ipic( unsigned excNum)
 {
 	int32_t vecnum;
+#ifdef GEN83XX_ENABLE_INTERRUPT_NESTING
 	mpc83xx_ipic_mask_t mask_save;
 	const mpc83xx_ipic_mask_t *mask_ptr;
 	uint32_t msr = 0;
 	rtems_interrupt_level level;
+#endif
 
 	/* Get vector number */
 	switch (excNum) {
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c b/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
index 4c0cb7b..512db03 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c
@@ -296,7 +296,9 @@ 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;
   unsigned spi_busno;
 
@@ -373,7 +375,7 @@ rtems_status_code bsp_register_spi
   }
   spi_busno = (unsigned) ret_code;
 
-#if defined( MPC83XX_BOARD_MPC8313ERDB)
+#if defined(MPC83XX_BOARD_MPC8313ERDB)
 
   /* Register SD Card driver */
   sd_card_driver_table [0].bus = spi_busno;
@@ -382,7 +384,7 @@ rtems_status_code bsp_register_spi
     return sc;
   }
 
-#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
+#elif defined(MPC83XX_BOARD_MPC8349EAMDS)
 
   /*
    * register M25P40 Flash
-- 
1.9.3