RT1020 and RT1060 OTA

Makefile

@@ -177,13 +177,12 @@ mongoose.c: Makefile $(wildcard src/*.c) $(wildcard src/drivers/*.c)
 	(cat src/license.h; echo; echo '#include "mongoose.h"' ; (for F in src/*.c src/drivers/*.c ; do echo; echo '#ifdef MG_ENABLE_LINES'; echo "#line 1 \"$$F\""; echo '#endif'; cat $$F | sed -e 's,#include ".*,,'; done))> $@
 
 mongoose.h: $(HDRS) Makefile
-	(cat src/license.h; echo; echo '#ifndef MONGOOSE_H'; echo '#define MONGOOSE_H'; echo; cat src/version.h ; echo; echo '#ifdef __cplusplus'; echo 'extern "C" {'; echo '#endif'; cat src/arch.h src/arch_*.h src/net_ft.h src/net_lwip.h src/net_rl.h src/config.h src/str.h src/queue.h src/fmt.h src/printf.h src/log.h src/timer.h src/fs.h src/util.h src/url.h src/iobuf.h src/base64.h src/md5.h src/sha1.h src/sha256.h src/tls_aes128.h src/tls_uecc.h src/event.h src/net.h src/http.h src/ssi.h src/tls.h src/tls_mbed.h src/tls_openssl.h src/ws.h src/sntp.h src/mqtt.h src/dns.h src/json.h src/rpc.h src/ota.h src/device.h src/net_builtin.h src/profile.h src/drivers/*.h | sed -e '/keep/! s,#include ".*,,' -e 's,^#pragma once,,'; echo; echo '#ifdef __cplusplus'; echo '}'; echo '#endif'; echo '#endif  // MONGOOSE_H')> $@
+	(cat src/license.h; echo; echo '#ifndef MONGOOSE_H'; echo '#define MONGOOSE_H'; echo; cat src/version.h ; echo; echo '#ifdef __cplusplus'; echo 'extern "C" {'; echo '#endif'; cat src/arch.h src/arch_*.h src/net_ft.h src/net_lwip.h src/net_rl.h src/config.h src/str.h src/queue.h src/fmt.h src/printf.h src/log.h src/timer.h src/fs.h src/util.h src/url.h src/iobuf.h src/base64.h src/md5.h src/sha1.h src/sha256.h src/tls_aes128.h src/tls_uecc.h src/event.h src/net.h src/http.h src/ssi.h src/tls.h src/tls_mbed.h src/tls_openssl.h src/ws.h src/sntp.h src/mqtt.h src/dns.h src/json.h src/rpc.h src/ota.h src/device.h src/device_imxrt_flexspi.h src/net_builtin.h src/profile.h src/drivers/*.h | sed -e '/keep/! s,#include ".*,,' -e 's,^#pragma once,,'; echo; echo '#ifdef __cplusplus'; echo '}'; echo '#endif'; echo '#endif  // MONGOOSE_H')> $@
 
 
 clean: clean_examples clean_embedded
 	rm -rf $(PROG) *.exe *.o *.dSYM *_test* ut fuzzer *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb slow-unit* _CL_* infer-out data.txt crash-* test/packed_fs.c pack
 	#find examples -maxdepth 3 -name zephyr -prune -o -name Makefile -print | xargs dirname | xargs -n1 make clean -C
 
 clean_embedded:
-	for X in $(EXAMPLES_EMBEDDED); do test -f $$X/Makefile || continue; $(MAKE) -C $$X clean || exit 1; done
-
+	for X in $(EXAMPLES_EMBEDDED); do test -f $$X/Makefile || continue; $(MAKE) -C $$X clean || exit 1; done

examples/nxp/rt1020-evk-make-baremetal-builtin/Makefile

@@ -3,15 +3,15 @@ CFLAGS += -Wformat-truncation -fno-common -Wconversion -Wno-sign-conversion
 CFLAGS += -g3 -Os -ffunction-sections -fdata-sections
 CFLAGS += -I. -Icmsis_core/CMSIS/Core/Include -Icmsis_mcu/devices/MIMXRT1021 #-DCPU_MIMXRT1021DAG5A
 CFLAGS += -mcpu=cortex-m7 -mthumb -mfloat-abi=hard -mfpu=fpv5-d16 $(CFLAGS_EXTRA)
-LDSCRIPT = link_ram.ld
-LDFLAGS ?= -T$(LDSCRIPT) -nostdlib -nostartfiles --specs nano.specs -lc -lgcc -Wl,--gc-sections -Wl,-Map=$@.map 
+LDSCRIPT = link.ld
+LDFLAGS ?= -T$(LDSCRIPT) -nostdlib -nostartfiles --specs nano.specs -lc -lgcc -Wl,--gc-sections -Wl,-Map=$@.map
 
 SOURCES = main.c syscalls.c sysinit.c
 SOURCES += cmsis_mcu/devices/MIMXRT1021/gcc/startup_MIMXRT1021.S # NXP startup file. Compiler-dependent!
 CFLAGS += -D__ATOLLIC__ -D__STARTUP_CLEAR_BSS	# Make startup code work as expected
 
 # Mongoose options are defined in mongoose_custom.h
-SOURCES += mongoose.c
+SOURCES += mongoose.c flash_image.c net.c packed_fs.c
 
 # Example specific build options. See README.md
 CFLAGS += -DHTTP_URL=\"http://0.0.0.0/\" -DHTTPS_URL=\"https://0.0.0.0/\"
@@ -24,11 +24,6 @@ endif
 
 all build example: firmware.bin
 
-image: LDSCRIPT = link.ld
-image: SOURCES += flash_image.c net.c packed_fs.c # no room to run dashboard in RAM w/ default config
-image: CFLAGS += -DRUNINFLASH
-image: firmware.bin
-
 firmware.bin: firmware.elf
 	arm-none-eabi-objcopy -O binary $< $@
 
@@ -71,7 +66,7 @@ test: update
 	curl --fail-with-body -su :$(VCON_API_KEY) $(DEVICE_URL)/tx?t=5 | tee /tmp/output.txt
 	grep 'READY, IP:' /tmp/output.txt       # Check for network init
 
-testimage: image
+testimage: firmware.bin
 
 clean:
 	$(RM) firmware.* *.su cmsis_core cmsis_mcu mbedtls *.zip

examples/nxp/rt1020-evk-make-baremetal-builtin/flash_image.c

@@ -1,6 +1,6 @@
 #include "dcd.h"      // pin settings for MIMXRT1020-EVK board
-#include "flexspi.h"  // peripheral structures
 #include "hal.h"
+#include "flexspi.h"  // peripheral structures
 
 extern uint32_t __isr_vector[];
 

examples/nxp/rt1020-evk-make-baremetal-builtin/link.ld

@@ -2,21 +2,23 @@ ENTRY(Reset_Handler);
 MEMORY {
   flash_hdr(rx)  : ORIGIN = 0x60000000, LENGTH = 8k
   flash_irq(rx)  : ORIGIN = 0x60002000, LENGTH = 1k
-  flash_code(rx) : ORIGIN = 0x60002400, LENGTH = 8183k
+  flash_code(rx) : ORIGIN = 0x60002400, LENGTH = 8179k
 
   itcram(rx)     : ORIGIN = 0x00000000, LENGTH = 64k
   dtcram(rw)     : ORIGIN = 0x20000000, LENGTH = 64k 
   ocram(rw)      : ORIGIN = 0x20200000, LENGTH = 128k 
 }
 __StackTop = ORIGIN(dtcram) + LENGTH(dtcram);
 
+/* TODO(): separate itcram and go back to using dtcram for data and bss when ota is finished */
+
 SECTIONS {
   .hdr  : { FILL(0xff) ; KEEP(*(.cfg)) . = 0x1000 ; KEEP(*(.ivt)) . = 0x1020 ;
             KEEP(*(.dat)) . = 0x1030 ; KEEP(*(.dcd)) . = 0x2000 ;} >flash_hdr
   .irq  : { KEEP(*(.isr_vector)) }  > flash_irq
   .text : { *(.text* .text.*) *(.rodata*) ; } > flash_code
-  .data : { __data_start__ = .; *(.data SORT(.data.*)) __data_end__ = .; } > dtcram AT > flash_code
+  .data : { __data_start__ = .; *(.data SORT(.data.*)) *(.iram) __data_end__ = .; } > itcram AT > flash_code
   __etext = LOADADDR(.data);
-  .bss  : { __bss_start__ = .; *(.bss SORT(.bss.*) COMMON) __bss_end__ = .; } > dtcram
+  .bss  : { __bss_start__ = .; *(.bss SORT(.bss.*) COMMON) __bss_end__ = .; } > itcram
   _end = .;
 }

examples/nxp/rt1020-evk-make-baremetal-builtin/main.c

@@ -31,31 +31,6 @@ static void timer_fn(void *arg) {
            ifp->ndrop, ifp->nerr));
 }
 
