Azure CI: Save pytest output automatically

[J-u-boot.git] / cmd / load.c

diff --git a/cmd/load.c b/cmd/load.c
index 249ebd4ae078a267848bfcf54c0a881eae31fc48..5c4f34781d452e83448ed8f35142e860c157f4bc 100644 (file)
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -14,8 +14,11 @@
 #include <efi_loader.h>
 #include <env.h>
 #include <exports.h>
+#ifdef CONFIG_MTD_NOR_FLASH
 #include <flash.h>
+#endif
 #include <image.h>
+#include <lmb.h>
 #include <mapmem.h>
 #include <net.h>
 #include <s_record.h>
@@ -80,6 +83,7 @@ static int do_load_serial(struct cmd_tbl *cmdtp, int flag, int argc,
                printf("## Switch baudrate to %d bps and press ENTER ...\n",
                        load_baudrate);
                udelay(50000);
+               flush();
                gd->baudrate = load_baudrate;
                serial_setbrg();
                udelay(50000);
@@ -123,6 +127,7 @@ static int do_load_serial(struct cmd_tbl *cmdtp, int flag, int argc,
                printf("## Switch baudrate to %d bps and press ESC ...\n",
                        current_baudrate);
                udelay(50000);
+               flush();
                gd->baudrate = current_baudrate;
                serial_setbrg();
                udelay(50000);
@@ -137,6 +142,7 @@ static int do_load_serial(struct cmd_tbl *cmdtp, int flag, int argc,
 
 static ulong load_serial(long offset)
 {
+       struct lmb lmb;
        char    record[SREC_MAXRECLEN + 1];     /* buffer for one S-Record      */
        char    binbuf[SREC_MAXBINLEN];         /* buffer for binary data       */
        int     binlen;                         /* no. of data bytes in S-Rec.  */
@@ -147,6 +153,9 @@ static ulong load_serial(long offset)
        ulong   start_addr = ~0;
        ulong   end_addr   =  0;
        int     line_count =  0;
+       long ret;
+
+       lmb_init_and_reserve(&lmb, gd->bd, (void *)gd->fdt_blob);
 
        while (read_record(record, SREC_MAXRECLEN + 1) >= 0) {
                type = srec_decode(record, &binlen, &addr, binbuf);
@@ -172,7 +181,14 @@ static ulong load_serial(long offset)
                    } else
 #endif
                    {
+                       ret = lmb_reserve(&lmb, store_addr, binlen);
+                       if (ret) {
+                               printf("\nCannot overwrite reserved area (%08lx..%08lx)\n",
+                                       store_addr, store_addr + binlen);
+                               return ret;
+                       }
                        memcpy((char *)(store_addr), binbuf, binlen);
+                       lmb_free(&lmb, store_addr, binlen);
                    }
                    if ((store_addr) < start_addr)
                        start_addr = store_addr;
@@ -303,6 +319,7 @@ int do_save_serial(struct cmd_tbl *cmdtp, int flag, int argc,
                printf("## Switch baudrate to %d bps and press ESC ...\n",
                        (int)current_baudrate);
                udelay(50000);
+               flush();
                gd->baudrate = current_baudrate;
                serial_setbrg();
                udelay(50000);
@@ -457,6 +474,7 @@ static int do_load_serial_bin(struct cmd_tbl *cmdtp, int flag, int argc,
                printf("## Switch baudrate to %d bps and press ENTER ...\n",
                        load_baudrate);
                udelay(50000);
+               flush();
                gd->baudrate = load_baudrate;
                serial_setbrg();
                udelay(50000);
@@ -519,6 +537,7 @@ static int do_load_serial_bin(struct cmd_tbl *cmdtp, int flag, int argc,
                printf("## Switch baudrate to %d bps and press ESC ...\n",
                        current_baudrate);
                udelay(50000);
+               flush();
                gd->baudrate = current_baudrate;
                serial_setbrg();
                udelay(50000);
@@ -1051,6 +1070,44 @@ static ulong load_serial_ymodem(ulong offset, int mode)
 
 #endif
 
+#if defined(CONFIG_CMD_LOADM)
+static int do_load_memory_bin(struct cmd_tbl *cmdtp, int flag, int argc,
+                             char *const argv[])
+{
+       ulong   addr, dest, size;
+       void    *src, *dst;
+
+       if (argc != 4)
+               return CMD_RET_USAGE;
+
+       addr = simple_strtoul(argv[1], NULL, 16);
+
+       dest = simple_strtoul(argv[2], NULL, 16);
+
+       size = simple_strtoul(argv[3], NULL, 16);
+
+       if (!size) {
+               printf("loadm: can not load zero bytes\n");
+               return 1;
+       }
+
+       src = map_sysmem(addr, size);
+       dst = map_sysmem(dest, size);
+
+       memcpy(dst, src, size);
+
+       unmap_sysmem(src);
+       unmap_sysmem(dst);
+
+       if (IS_ENABLED(CONFIG_CMD_BOOTEFI))
+               efi_set_bootdev("Mem", "", "", map_sysmem(dest, 0), size);
+
+       printf("loaded bin to memory: size: %lu\n", size);
+
+       return 0;
+}
+#endif
+
 /* -------------------------------------------------------------------- */
 
 #if defined(CONFIG_CMD_LOADS)
@@ -1125,3 +1182,13 @@ U_BOOT_CMD(
 );
 
 #endif /* CONFIG_CMD_LOADB */
+
+#if defined(CONFIG_CMD_LOADM)
+U_BOOT_CMD(
+       loadm, 4, 0,    do_load_memory_bin,
+       "load binary blob from source address to destination address",
+       "[src_addr] [dst_addr] [size]\n"
+       "     - load a binary blob from one memory location to other"
+       " from src_addr to dst_addr by size bytes"
+);
+#endif /* CONFIG_CMD_LOADM */