Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

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

diff --git a/board/ep88x/ep88x.c b/board/ep88x/ep88x.c
index 5f57f36..8a60b58 100644 (file)
--- a/board/ep88x/ep88x.c
+++ b/board/ep88x/ep88x.c
@@ -5,23 +5,7 @@
  * Support for Embedded Planet EP88x boards.
  * Tested on EP88xC with MPC885 CPU, 64MB SDRAM and 16MB flash.
  *
- * 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>
@@ -63,7 +47,7 @@ static uint sdram_table[] = {
 
 int board_early_init_f (void)
 {
-       vu_char *bcsr = (vu_char *)CFG_BCSR;
+       vu_char *bcsr = (vu_char *)CONFIG_SYS_BCSR;
 
        bcsr[0] |= 0x0C; /* Turn the LEDs off */
        bcsr[2] |= 0x08; /* Enable flash WE# line - necessary for
@@ -86,10 +70,10 @@ int board_early_init_f (void)
        return 0;
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        long int msize;
-       volatile immap_t     *immap  = (volatile immap_t *)CFG_IMMR;
+       volatile immap_t     *immap  = (volatile immap_t *)CONFIG_SYS_IMMR;
        volatile memctl8xx_t *memctl = &immap->im_memctl;
 
        upmconfig(UPMA, sdram_table, sizeof(sdram_table) / sizeof(uint));
@@ -97,7 +81,7 @@ long int initdram (int board_type)
        /* Configure SDRAM refresh */
        memctl->memc_mptpr = MPTPR_PTP_DIV2; /* BRGCLK/2 */
 
-       memctl->memc_mamr = (65 << 24) | CFG_MAMR; /* No refresh */
+       memctl->memc_mamr = (65 << 24) | CONFIG_SYS_MAMR; /* No refresh */
        udelay(100);
 
        /* Run MRS pattern from location 0x36 */
@@ -106,10 +90,10 @@ long int initdram (int board_type)
        udelay(100);
 
        memctl->memc_mamr |=  MAMR_PTAE; /* Enable refresh */
-       memctl->memc_or1   = ~(CFG_SDRAM_MAX_SIZE - 1) | OR_CSNT_SAM;
-       memctl->memc_br1   =  CFG_SDRAM_BASE | BR_PS_32 | BR_MS_UPMA | BR_V;
+       memctl->memc_or1   = ~(CONFIG_SYS_SDRAM_MAX_SIZE - 1) | OR_CSNT_SAM;
+       memctl->memc_br1   =  CONFIG_SYS_SDRAM_BASE | BR_PS_32 | BR_MS_UPMA | BR_V;
 
-       msize = get_ram_size(CFG_SDRAM_BASE, CFG_SDRAM_MAX_SIZE);
+       msize = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_MAX_SIZE);
        memctl->memc_or1  |= ~(msize - 1);
 
        return msize;
@@ -117,7 +101,7 @@ long int initdram (int board_type)
 
 int checkboard( void )
 {
-       vu_char *bcsr = (vu_char *)CFG_BCSR;
+       vu_char *bcsr = (vu_char *)CONFIG_SYS_BCSR;
 
        puts("Board: ");
        switch (bcsr[15]) {