lwip streaming

extmod/modmachine.c

@@ -213,6 +213,9 @@ static const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_ADC_BLOCK
     { MP_ROM_QSTR(MP_QSTR_ADCBlock), MP_ROM_PTR(&machine_adc_block_type) },
     #endif
+    #if MICROPY_PY_MACHINE_CAN
+    { MP_ROM_QSTR(MP_QSTR_CAN), MP_ROM_PTR(&machine_can_type) },
+    #endif
     #if MICROPY_PY_MACHINE_DAC
     { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) },
     #endif

extmod/modmachine.h

@@ -203,6 +203,7 @@ extern const machine_mem_obj_t machine_mem32_obj;
 // is provided by a port.
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_adc_block_type;
+extern const mp_obj_type_t machine_can_type;
 extern const mp_obj_type_t machine_i2c_type;
 extern const mp_obj_type_t machine_i2c_target_type;
 extern const mp_obj_type_t machine_i2s_type;

extmod/modopenamp.c

@@ -422,6 +422,6 @@ const mp_obj_module_t openamp_module = {
 };
 
 MP_REGISTER_ROOT_POINTER(struct _virtio_dev_obj_t *virtio_device);
-MP_REGISTER_MODULE(MP_QSTR_openamp, openamp_module);
+MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_openamp, openamp_module);
 
 #endif // MICROPY_PY_OPENAMP

extmod/modtime.c

@@ -29,6 +29,7 @@
 #include "py/runtime.h"
 #include "py/smallint.h"
 #include "extmod/modtime.h"
+#include "py_clock.h"
 
 #if MICROPY_PY_TIME
 
@@ -219,6 +220,7 @@ static const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_time_ticks_cpu_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_time_ticks_add_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_time_ticks_diff_obj) },
+    { MP_ROM_QSTR(MP_QSTR_clock), MP_ROM_PTR(&py_clock_type) },
 
     #ifdef MICROPY_PY_TIME_EXTRA_GLOBALS
     MICROPY_PY_TIME_EXTRA_GLOBALS

lib/oofatfs/ff.h

@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#include FFCONF_H       /* FatFs configuration options */
+#include "ffconf.h"       /* FatFs configuration options */
 
 #if FF_DEFINED != FFCONF_DEF
 #error Wrong configuration file (ffconf.h).

lib/oofatfs/ffconf.h

@@ -56,7 +56,7 @@
 /   3: f_lseek() function is removed in addition to 2. */
 
 
-#define FF_USE_STRFUNC  0
+#define FF_USE_STRFUNC  1
 /* This option switches string functions, f_gets(), f_putc(), f_puts() and f_printf().
 /
 /  0: Disable string functions.

ports/alif/alif.mk

@@ -75,7 +75,7 @@ CFLAGS += $(INC) \
           --specs=nosys.specs \
           -D$(MCU_CORE)=1 \
           -DCORE_$(MCU_CORE) \
-          -DALIF_CMSIS_H="\"$(MCU_CORE).h\""
+          -DALIF_CMSIS_H='<system_utils.h>'
 
 ifeq ($(MICROPY_FLOAT_IMPL),float)
 CFLAGS += -fsingle-precision-constant

ports/alif/boards/OPENMV_AE3/board.ld.S

@@ -3,8 +3,8 @@
 /* Define ROMFS partition locations. */
 #if CORE_M55_HP
 /* The HP core has access to the external OSPI flash and MRAM ROMFS partitions. */
-_micropy_hw_romfs_part0_start = 0xa1000000;
-_micropy_hw_romfs_part0_size = 16M;
+_micropy_hw_romfs_part0_start = 0xa0800000;
+_micropy_hw_romfs_part0_size = 24M;
 _micropy_hw_romfs_part1_start = ORIGIN(MRAM_FS);
 _micropy_hw_romfs_part1_size = LENGTH(MRAM_FS);
 #else

ports/alif/boards/OPENMV_AE3/mpconfigboard.h

