Coding Style cleanup: remove trailing white space

[platform/kernel/u-boot.git] / board / emk / top860 / top860.c

diff --git a/board/emk/top860/top860.c b/board/emk/top860/top860.c
index aca4991..32c77f8 100644 (file)
--- a/board/emk/top860/top860.c
+++ b/board/emk/top860/top860.c
@@ -12,28 +12,13 @@
  * - ethernet io initialisation
  *
  * -----------------------------------------------------------------
- * 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 <commproc.h>
 #include <mpc8xx.h>
+#include <asm/io.h>
 
 /*****************************************************************************
  * UPM table for 60ns EDO RAM at 25 MHz bus/external clock
@@ -78,7 +63,7 @@ int checkboard (void)
  *****************************************************************************/
 phys_size_t initdram (int board_type)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        volatile memctl8xx_t *memctl = &immap->im_memctl;
 
        /*
@@ -87,21 +72,21 @@ phys_size_t initdram (int board_type)
         */
        if ((ulong) initdram & 0xff000000) {
                volatile uint *addr1, *addr2;
-               uint i, j;
+               uint i;
 
                upmconfig (UPMA, (uint *) edo_60ns_25MHz_tbl,
                           sizeof (edo_60ns_25MHz_tbl) / sizeof (uint));
                memctl->memc_mptpr = 0x0200;
                memctl->memc_mamr = 0x0ca20330;
-               memctl->memc_or2 = -CFG_DRAM_MAX | OR_CSNT_SAM;
-               memctl->memc_br2 = CFG_DRAM_BASE | BR_MS_UPMA | BR_V;
+               memctl->memc_or2 = -CONFIG_SYS_DRAM_MAX | OR_CSNT_SAM;
+               memctl->memc_br2 = CONFIG_SYS_DRAM_BASE | BR_MS_UPMA | BR_V;
                /*
                 * Do 8 read accesses to DRAM
                 */
                addr1 = (volatile uint *) 0;
                addr2 = (volatile uint *) 0x00400000;
-               for (i = 0, j = 0; i < 8; i++)
-                       j = addr1[0];
+               for (i = 0; i < 8; i++)
+                       in_be32(addr1);
 
                /*
                 * Now check whether we got 4MB or 16MB populated
@@ -112,7 +97,7 @@ phys_size_t initdram (int board_type)
                addr2[1] = 0x47110815;
                if (addr1[0] == 0xfeedc0de && addr1[1] == 0x47110815) {
                        /* only 4MB populated */
-                       memctl->memc_or2 = -(CFG_DRAM_MAX / 4) | OR_CSNT_SAM;
+                       memctl->memc_or2 = -(CONFIG_SYS_DRAM_MAX / 4) | OR_CSNT_SAM;
                }
        }