Blackfin: Remove

[oweals/u-boot.git] / arch / sparc / cpu / leon3 / cpu.c

diff --git a/arch/sparc/cpu/leon3/cpu.c b/arch/sparc/cpu/leon3/cpu.c
index 976f3113480a4edf17f1c527c7f9a8c851fcaaed..149e5c69e631a7bf998d2ae381c4b651496d82d4 100644 (file)
--- a/arch/sparc/cpu/leon3/cpu.c
+++ b/arch/sparc/cpu/leon3/cpu.c
@@ -1,25 +1,9 @@
 /* CPU specific code for the LEON3 CPU
  *
- * (C) Copyright 2007
- * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com
+ * (C) Copyright 2007, 2015
+ * Daniel Hellstrom, Cobham Gaisler, daniel@gaisler.com
  *
- * 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>
@@ -29,18 +13,72 @@
 
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <ambapp.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 extern void _reset_reloc(void);
 
+int leon_cpu_cnt = 1;
+int leon_ver = 3;
+unsigned int leon_cpu_freq = CONFIG_SYS_CLK_FREQ;
+
+int cpu_freq(void)
+{
+       ambapp_ahbdev dev;
+
+       if (leon_ver == 3) {
+               ambapp_ahbmst_find(&ambapp_plb, VENDOR_GAISLER,
+                       GAISLER_LEON3, 0, &dev);
+       } else {
+               ambapp_ahbmst_find(&ambapp_plb, VENDOR_GAISLER,
+                       GAISLER_LEON4, 0, &dev);
+       }
+
+       leon_cpu_freq = ambapp_bus_freq(&ambapp_plb, dev.ahb_bus_index);
+
+       return 0;
+}
+
 int checkcpu(void)
 {
+       int cnt;
+       char str[4];
+
        /* check LEON version here */
-       printf("CPU: LEON3\n");
+       cnt = ambapp_ahbmst_count(&ambapp_plb, VENDOR_GAISLER, GAISLER_LEON3);
+       if (cnt <= 0) {
+               cnt = ambapp_ahbmst_count(&ambapp_plb, VENDOR_GAISLER,
+                       GAISLER_LEON4);
+               if (cnt > 0)
+                       leon_ver = 4;
+       }
+
+       cpu_freq();
+
+       str[0] = '\0';
+       if (cnt > 1) {
+               leon_cpu_cnt = cnt;
+               str[0] = '0' + cnt;
+               str[1] = 'x';
+               str[2] = '\0';
+       }
+       printf("CPU: %sLEON%d @ %dMHz\n", str, leon_ver,
+               leon_cpu_freq / 1000000);
+
        return 0;
 }
 
+#ifdef CONFIG_DISPLAY_CPUINFO
+
+int print_cpuinfo(void)
+{
+       printf("CPU:   LEON3\n");
+       return 0;
+}
+
+#endif
+
 /* ------------------------------------------------------------------------- */
 
 void cpu_reset(void)
@@ -52,7 +90,7 @@ void cpu_reset(void)
        _reset_reloc();
 }
 
-int do_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_reset(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        cpu_reset();