Merge with /home/wd/git/u-boot/custodian/u-boot-testing

[oweals/u-boot.git] / board / ispan / ispan.c

diff --git a/board/ispan/ispan.c b/board/ispan/ispan.c
index e41a7c45a82eb6ffa45538bc0796d2919f480915..d39b8cd53359fd54e375f89208ae358cf627e5c9 100644 (file)
--- a/board/ispan/ispan.c
+++ b/board/ispan/ispan.c
@@ -236,6 +236,7 @@ static int seeprom_read (int addr, uchar * data, int size)
  * Serial EEPROM conected to the PSpan bridge. We keep it as
  * simple as possible.
  */
+#ifdef DEBUG
 static int hwc_flash_size (void)
 {
        uchar byte;
@@ -273,6 +274,7 @@ static int hwc_local_sdram_size (void)
        }
        return -1;
 }
+#endif /* DEBUG */
 
 static int hwc_main_sdram_size (void)
 {
@@ -288,7 +290,7 @@ static int hwc_serial_number (void)
 {
        int sn = -1;
 
-       if (!seeprom_read (0xa0, (char *) &sn, sizeof (sn))) {
+       if (!seeprom_read (0xa0, (uchar *) &sn, sizeof (sn))) {
                sn = cpu_to_le32 (sn);
        }
        return sn;
@@ -298,7 +300,7 @@ static int hwc_mac_address (char *str)
 {
        char mac[6];
 
-       if (!seeprom_read (0xb0, mac, sizeof (mac))) {
+       if (!seeprom_read (0xb0, (uchar *)mac, sizeof (mac))) {
                sprintf (str, "%02X:%02X:%02X:%02X:%02X:%02X",
                                 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
        } else {