Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / board / cogent / flash.c

diff --git a/board/cogent/flash.c b/board/cogent/flash.c
index 969520d277be263972f54019cbd19cfd6516b4d9..1da8f10a1f955b370851f49eabd4151d45fec489 100644 (file)
--- a/board/cogent/flash.c
+++ b/board/cogent/flash.c
@@ -2,39 +2,24 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * 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>
-#include <board/cogent/flash.h>
+#include "flash.h"
+#include <linux/compiler.h>
 
-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 */
 
-#if defined(CFG_ENV_IS_IN_FLASH)
-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
 # endif
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE
 # endif
-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE
 # endif
 #endif
 
@@ -121,7 +106,7 @@ c302f_probe(flash_info_t *fip, c302f_addr_t base)
                fip->size += C302F_BNK_SIZE;
                osc = fip->sector_count;
                fip->sector_count += C302F_BNK_NBLOCKS;
-               if ((nsc = fip->sector_count) >= CFG_MAX_FLASH_SECT)
+               if ((nsc = fip->sector_count) >= CONFIG_SYS_MAX_FLASH_SECT)
                        panic("Too many sectors in flash at address 0x%08lx\n",
                                (unsigned long)base);
 
@@ -264,7 +249,7 @@ c302f_write_word(c302f_addr_t addr, c302f_word_t value)
        /* data polling for D7 */
        start = get_timer (0);
        do {
-               if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+               if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                        retval = 1;
                        goto done;
                }
@@ -292,10 +277,10 @@ flash_init(void)
 {
        unsigned long total;
        int i;
-       flash_info_t *fip;
+       __maybe_unused flash_info_t *fip;
 
        /* 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;
        }
 
@@ -303,7 +288,7 @@ flash_init(void)
        total = 0L;
 
 #if defined(CONFIG_CMA302)
-       c302f_probe(fip, (c302f_addr_t)CFG_FLASH_BASE);
+       c302f_probe(fip, (c302f_addr_t)CONFIG_SYS_FLASH_BASE);
        total += fip->size;
        fip++;
 #endif
@@ -320,18 +305,18 @@ flash_init(void)
         * protect monitor and environment sectors
         */
 
-#if CFG_MONITOR_BASE == CFG_FLASH_BASE
+#if CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_MONITOR_BASE,
-                     CFG_MONITOR_BASE+monitor_flash_len-1,
+                     CONFIG_SYS_MONITOR_BASE,
+                     CONFIG_SYS_MONITOR_BASE+monitor_flash_len-1,
                      &flash_info[0]);
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
                      &flash_info[0]);
 #endif
        return total;
@@ -472,7 +457,7 @@ flash_erase(flash_info_t *info, int s_first, int s_last)
                        do {
                                now = get_timer(start);
 
-                               if (now - estart > CFG_FLASH_ERASE_TOUT) {
+                               if (now - estart > CONFIG_SYS_FLASH_ERASE_TOUT) {
                                        printf ("Timeout (sect %d)\n", sect);
                                        haderr = 1;
                                        break;
@@ -502,7 +487,7 @@ flash_erase(flash_info_t *info, int s_first, int s_last)
 
        if (haderr > 0) {
                printf (" failed\n");
-               rcode = 1;
+               rcode = 1;
        }
        else
                printf (" done\n");