ppc4xx: lwmon5: Change PHY reset sequence for PHY MDIO address latching

[oweals/u-boot.git] / board / bf537-stamp / flash.c

diff --git a/board/bf537-stamp/flash.c b/board/bf537-stamp/flash.c
index 172d3bed19ffdf2b9c746088f2f8cad7b0124e55..ed8584147972dac54e797edead2342661a3ed62d 100644 (file)
--- a/board/bf537-stamp/flash.c
+++ b/board/bf537-stamp/flash.c
@@ -1,7 +1,7 @@
 /*
  * U-boot - flash.c Flash driver for PSD4256GV
  *
- * Copyright (c) 2005 blackfin.uclinux.org
+ * Copyright (c) 2005-2007 Analog Devices Inc.
  * This file is based on BF533EzFlash.c originally written by Analog Devices, Inc.
  *
  * (C) Copyright 2000-2004
@@ -22,8 +22,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
  */
 
 #include <malloc.h>
@@ -330,14 +330,14 @@ int erase_block_flash(int nBlock)
        if ((nBlock < 0) || (nBlock > AFP_NumSectors))
                return FALSE;
 
-       // figure out the offset of the block in flash
+       /* figure out the offset of the block in flash */
        if ((nBlock >= 0) && (nBlock < SecFlashABegin))
                ulSectorOff = nBlock * AFP_SectorSize1;
 
        else if ((nBlock >= SecFlashABegin) && (nBlock < NUM_SECTORS))
                ulSectorOff =
                    SecFlashAOff + (nBlock - SecFlashABegin) * AFP_SectorSize2;
-       // no such sector
+       /* no such sector */
        else
                return FLASH_FAIL;
 
@@ -388,15 +388,15 @@ void get_sector_number(long ulOffset, int *pnSector)
        long lMainEnd = 0x400000;
        long lBootEnd = 0x10000;
 
-       // sector numbers for the FLASH A boot sectors
+       /* sector numbers for the FLASH A boot sectors */
        if (ulOffset < lBootEnd) {
                nSector = (int)ulOffset / AFP_SectorSize1;
        }
-       // sector numbers for the FLASH B boot sectors
+       /* sector numbers for the FLASH B boot sectors */
        else if ((ulOffset >= lBootEnd) && (ulOffset < lMainEnd)) {
                nSector = ((ulOffset / (AFP_SectorSize2)) + 7);
        }
-       // if it is a valid sector, set it
+       /* if it is a valid sector, set it */
        if ((nSector >= 0) && (nSector < AFP_NumSectors))
                *pnSector = nSector;