@@ -67,8 +67,8 @@ extern void board_exit_standby(void);
 // This is used for alif.Flash() and USB MSC.
 #define MICROPY_HW_FLASH_STORAGE_BASE_ADDR      (0)
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (32 * 1024 * 1024)
-#define MICROPY_HW_FLASH_STORAGE_FS_BYTES       (16 * 1024 * 1024)
-#define MICROPY_HW_FLASH_STORAGE_ROMFS_BYTES    (16 * 1024 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_FS_BYTES       (8 * 1024 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_ROMFS_BYTES    (24 * 1024 * 1024)
 
 // Murata 1YN configuration
 #define CYW43_CHIPSET_FIRMWARE_INCLUDE_FILE     "lib/cyw43-driver/firmware/w43439_sdio_1yn_7_95_59_combined.h"

ports/alif/boards/OPENMV_AE3/pins.csv

@@ -55,6 +55,10 @@ P6,P7_2
 P7,P7_3
 P8,P1_2
 P9,P1_3
+P10,P4_4
+P11,P4_7
+P13,P4_5
+P14,P4_6
 
 # UART buses
 UART1_TX,P0_5

ports/mimxrt/Makefile

@@ -53,7 +53,7 @@ include $(TOP)/extmod/extmod.mk
 
 # Set SDK directory based on MCU_SERIES
 MCUX_SDK_DIR = lib/nxp_driver/sdk
-MCU_DIR = $(MCUX_SDK_DIR)/devices/$(MCU_SERIES)
+MCU_DIR ?= $(MCUX_SDK_DIR)/devices/$(MCU_SERIES)
 
 # Select linker scripts based on MCU_SERIES
 LD_FILES = boards/$(MCU_SERIES).ld boards/common.ld
@@ -181,6 +181,10 @@ SRC_HAL_IMX_C += $(MCUX_SDK_DIR)/drivers/usdhc/fsl_usdhc.c
 INC_HAL_IMX += -I$(TOP)/$(MCUX_SDK_DIR)/drivers/usdhc
 endif
 
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064 MIMXRT1176))
+SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_flexcan.c
+endif
+
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1015 MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064 MIMXRT1176))
 SRC_HAL_IMX_C += \
 	$(MCUX_SDK_DIR)/drivers/qtmr_1/fsl_qtmr.c \
@@ -243,18 +247,17 @@ SRC_C += \
 	eth.c \
 	fatfs_port.c \
 	flash.c \
-	hal/fsl_lpuart.c \
 	hal/pwm_backport.c \
 	help.c \
 	led.c \
 	machine_bitstream.c \
+	machine_can.c \
 	machine_i2c.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_sdcard.c \
 	machine_spi.c \
-	main.c \
 	mbedtls/mbedtls_port.c \
 	mimxrt_flash.c \
 	mimxrt_sdram.c \
@@ -360,8 +363,8 @@ else
 endif
 
 # Reset variables
-SUPPORTS_HARDWARE_FP_SINGLE = 0
-SUPPORTS_HARDWARE_FP_DOUBLE = 0
+SUPPORTS_HARDWARE_FP_SINGLE ?= 0
+SUPPORTS_HARDWARE_FP_DOUBLE ?= 0
 
 # Assembly source files
 SRC_SS = \
@@ -406,6 +409,7 @@ CFLAGS += \
 	-DBOARD_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
 	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT1XXX \
 	-DCFG_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED \
+	-DCFG_TUD_TASK_QUEUE_SZ=128 \
 	-DCLOCK_CONFIG_H='<boards/$(MCU_SERIES)_clock_config.h>' \
 	-DCPU_$(MCU_SERIES)$(MCU_CORE) \
 	-DCPU_$(MCU_VARIANT) \
@@ -423,11 +427,10 @@ CFLAGS += \
 	-mthumb \
 	-mtune=cortex-m7 \
 	-nostdlib \
-	-std=c99 \
+	-std=gnu99 \
 	-Wall \
 	-Wdouble-promotion \
 	-Werror \
-	-Wfloat-conversion \
 	-Wno-error=unused-parameter
 
 # Configure respective board flash type
@@ -446,7 +449,7 @@ ifeq ($(MICROPY_FLOAT_IMPL),single)
     CFLAGS += \
         -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT \
         -fsingle-precision-constant \