-#ifndef RUNINFLASH
-static void fn(struct mg_connection *c, int ev, void *ev_data) {
-  struct mg_tcpip_if *ifp = (struct mg_tcpip_if *) c->fn_data;
-  if (ev == MG_EV_HTTP_MSG) {
-    struct mg_http_message *hm = (struct mg_http_message *) ev_data;
-    if (mg_http_match_uri(hm, "/api/hello")) {  // Request to /api/hello
-      mg_http_reply(c, 200, "", "{%m:%u,%m:%u,%m:%u,%m:%u,%m:%u}\n",
-                    MG_ESC("eth"), ifp->state, MG_ESC("frames_received"),
-                    ifp->nrecv, MG_ESC("frames_sent"), ifp->nsent,
-                    MG_ESC("frames_dropped"), ifp->ndrop,
-                    MG_ESC("interface_errors"), ifp->nerr);
-    } else if (mg_http_match_uri(hm, "/")) {  // Index page
-      mg_http_reply(
-          c, 200, "", "%s",
-          "<html><head><link rel='icon' href='data:;base64,='></head><body>"
-          "<h1>Welcome to Mongoose</h1>"
-          "See <a href=/api/hello>/api/hello</a> for REST example"
-          "</body></html>");
-    } else {  // All other URIs
-      mg_http_reply(c, 404, "", "Not Found\n");
-    }
-  }
-}
-#endif
-
 int main(void) {
   gpio_output(LED);               // Setup blue LED
   uart_init(UART_DEBUG, 115200);  // Initialise debug printf
@@ -84,16 +59,12 @@ int main(void) {
   }
 
   MG_INFO(("Initialising application..."));
-#ifdef RUNINFLASH
   web_init(&mgr);
-#else
-  mg_http_listen(&mgr, "http://0.0.0.0:80", fn, &mif);
-#endif
 
   MG_INFO(("Starting event loop"));
   for (;;) {
     mg_mgr_poll(&mgr, 0);
   }
 
   return 0;
-}
+}

