Merge branch 'master' of git://git.denx.de/u-boot-tegra

[karo-tx-uboot.git] / arch / arm / cpu / armv7 / socfpga / misc.c

diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c
index 66edb3c20fbba6d20c9efbae32a6446e8c21be6d..5268f2c7082a37a4ff300292b49c2bd10c99d200 100644 (file)
--- a/arch/arm/cpu/armv7/socfpga/misc.c
+++ b/arch/arm/cpu/armv7/socfpga/misc.c
@@ -6,38 +6,35 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/reset_manager.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static const struct socfpga_reset_manager *reset_manager_base =
-               (void *)SOCFPGA_RSTMGR_ADDRESS;
+int dram_init(void)
+{
+       gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+       return 0;
+}
 
+#if defined(CONFIG_DISPLAY_CPUINFO)
 /*
- * Write the reset manager register to cause reset
+ * Print CPU information
  */
-void reset_cpu(ulong addr)
+int print_cpuinfo(void)
 {
-       /* request a warm reset */
-       writel(RSTMGR_CTRL_SWWARMRSTREQ_LSB, &reset_manager_base->ctrl);
-       /*
-        * infinite loop here as watchdog will trigger and reset
-        * the processor
-        */
-       while (1)
-               ;
+       puts("CPU   : Altera SOCFPGA Platform\n");
+       return 0;
 }
+#endif
 
-/*
- * Release peripherals from reset based on handoff
- */
-void reset_deassert_peripherals_handoff(void)
+#if defined(CONFIG_SYS_CONSOLE_IS_IN_ENV) && \
+defined(CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE)
+int overwrite_console(void)
 {
-       writel(0, &reset_manager_base->per_mod_reset);
+       return 0;
 }
+#endif
 
-int dram_init(void)
+int misc_init_r(void)
 {
-       gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
        return 0;
 }