-        -mfloat-abi=softfp \
+        -mfloat-abi=hard \
         -mfpu=fpv5-sp-d16
 else ifeq ($(MICROPY_FLOAT_IMPL),double)
     CFLAGS += \
@@ -463,12 +466,13 @@ endif
 
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
 ifeq ($(MICROPY_PY_LWIP),1)
-CFLAGS += \
-	-DFSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE=1
+ifeq ($(MICROPY_PY_NETWORK_PHYKSZ8081RND),0)
+CFLAGS += -DFSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE=1
+endif
 endif
 
 ifdef MICROPY_HW_FLASH_CLK
-	CFLAGS += -DMICROPY_HW_FLASH_CLK=$(MICROPY_HW_FLASH_CLK)
+CFLAGS += -DMICROPY_HW_FLASH_CLK=$(MICROPY_HW_FLASH_CLK)
 endif
 ifdef MICROPY_HW_FLASH_QE_CMD
 	CFLAGS += -DMICROPY_HW_FLASH_QE_CMD=$(MICROPY_HW_FLASH_QE_CMD)
@@ -494,9 +498,10 @@ LDFLAGS += \
 # LDDEFINES are used for link time adaptation of linker scripts, utilizing
 #	the C preprocessor. Therefore keep LDDEFINES separated from LDFLAGS!
 
-LDDEFINES = \
+LDDEFINES += \
 	-DMICROPY_HW_FLASH_BASE=$(MICROPY_HW_FLASH_BASE) \
-	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE)
+	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
+	-DMICROPY_HW_ROMFS_BYTES=$(MICROPY_HW_ROMFS_BYTES)
 
 ifdef MICROPY_HW_FLASH_RESERVED
 LDDEFINES += -DMICROPY_HW_FLASH_RESERVED=$(MICROPY_HW_FLASH_RESERVED)
@@ -534,11 +539,7 @@ $(BUILD)/lib/tinyusb/src/device/usbd.o: CFLAGS += -Wno-missing-braces
 # Build targets
 # =============================================================================
 
-ifeq ($(USE_UF2_BOOTLOADER),1)
-all: $(BUILD)/firmware.hex $(BUILD)/firmware.bin $(BUILD)/firmware.uf2
-else
-all: $(BUILD)/firmware.hex $(BUILD)/firmware.bin
-endif
+all: $(OBJ)
 
 # Process linker scripts with C preprocessor to exchange LDDEFINES and
 #	aggregate output of preprocessor in a single linker script `link.ld`
@@ -572,15 +573,15 @@ $(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
 
 $(GEN_FLEXRAM_CONFIG_SRC): $(HEADER_BUILD)
 	$(ECHO) "Create $@"
-	$(Q)$(PYTHON) $(MAKE_FLEXRAM_LD) -d $(TOP)/$(MCU_DIR)/$(MCU_SERIES)$(MCU_CORE).h \
-		-f $(TOP)/$(MCU_DIR)/$(MCU_SERIES)$(MCU_CORE)_features.h -l boards/$(MCU_SERIES).ld -c $(MCU_SERIES) > $@
+	$(Q)$(PYTHON) $(MAKE_FLEXRAM_LD) -d $(CMSIS_DIR)/include/mimxrt/$(MCU_SERIES)$(MCU_CORE).h \
+		-f $(MCU_DIR)/$(MCU_SERIES)$(MCU_CORE)_features.h -l boards/$(MCU_SERIES).ld -c $(MCU_SERIES) > $(GEN_FLEXRAM_CONFIG_SRC)
 
 # Use a pattern rule here so that make will only call make-pins.py once to make
 # both pins_gen.c and pins.h
 $(BUILD)/%_gen.c $(HEADER_BUILD)/%.h: $(BOARD_PINS) $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
 	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) \
-	    --prefix $(PREFIX_FILE) --iomux "$(abspath $(TOP)/$(MCU_DIR)/drivers/fsl_iomuxc.h)" \
+	    --prefix $(PREFIX_FILE) --iomux $(abspath $(MCU_DIR)/drivers/fsl_iomuxc.h) \
 	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR)
 
 include $(TOP)/py/mkrules.mk

