Coding Style cleanup: remove trailing white space

[platform/kernel/u-boot.git] / board / ppmc8260 / strataflash.c

diff --git a/board/ppmc8260/strataflash.c b/board/ppmc8260/strataflash.c
index bb21848..03d36ee 100644 (file)
--- a/board/ppmc8260/strataflash.c
+++ b/board/ppmc8260/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>
@@ -90,8 +74,6 @@
 #define FLASH_MAN_CFI                  0x01000000
 
 
-
-
 typedef union {
        unsigned char c;
        unsigned short w;
@@ -106,7 +88,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 */
 
 
 /*-----------------------------------------------------------------------
@@ -114,7 +96,6 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
  */
 
 
-
 static void flash_add_byte(flash_info_t *info, cfiword_t * cword, uchar c);
 static void flash_make_cmd(flash_info_t * info, uchar cmd, void * cmdbuf);
 static void flash_write_cmd(flash_info_t * info, int sect, uchar offset, uchar cmd);
@@ -124,7 +105,7 @@ static int flash_detect_cfi(flash_info_t * info);
 static ulong flash_get_size (ulong base, int banknum);
 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
 /*-----------------------------------------------------------------------
@@ -184,15 +165,15 @@ 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[0].flash_id == FLASH_UNKNOWN) {
                        printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx = %ld MB\n",i,
                                flash_info[0].size, flash_info[i].size<<20);
@@ -200,8 +181,8 @@ unsigned long flash_init (void)
        }
 
        /* Monitor protection ON by default */
-#if (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
-       for(i=0; flash_info[0].start[i] < CFG_MONITOR_BASE+CFG_MONITOR_LEN-1; i++)
+#if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
+       for(i=0; flash_info[0].start[i] < CONFIG_SYS_MONITOR_BASE+monitor_flash_len-1; i++)
                (void)flash_real_protect(&flash_info[0], i, 1);
 #endif
 
@@ -322,7 +303,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
                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)
@@ -343,7 +324,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);
        }
@@ -682,7 +663,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
@@ -752,4 +733,4 @@ static int flash_write_cfibuffer(flash_info_t * info, ulong dest, uchar * cp, in
        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 */