Merge with /home/sr/git/u-boot

[u-boot] / cpu / mpc8xx / spi.c

diff --git a/cpu/mpc8xx/spi.c b/cpu/mpc8xx/spi.c
index 5d752077339190890b11505d2f04065015f1791b..e318ed0d298aefa9bc84c0ee4e27d0a2a1522083 100644 (file)
--- a/cpu/mpc8xx/spi.c
+++ b/cpu/mpc8xx/spi.c
@@ -39,7 +39,7 @@
 #include <linux/ctype.h>
 #include <malloc.h>
 #include <post.h>
-#include <net.h>
+#include <serial.h>
 
 #if (defined(CONFIG_SPI)) || (CONFIG_POST & CFG_POST_SPI)
 
@@ -525,11 +525,11 @@ int spi_post_test (int flags)
 
        for (i = 0; i < TEST_NUM; i++) {
                for (l = TEST_MIN_LENGTH; l <= TEST_MAX_LENGTH; l += 8) {
-                       packet_fill (txbuf, l);
+                       packet_fill ((char *)txbuf, l);
 
                        spi_xfer (l);
 
-                       if (packet_check (rxbuf, l) < 0) {
+                       if (packet_check ((char *)rxbuf, l) < 0) {
                                goto Done;
                        }
                }
@@ -542,13 +542,13 @@ int spi_post_test (int flags)
        cp->cp_spmode &= ~SPMODE_LOOP;
 
        /*
-        * SCC2 Ethernet parameter RAM space overlaps
+        * SCC2 parameter RAM space overlaps
         * the SPI parameter RAM space. So we need to restore
-        * the SCC2 configuration if it is used by UART or Ethernet.
+        * the SCC2 configuration if it is used by UART.
         */
 
-#if defined(CONFIG_8xx_CONS_SCC2)
-       serial_init ();
+#if !defined(CONFIG_8xx_CONS_NONE)
+       serial_reinit_all ();
 #endif
 
        if (res != 0) {