ports/mimxrt/README.md

@@ -8,6 +8,7 @@ MIMXRT1064_EVK boards.
 Features:
   - REPL over USB VCP
   - machine.ADC
+  - machine.CAN
   - machine.I2C
   - machine.LED
   - machine.Pin
@@ -27,7 +28,7 @@ Features:
 Known issues:
 
 TODO:
-  - More peripherals (Counter, I2S, CAN, etc)
+  - More peripherals (Counter, I2S, etc)
   - More Python options
 
 ## Build Instructions

ports/mimxrt/boards/MIMXRT1011.ld

@@ -18,8 +18,10 @@ interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
 text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00100000;
-text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
+vfsrom_start        = ((vfs_start) - MICROPY_HW_ROMFS_BYTES);
+vfsrom_end          = ((vfsrom_start) + MICROPY_HW_ROMFS_BYTES);
+text_size           = ((vfsrom_start) - (text_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00008000;
 dtcm_start          = 0x20000000;

ports/mimxrt/boards/MIMXRT1015.ld

@@ -18,8 +18,10 @@ interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
 text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00100000;
-text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
+vfsrom_start        = ((vfs_start) - MICROPY_HW_ROMFS_BYTES);
+vfsrom_end          = ((vfsrom_start) + MICROPY_HW_ROMFS_BYTES);
+text_size           = ((vfsrom_start) - (text_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00008000;
 dtcm_start          = 0x20000000;

ports/mimxrt/boards/MIMXRT1021.ld

@@ -18,8 +18,10 @@ interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
 text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00100000;
-text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
+vfsrom_start        = ((vfs_start) - MICROPY_HW_ROMFS_BYTES);
+vfsrom_end          = ((vfsrom_start) + MICROPY_HW_ROMFS_BYTES);
+text_size           = ((vfsrom_start) - (text_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00010000;
 dtcm_start          = 0x20000000;

ports/mimxrt/boards/MIMXRT1052.ld

@@ -20,8 +20,10 @@ interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
 text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00200000;
-text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
+vfsrom_start        = ((vfs_start) - MICROPY_HW_ROMFS_BYTES);
+vfsrom_end          = ((vfsrom_start) + MICROPY_HW_ROMFS_BYTES);
+text_size           = ((vfsrom_start) - (text_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00020000;
 dtcm_start          = 0x20000000;

ports/mimxrt/boards/MIMXRT1062.ld

@@ -20,8 +20,10 @@ interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
 text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00100000;
-text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
+vfsrom_start        = ((vfs_start) - MICROPY_HW_ROMFS_BYTES);
+vfsrom_end          = ((vfsrom_start) + MICROPY_HW_ROMFS_BYTES);
+text_size           = ((vfsrom_start) - (text_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00020000;
 dtcm_start          = 0x20000000;

ports/mimxrt/boards/MIMXRT1064.ld

@@ -14,8 +14,10 @@ interrupts_start    = flash_start + 0x0000C000;
 interrupts_size     = 0x00000400;
 text_start          = flash_start + 0x0000C400;
 vfs_start           = flash_start + 0x00100000;
-text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
+vfsrom_start        = ((vfs_start) - MICROPY_HW_ROMFS_BYTES);
+vfsrom_end          = ((vfsrom_start) + MICROPY_HW_ROMFS_BYTES);
+text_size           = ((vfsrom_start) - (text_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00020000;
 dtcm_start          = 0x20000000;

ports/mimxrt/boards/MIMXRT1176.ld

@@ -30,8 +30,10 @@ m_core1_image_start = vfs_start - 0x00040000;
 m_core1_image_size  = 0x00040000;
 #endif
 
-text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
+vfsrom_start        = ((vfs_start) - MICROPY_HW_ROMFS_BYTES);
+vfsrom_end          = ((vfsrom_start) + MICROPY_HW_ROMFS_BYTES);
+text_size           = ((vfsrom_start) - (text_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00020000;
 dtcm_start          = 0x20000000;

ports/mimxrt/boards/OPENMV_RT1060/manifest.py

@@ -0,0 +1,3 @@
+include("../manifest.py")
+
+require("bundle-networking")