Merge git://git.denx.de/u-boot-socfpga

[platform/kernel/u-boot.git] / arch / arm / mach-keystone / cmd_mon.c

diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c
index f9f58a3..c2525bd 100644 (file)
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -9,87 +9,61 @@
 
 #include <common.h>
 #include <command.h>
+#include <image.h>
+#include <mach/mon.h>
 asm(".arch_extension sec\n\t");
 
-static int mon_install(u32 addr, u32 dpsc, u32 freq)
-{
-       int result;
-
-       __asm__ __volatile__ (
-               "stmfd r13!, {lr}\n"
-               "mov r0, %1\n"
-               "mov r1, %2\n"
-               "mov r2, %3\n"
-               "blx r0\n"
-               "ldmfd r13!, {lr}\n"
-               : "=&r" (result)
-               : "r" (addr), "r" (dpsc), "r" (freq)
-               : "cc", "r0", "r1", "r2", "memory");
-       return result;
-}
-
 static int do_mon_install(cmd_tbl_t *cmdtp, int flag, int argc,
                          char * const argv[])
 {
-       u32 addr, dpsc_base = 0x1E80000, freq;
+       u32 addr, dpsc_base = 0x1E80000, freq, load_addr, size;
        int     rcode = 0;
+       struct image_header *header;
+       u32 ecrypt_bm_addr = 0;
 
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       freq = clk_get_rate(sys_clk0_6_clk);
+       freq = CONFIG_SYS_HZ_CLOCK;
 
        addr = simple_strtoul(argv[1], NULL, 16);
 
-       rcode = mon_install(addr, dpsc_base, freq);
-       printf("## installed monitor, freq [%d], status %d\n",
-              freq, rcode);
+       header = (struct image_header *)addr;
+
+       if (image_get_magic(header) != IH_MAGIC) {
+               printf("## Please update monitor image\n");
+               return -EFAULT;
+       }
+
+       load_addr = image_get_load(header);
+       size = image_get_data_size(header);
+       memcpy((void *)load_addr, (void *)(addr + sizeof(struct image_header)),
+              size);
+
+       if (argc >=  3)
+               ecrypt_bm_addr = simple_strtoul(argv[2], NULL, 16);
+
+       rcode = mon_install(load_addr, dpsc_base, freq, ecrypt_bm_addr);
+       printf("## installed monitor @ 0x%x, freq [%d], status %d\n",
+              load_addr, freq, rcode);
 
        return 0;
 }
 
-U_BOOT_CMD(mon_install, 2, 0, do_mon_install,
+U_BOOT_CMD(mon_install, 3, 0, do_mon_install,
           "Install boot kernel at 'addr'",
           ""
 );
 
 static void core_spin(void)
 {
-       while (1)
-               ; /* forever */;
-}
-
-int mon_power_on(int core_id, void *ep)
-{
-       int result;
-
-       asm volatile (
-               "stmfd  r13!, {lr}\n"
-               "mov r1, %1\n"
-               "mov r2, %2\n"
-               "mov r0, #0\n"
-               "smc    #0\n"
-               "ldmfd  r13!, {lr}\n"
-               : "=&r" (result)
-               : "r" (core_id), "r" (ep)
-               : "cc", "r0", "r1", "r2", "memory");
-       return  result;
-}
-
-int mon_power_off(int core_id)
-{
-       int result;
-
-       asm volatile (
-               "stmfd  r13!, {lr}\n"
-               "mov r1, %1\n"
-               "mov r0, #1\n"
-               "smc    #1\n"
-               "ldmfd  r13!, {lr}\n"
-               : "=&r" (result)
-               : "r" (core_id)
-               : "cc", "r0", "r1", "memory");
-       return  result;
+       while (1) {
+               asm volatile (
+                       "dsb\n"
+                       "isb\n"
+                       "wfi\n"
+               );
+       }
 }
 
 int do_mon_power(cmd_tbl_t *cmdtp, int flag, int argc,