i2c: rcar_i2c: Add DM and DT capable I2C driver

[u-boot] / 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 6a9bdc96017bae56f2539dd63c0a2e0cbeb9c1e1..8142039040a78b72b570fb40bbe15553c9ea63a1 100644 (file)
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -1,22 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * K2HK: secure kernel command file
  *
  * (C) Copyright 2012-2014
  *     Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
+#include <image.h>
 #include <mach/mon.h>
 asm(".arch_extension sec\n\t");
 
 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;
@@ -25,14 +27,29 @@ static int do_mon_install(cmd_tbl_t *cmdtp, int flag, int argc,
 
        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'",
           ""
 );