Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / esteem192e / flash.c

diff --git a/board/esteem192e/flash.c b/board/esteem192e/flash.c
index d5eb2019b603eb00d1df892179b80c3c803b3f03..a121104ca899aee9cd0ca78fb200ff95d169db36 100644 (file)
--- a/board/esteem192e/flash.c
+++ b/board/esteem192e/flash.c
@@ -2,29 +2,13 @@
  * (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 <mpc8xx.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        */
 
 #ifdef CONFIG_FLASH_16BIT
 #define FLASH_WORD_SIZE        unsigned short
@@ -54,13 +38,13 @@ static void flash_get_offsets (ulong base, flash_info_t * info);
  */
 unsigned long flash_init (void)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        volatile memctl8xx_t *memctl = &immap->im_memctl;
        unsigned long size_b0, size_b1;
        int i;
 
        /* 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;
        }
 
@@ -91,44 +75,44 @@ unsigned long flash_init (void)
        }
 
        /* Remap FLASH according to real size */
-       memctl->memc_or0 = CFG_OR_TIMING_FLASH | (-size_b0 & 0xFFFF8000);
-       memctl->memc_br0 = CFG_FLASH_BASE | 0x00000801; /*  (CFG_FLASH_BASE & BR_BA_MSK) | BR_MS_GPCM | BR_V; */
+       memctl->memc_or0 = CONFIG_SYS_OR_TIMING_FLASH | (-size_b0 & 0xFFFF8000);
+       memctl->memc_br0 = CONFIG_SYS_FLASH_BASE | 0x00000801;  /*  (CONFIG_SYS_FLASH_BASE & BR_BA_MSK) | BR_MS_GPCM | BR_V; */
 
        /* Re-do sizing to get full correct info */
 
-       size_b0 = flash_get_size ((volatile FLASH_WORD_SIZE *) CFG_FLASH_BASE,
+       size_b0 = flash_get_size ((volatile FLASH_WORD_SIZE *) CONFIG_SYS_FLASH_BASE,
                                  &flash_info[0]);
-       flash_get_offsets (CFG_FLASH_BASE, &flash_info[0]);
+       flash_get_offsets (CONFIG_SYS_FLASH_BASE, &flash_info[0]);
 
-#if CFG_MONITOR_BASE >= CFG_FLASH_BASE
+#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE
        /* monitor protection ON by default */
        (void) 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
 
        if (size_b1) {
                memctl->memc_or1 =
-                       CFG_OR_TIMING_FLASH | (-size_b1 & 0xFFFF8000);
+                       CONFIG_SYS_OR_TIMING_FLASH | (-size_b1 & 0xFFFF8000);
                memctl->memc_br1 =
-                       (CFG_FLASH_BASE | 0x00000801) + (size_b0 & BR_BA_MSK);
-               /*((CFG_FLASH_BASE + size_b0) & BR_BA_MSK) |
+                       (CONFIG_SYS_FLASH_BASE | 0x00000801) + (size_b0 & BR_BA_MSK);
+               /*((CONFIG_SYS_FLASH_BASE + size_b0) & BR_BA_MSK) |
                   BR_MS_GPCM | BR_V; */
 
                /* Re-do sizing to get full correct info */
                size_b1 =
                        flash_get_size ((volatile FLASH_WORD_SIZE
-                                        *) (CFG_FLASH_BASE + size_b0),
+                                        *) (CONFIG_SYS_FLASH_BASE + size_b0),
                                        &flash_info[1]);
 
-               flash_get_offsets (CFG_FLASH_BASE + size_b0, &flash_info[1]);
+               flash_get_offsets (CONFIG_SYS_FLASH_BASE + size_b0, &flash_info[1]);
 
-#if CFG_MONITOR_BASE >= CFG_FLASH_BASE
+#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE
                /* monitor protection ON by default */
                (void) flash_protect (FLAG_PROTECT_SET,
-                                     CFG_MONITOR_BASE,
-                                     CFG_MONITOR_BASE + monitor_flash_len -
+                                     CONFIG_SYS_MONITOR_BASE,
+                                     CONFIG_SYS_MONITOR_BASE + monitor_flash_len -
                                      1, &flash_info[1]);
 #endif
        } else {
@@ -769,7 +753,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
                addr = (volatile FLASH_WORD_SIZE *) (info->start[l_sect]);
                while ((addr[0] & (0x00800080 & FLASH_ID_MASK)) !=
                       (0x00800080 & FLASH_ID_MASK)) {
-                       if ((now = get_timer (start)) > CFG_FLASH_ERASE_TOUT) {
+                       if ((now = get_timer (start)) > CONFIG_SYS_FLASH_ERASE_TOUT) {
                                printf ("Timeout\n");
                                return 1;
                        }
@@ -1022,7 +1006,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)
 
                while ((*((vu_long *) dest) & 0x00800080) !=
                       (data & 0x00800080)) {
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT) {
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                                return (1);
                        }
                }
@@ -1030,7 +1014,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)
        } else {
 
                while (!(addr[0] & 0x00800080)) {       /* wait for error or finish */
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT) {
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                                return (1);
                        }
 
@@ -1096,7 +1080,7 @@ static int write_short (flash_info_t * info, ulong dest, ushort data)
        if (info->flash_id < FLASH_AMD_COMP) {
                /* AMD stuff */
                while ((*((vu_short *) dest) & 0x0080) != (data & 0x0080)) {
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT) {
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                                return (1);
                        }
                }
@@ -1104,7 +1088,7 @@ static int write_short (flash_info_t * info, ulong dest, ushort data)
        } else {
                /* intel stuff */
                while (!(addr[0] & 0x0080)) {   /* wait for error or finish */
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT)
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT)
                                return (1);
                }
 
@@ -1123,7 +1107,7 @@ static int write_short (flash_info_t * info, ulong dest, ushort data)
                *addr = 0x00B0;
                *addr = 0x0070;
                while (!(addr[0] & 0x0080)) {   /* wait for error or finish */
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT)
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT)
                                return (1);
                }
                *addr = 0x00FF;