rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / cpu / ixp / cpu.c

diff --git a/cpu/ixp/cpu.c b/cpu/ixp/cpu.c
index 00264be797b7d73bf17e6172914af9da3b2a989f..402188e30822fcaee9b6ae7b597d1ca2e312a3a6 100644 (file)
--- a/cpu/ixp/cpu.c
+++ b/cpu/ixp/cpu.c
@@ -34,19 +34,60 @@
 #include <command.h>
 #include <asm/arch/ixp425.h>
 
+ulong loops_per_jiffy;
+
+#ifdef CONFIG_USE_IRQ
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
+#if defined(CONFIG_DISPLAY_CPUINFO)
+int print_cpuinfo (void)
+{
+       unsigned long id;
+       int speed = 0;
+
+       asm ("mrc p15, 0, %0, c0, c0, 0":"=r" (id));
+
+       puts("CPU:   Intel IXP425 at ");
+       switch ((id & 0x000003f0) >> 4) {
+       case 0x1c:
+               loops_per_jiffy = 887467;
+               speed = 533;
+               break;
+
+       case 0x1d:
+               loops_per_jiffy = 666016;
+               speed = 400;
+               break;
+
+       case 0x1f:
+               loops_per_jiffy = 442901;
+               speed = 266;
+               break;
+       }
+
+       if (speed)
+               printf("%d MHz\n", speed);
+       else
+               puts("unknown revision\n");
+
+       return 0;
+}
+#endif /* CONFIG_DISPLAY_CPUINFO */
+
 int cpu_init (void)
 {
        /*
         * setup up stacks if necessary
         */
 #ifdef CONFIG_USE_IRQ
-       DECLARE_GLOBAL_DATA_PTR;
-
-       IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4;
+       IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
        FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 #endif
 
+#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
        pci_init();
+#endif
        return 0;
 }
 
@@ -76,8 +117,6 @@ int cleanup_before_linux (void)
 
 int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       extern void reset_cpu (ulong addr);
-
        printf ("resetting ...\n");
 
        udelay (50000);                         /* wait 50 ms */
@@ -154,3 +193,25 @@ void pci_init(void)
        return;
 }
 */
+
+#ifdef CONFIG_BOOTCOUNT_LIMIT
+
+void bootcount_store (ulong a)
+{
+       volatile ulong *save_addr = (volatile ulong *)(CONFIG_SYS_BOOTCOUNT_ADDR);
+
+       save_addr[0] = a;
+       save_addr[1] = BOOTCOUNT_MAGIC;
+}
+
+ulong bootcount_load (void)
+{
+       volatile ulong *save_addr = (volatile ulong *)(CONFIG_SYS_BOOTCOUNT_ADDR);
+
+       if (save_addr[1] != BOOTCOUNT_MAGIC)
+               return 0;
+       else
+               return save_addr[0];
+}
+
+#endif /* CONFIG_BOOTCOUNT_LIMIT */