Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

[u-boot] / common / soft_spi.c

diff --git a/common/soft_spi.c b/common/soft_spi.c
index a5b62f28ea35d6341feb7ebd95705b69480eeef5..e4250616c2858943110fcabefa56513a32eee634 100644 (file)
--- a/common/soft_spi.c
+++ b/common/soft_spi.c
@@ -29,9 +29,6 @@
 
 #if defined(CONFIG_SOFT_SPI)
 
-#define DEBUG_SPI
-
-
 /*-----------------------------------------------------------------------
  * Definitions
  */
@@ -43,7 +40,6 @@
 #endif
 
 
-
 /*=====================================================================*/
 /*                         Public Functions                            */
 /*=====================================================================*/
@@ -83,7 +79,9 @@ void spi_init (void)
  */
 int  spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din)
 {
+#ifdef CFG_IMMR
        volatile immap_t *immr = (immap_t *)CFG_IMMR;
+#endif
        uchar tmpdin  = 0;
        uchar tmpdout = 0;
        int   j;
@@ -135,4 +133,3 @@ int  spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din)
 }
 
 #endif /* CONFIG_SOFT_SPI */
-