Merge git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / board / esd / cpci5200 / strataflash.c

diff --git a/board/esd/cpci5200/strataflash.c b/board/esd/cpci5200/strataflash.c
index d76af02dbefeb5dfc522ed3c7e5ec308df01600c..4983112a8797edfb594c517c5357a257fa7e2a4e 100644 (file)
--- a/board/esd/cpci5200/strataflash.c
+++ b/board/esd/cpci5200/strataflash.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2002
  * Brad Kemp, Seranoa Networks, Brad.Kemp@seranoa.com
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * 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
+ * SPDX-License-Identifier:    GPL-2.0+ 
  */
 
 #include <common.h>
@@ -102,7 +86,7 @@ typedef union {
 
 #define NUM_ERASE_REGIONS 4
 
-flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips        */
+flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];   /* info for FLASH chips        */
 
 /*-----------------------------------------------------------------------
  * Functions
@@ -121,7 +105,7 @@ static int flash_write_cfiword(flash_info_t * info, ulong dest,
                               cfiword_t cword);
 static int flash_full_status_check(flash_info_t * info, ulong sector,
                                   ulong tout, char *prompt);
-#ifdef CFG_FLASH_USE_BUFFER_WRITE
+#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 static int flash_write_cfibuffer(flash_info_t * info, ulong dest, uchar * cp,
                                 int len);
 #endif
@@ -185,14 +169,14 @@ unsigned long flash_init(void)
         *
         */
 
-       address = CFG_FLASH_BASE;
+       address = CONFIG_SYS_FLASH_BASE;
        size = 0;
 
        /* Init: no FLASHes known */
-       for (i = 0; i < CFG_MAX_FLASH_BANKS; ++i) {
+       for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
                flash_info[i].flash_id = FLASH_UNKNOWN;
                size += flash_info[i].size = flash_get_size(address, i);
-               address += CFG_FLASH_INCREMENT;
+               address += CONFIG_SYS_FLASH_INCREMENT;
                if (flash_info[i].flash_id == FLASH_UNKNOWN) {
                        printf
                            ("## Unknown FLASH on Bank %d - Size = 0x%08lx = %ld MB\n",
@@ -202,9 +186,9 @@ unsigned long flash_init(void)
 
 #if 0                          /* test-only */
        /* Monitor protection ON by default */
-#if (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
+#if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
        for (i = 0;
-            flash_info[0].start[i] < CFG_MONITOR_BASE + monitor_flash_len - 1;
+            flash_info[0].start[i] < CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1;
             i++)
                (void)flash_real_protect(&flash_info[0], i, 1);
 #endif
@@ -326,7 +310,7 @@ int write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt)
                        return rc;
                wp = cp;
        }
-#ifdef CFG_FLASH_USE_BUFFER_WRITE
+#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
        while (cnt >= info->portwidth) {
                i = info->buffer_size > cnt ? cnt : info->buffer_size;
                if ((rc = flash_write_cfibuffer(info, wp, src, i)) != ERR_OK)
@@ -347,7 +331,7 @@ int write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt)
                wp += info->portwidth;
                cnt -= info->portwidth;
        }
-#endif                         /* CFG_FLASH_USE_BUFFER_WRITE */
+#endif                         /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */
        if (cnt == 0) {
                return (0);
        }
@@ -678,12 +662,10 @@ static ulong flash_get_size(ulong base, int banknum)
 static int flash_write_cfiword(flash_info_t * info, ulong dest, cfiword_t cword)
 {
 
-       cfiptr_t ctladdr;
        cfiptr_t cptr;
        int flag;
 
-       ctladdr.cp = flash_make_addr(info, 0, 0);
-       cptr.cp = (uchar *) dest;
+       cptr.cp = (uchar *)dest;
 
        /* Check if Flash is (sufficiently) erased */
        switch (info->portwidth) {
@@ -727,7 +709,7 @@ static int flash_write_cfiword(flash_info_t * info, ulong dest, cfiword_t cword)
        return flash_full_status_check(info, 0, info->write_tout, "write");
 }
 
-#ifdef CFG_FLASH_USE_BUFFER_WRITE
+#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 
 /* loop through the sectors from the highest address
  * when the passed address is greater or equal to the sector address
@@ -801,4 +783,4 @@ static int flash_write_cfibuffer(flash_info_t * info, ulong dest, uchar * cp,
        flash_write_cmd(info, sector, 0, FLASH_CMD_CLEAR_STATUS);
        return retcode;
 }
-#endif                         /* CFG_USE_FLASH_BUFFER_WRITE */
+#endif                         /* CONFIG_SYS_USE_FLASH_BUFFER_WRITE */