imx: add rules for U-Boot DTB support

[karo-tx-uboot.git] / common / cmd_immap.c

diff --git a/common/cmd_immap.c b/common/cmd_immap.c
index c8367f0fb371787d0f93ab7df591212e381aee29..bdf53a4dbb86ec969a94cda99d0290a7bce51e16 100644 (file)
--- a/common/cmd_immap.c
+++ b/common/cmd_immap.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2000-2003
  * 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+
  */
 
 /*
@@ -43,14 +27,14 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 static void
-unimplemented ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+unimplemented ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        printf ("Sorry, but the '%s' command has not been implemented\n",
                cmdtp->name);
 }
 
 int
-do_siuinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_siuinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
@@ -81,7 +65,7 @@ do_siuinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 int
-do_memcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_memcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
@@ -133,7 +117,7 @@ do_memcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 int
-do_sitinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_sitinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
@@ -141,7 +125,7 @@ do_sitinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 #ifdef CONFIG_8260
 int
-do_icinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_icinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
@@ -149,7 +133,7 @@ do_icinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #endif
 
 int
-do_carinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_carinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
@@ -233,7 +217,7 @@ static void binary (char *label, uint value, int nbits)
 #endif
 
 int
-do_iopinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_iopinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
@@ -316,7 +300,7 @@ do_iopinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  * use *uint and set the address based on cmd + port
  */
 int
-do_iopset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_iopset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        uint rcode = 0;
        iopin_t iopin;
@@ -431,14 +415,14 @@ do_iopset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 int
-do_dmainfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_dmainfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
 }
 
 int
-do_fccinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_fccinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
@@ -453,7 +437,7 @@ static void prbrg (int n, uint val)
 #if defined(CONFIG_8xx)
        ulong clock = gd->cpu_clk;
 #elif defined(CONFIG_8260)
-       ulong clock = gd->brg_clk;
+       ulong clock = gd->arch.brg_clk;
 #endif
 
        printf ("BRG%d:", n);
@@ -498,7 +482,7 @@ static void prbrg (int n, uint val)
 }
 
 int
-do_brginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_brginfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
@@ -522,7 +506,7 @@ do_brginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 int
-do_i2cinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_i2cinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
@@ -535,7 +519,7 @@ do_i2cinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        volatile iic_t *iip;
        uint dpaddr;
 
-       dpaddr = *((unsigned short *) (&immap->im_dprambase[PROFF_I2C_BASE]));
+       dpaddr = immap->im_dprambase16[PROFF_I2C_BASE / sizeof(u16)];
        if (dpaddr == 0)
                iip = NULL;
        else
@@ -569,42 +553,42 @@ do_i2cinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 int
-do_sccinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_sccinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
 }
 
 int
-do_smcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_smcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
 }
 
 int
-do_spiinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_spiinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
 }
 
 int
-do_muxinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_muxinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
 }
 
 int
-do_siinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_siinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
 }
 
 int
-do_mccinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_mccinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unimplemented (cmdtp, flag, argc, argv);
        return 0;
@@ -615,39 +599,39 @@ do_mccinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        siuinfo,        1,      1,      do_siuinfo,
        "print System Interface Unit (SIU) registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        memcinfo,       1,      1,      do_memcinfo,
        "print Memory Controller registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        sitinfo,        1,      1,      do_sitinfo,
        "print System Integration Timers (SIT) registers",
-       NULL
+       ""
 );
 
 #ifdef CONFIG_8260
 U_BOOT_CMD(
        icinfo, 1,      1,      do_icinfo,
        "print Interrupt Controller registers",
-       NULL
+       ""
 );
 #endif
 
 U_BOOT_CMD(
        carinfo,        1,      1,      do_carinfo,
        "print Clocks and Reset registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        iopinfo,        1,      1,      do_iopinfo,
        "print I/O Port registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
@@ -659,62 +643,61 @@ U_BOOT_CMD(
 U_BOOT_CMD(
        dmainfo,        1,      1,      do_dmainfo,
        "print SDMA/IDMA registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        fccinfo,        1,      1,      do_fccinfo,
        "print FCC registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        brginfo,        1,      1,      do_brginfo,
        "print Baud Rate Generator (BRG) registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        i2cinfo,        1,      1,      do_i2cinfo,
        "print I2C registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        sccinfo,        1,      1,      do_sccinfo,
        "print SCC registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        smcinfo,        1,      1,      do_smcinfo,
        "print SMC registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        spiinfo,        1,      1,      do_spiinfo,
        "print Serial Peripheral Interface (SPI) registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        muxinfo,        1,      1,      do_muxinfo,
        "print CPM Multiplexing registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        siinfo, 1,      1,      do_siinfo,
        "print Serial Interface (SI) registers",
-       NULL
+       ""
 );
 
 U_BOOT_CMD(
        mccinfo,        1,      1,      do_mccinfo,
        "print MCC registers",
-       NULL
+       ""
 );
 
-
 #endif