Sync from Upstream

2019-03-15 21:17:07 +01:00
parent ea53e1f981
commit 6a52b6074f
161 changed files with 2002 additions and 1463 deletions
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -245,7 +245,7 @@ int CmdFlashMemLoad(const char *Cmd) {
            break;
        default:

-            res = loadFile(filename, "bin", data, &datalen);
+            res = loadFile(filename, "bin", data, FLASH_MEM_MAX_SIZE, &datalen);
            //int res = loadFileEML( filename, "eml", data, &datalen);
            if (res) {
                free(data);