Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'

[oweals/u-boot.git] / board / hymod / hymod.c

diff --git a/board/hymod/hymod.c b/board/hymod/hymod.c
index 91aaab1b08d47361c2ae359ee0428a43647ef675..0183f781dec43dffe706f345de0d59ef846d0a07 100644 (file)
--- a/board/hymod/hymod.c
+++ b/board/hymod/hymod.c
@@ -2,28 +2,14 @@
  * (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+
  *
  * Hacked for the Hymod board by Murray.Jensen@csiro.au, 20-Oct-00
  */
 
 #include <common.h>
+#include <bootretry.h>
+#include <cli.h>
 #include <mpc8260.h>
 #include <mpc8260_irq.h>
 #include <ioports.h>
@@ -255,7 +241,7 @@ uchar fs6377_regs[16] = {
 int
 board_postclk_init (void)
 {
-       i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
+       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 
        /*
         * Initialise the FS6377 clock chip
@@ -347,16 +333,16 @@ uint upmc_table[] = {
 int
 misc_init_f (void)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        volatile memctl8260_t *memctl = &immap->im_memctl;
 
        printf ("UPMs:  ");
 
        upmconfig (UPMB, upmb_table, sizeof upmb_table / sizeof upmb_table[0]);
-       memctl->memc_mbmr = CFG_MBMR;
+       memctl->memc_mbmr = CONFIG_SYS_MBMR;
 
        upmconfig (UPMC, upmc_table, sizeof upmc_table / sizeof upmc_table[0]);
-       memctl->memc_mcmr = CFG_MCMR;
+       memctl->memc_mcmr = CONFIG_SYS_MCMR;
 
        printf ("configured\n");
        return (0);
@@ -367,10 +353,10 @@ misc_init_f (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 memctl8260_t *memctl = &immap->im_memctl;
-       volatile uchar c = 0, *ramaddr = (uchar *) (CFG_SDRAM_BASE + 0x8);
-       ulong psdmr = CFG_PSDMR;
+       volatile uchar c = 0, *ramaddr = (uchar *) (CONFIG_SYS_SDRAM_BASE + 0x8);
+       ulong psdmr = CONFIG_SYS_PSDMR;
        int i;
 
        /*
@@ -378,7 +364,7 @@ initdram (int board_type)
         *
         * "At system reset, initialization software must set up the
         *  programmable parameters in the memory controller banks registers
-        *  (ORx, BRx, P/LSDMR). After all memory parameters are conÞgured,
+        *  (ORx, BRx, P/LSDMR). After all memory parameters are configured,
         *  system software should execute the following initialization sequence
         *  for each SDRAM device.
         *
@@ -390,11 +376,11 @@ initdram (int board_type)
         *  accessing the SDRAM with a single-byte transaction."
         *
         * The appropriate BRx/ORx registers have already been set when we
-        * get here. The SDRAM can be accessed at the address CFG_SDRAM_BASE.
+        * get here. The SDRAM can be accessed at the address CONFIG_SYS_SDRAM_BASE.
         */
 
-       memctl->memc_psrt = CFG_PSRT;
-       memctl->memc_mptpr = CFG_MPTPR;
+       memctl->memc_psrt = CONFIG_SYS_PSRT;
+       memctl->memc_mptpr = CONFIG_SYS_MPTPR;
 
        memctl->memc_psdmr = psdmr | PSDMR_OP_PREA;
        *ramaddr = c;
@@ -409,7 +395,7 @@ initdram (int board_type)
        memctl->memc_psdmr = psdmr | PSDMR_OP_NORM | PSDMR_RFEN;
        *ramaddr = c;
 
-       return (CFG_SDRAM_SIZE << 20);
+       return (CONFIG_SYS_SDRAM_SIZE << 20);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -429,13 +415,11 @@ last_stage_init (void)
        hymod_conf_t *cp = &gd->bd->bi_hymod_conf;
        int rc;
 
-#ifdef CONFIG_BOOT_RETRY_TIME
        /*
-        * we use the readline () function, but we also want
+        * we use the cli_readline() function, but we also want
         * command timeout enabled
         */
-       init_cmd_timeout ();
-#endif
+       bootretry_init_cmd_timeout();
 
        memset ((void *) cp, 0, sizeof (*cp));
 
@@ -517,18 +501,18 @@ last_stage_init (void)
 #ifdef CONFIG_SHOW_ACTIVITY
 void board_show_activity (ulong timebase)
 {
-#ifdef CFG_HYMOD_DBLEDS
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+#ifdef CONFIG_SYS_HYMOD_DBLEDS
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        volatile iop8260_t *iop = &immr->im_ioport;
        static int shift = 0;
 
-       if ((timestamp % CFG_HZ) == 0) {
+       if ((timestamp % CONFIG_SYS_HZ) == 0) {
                if (++shift > 3)
                        shift = 0;
                iop->iop_pdatd =
                                (iop->iop_pdatd & ~0x0f000000) | (1 << (24 + shift));
        }
-#endif /* CFG_HYMOD_DBLEDS */
+#endif /* CONFIG_SYS_HYMOD_DBLEDS */
 }
 
 void show_activity(int arg)