examples/nxp/rt1020-evk-make-baremetal-builtin/mongoose_custom.h

@@ -2,6 +2,8 @@
 
 // See https://mongoose.ws/documentation/#build-options
 #define MG_ARCH MG_ARCH_NEWLIB
+#define MG_OTA MG_OTA_FLASH
+#define MG_DEVICE MG_DEVICE_RT1020
 
 #define MG_ENABLE_TCPIP 1
 #define MG_ENABLE_DRIVER_IMXRT 1

examples/nxp/rt1060-evk-make-baremetal-builtin/link.ld

@@ -2,21 +2,23 @@ ENTRY(Reset_Handler);
 MEMORY {
   flash_hdr(rx)  : ORIGIN = 0x60000000, LENGTH = 8k
   flash_irq(rx)  : ORIGIN = 0x60002000, LENGTH = 1k
-  flash_code(rx) : ORIGIN = 0x60002400, LENGTH = 8183k
+  flash_code(rx) : ORIGIN = 0x60002400, LENGTH = 8179k
 
   itcram(rx)       : ORIGIN = 0x00000000, LENGTH = 128k
   dtcram(rw)       : ORIGIN = 0x20000000, LENGTH = 128k
   ocram(rw)        : ORIGIN = 0x20200000, LENGTH = 256k   /* Is this cached ? */
 }
 __StackTop = ORIGIN(dtcram) + LENGTH(dtcram);
 
+/* TODO(): separate itcram and go back to using dtcram for data and bss when ota is finished */
+
 SECTIONS {
   .hdr  : { FILL(0xff) ; KEEP(*(.cfg)) . = 0x1000 ; KEEP(*(.ivt)) . = 0x1020 ;
             KEEP(*(.dat)) . = 0x1030 ; KEEP(*(.dcd)) . = 0x2000 ;} >flash_hdr
   .irq  : { KEEP(*(.isr_vector)) }  > flash_irq
   .text : { *(.text* .text.*) *(.rodata*) ; } > flash_code
-  .data : { __data_start__ = .; *(.data SORT(.data.*)) __data_end__ = .; } > dtcram AT > flash_code
+  .data : { __data_start__ = .; *(.data SORT(.data.*)) *(.iram) __data_end__ = .; } > itcram AT > flash_code
   __etext = LOADADDR(.data);
-  .bss  : { __bss_start__ = .; *(.bss SORT(.bss.*) COMMON) __bss_end__ = .; } > dtcram
+  .bss  : { __bss_start__ = .; *(.bss SORT(.bss.*) COMMON) __bss_end__ = .; } > itcram
   _end = .;
 }

examples/nxp/rt1060-evk-make-baremetal-builtin/mongoose_custom.h

@@ -2,6 +2,8 @@
 
 // See https://mongoose.ws/documentation/#build-options
 #define MG_ARCH MG_ARCH_NEWLIB
+#define MG_OTA MG_OTA_FLASH
+#define MG_DEVICE MG_DEVICE_RT1060
 
 #define MG_ENABLE_TCPIP 1
 #define MG_ENABLE_DRIVER_IMXRT 1