30ee7019ca
Fixes for stmhal USB mass storage, lwIP bindings and VFS regressions This release provides an important fix for the USB mass storage device in the stmhal port by implementing the SCSI SYNCHRONIZE_CACHE command, which is now require by some Operating Systems. There are also fixes for the lwIP bindings to improve non-blocking sockets and error codes. The VFS has some regressions fixed including the ability to statvfs the root. All changes are listed below. py core: - modbuiltins: add core-provided version of input() function - objstr: catch case of negative "maxsplit" arg to str.rsplit() - persistentcode: allow to compile with complex numbers disabled - objstr: allow to compile with obj-repr D, and unicode disabled - modsys: allow to compile with obj-repr D and PY_ATTRTUPLE disabled - provide mp_decode_uint_skip() to help reduce stack usage - makeqstrdefs.py: make script run correctly with Python 2.6 - objstringio: if created from immutable object, follow copy on write policy extmod: - modlwip: connect: for non-blocking mode, return EINPROGRESS - modlwip: fix error codes for duplicate calls to connect() - modlwip: accept: fix error code for non-blocking mode - vfs: allow to statvfs the root directory - vfs: allow "buffering" and "encoding" args to VFS's open() - modframebuf: fix signed/unsigned comparison pendantic warning lib: - libm: use isfinite instead of finitef, for C99 compatibility - utils/interrupt_char: remove support for KBD_EXCEPTION disabled tests: - basics/string_rsplit: add tests for negative "maxsplit" argument - float: convert "sys.exit()" to "raise SystemExit" - float/builtin_float_minmax: PEP8 fixes - basics: convert "sys.exit()" to "raise SystemExit" - convert remaining "sys.exit()" to "raise SystemExit" unix port: - convert to use core-provided version of built-in import() - Makefile: replace references to make with $(MAKE) windows port: - convert to use core-provided version of built-in import() qemu-arm port: - Makefile: adjust object-file lists to get correct dependencies - enable micropython.mem_*() functions to allow more tests stmhal port: - boards: enable DAC for NUCLEO_F767ZI board - add support for NUCLEO_F446RE board - pass USB handler as parameter to allow more than one USB handler - usb: use local USB handler variable in Start-of-Frame handler - usb: make state for USB device private to top-level USB driver - usbdev: for MSC implement SCSI SYNCHRONIZE_CACHE command - convert from using stmhal's input() to core provided version cc3200 port: - convert from using stmhal's input() to core provided version teensy port: - convert from using stmhal's input() to core provided version esp8266 port: - Makefile: replace references to make with $(MAKE) - Makefile: add clean-modules target - convert from using stmhal's input() to core provided version zephyr port: - modusocket: getaddrinfo: Fix mp_obj_len() usage - define MICROPY_PY_SYS_PLATFORM (to "zephyr") - machine_pin: use native Zephyr types for Zephyr API calls docs: - machine.Pin: remove out_value() method - machine.Pin: add on() and off() methods - esp8266: consistently replace Pin.high/low methods with .on/off - esp8266/quickref: polish Pin.on()/off() examples - network: move confusingly-named cc3200 Server class to its reference - uos: deconditionalize, remove minor port-specific details - uos: move cc3200 port legacy VFS mounting functions to its ref doc - machine: sort machine classes in logical order, not alphabetically - network: first step to describe standard network class interface examples: - embedding: use core-provided KeyboardInterrupt object
177 lines
5.8 KiB
Makefile
177 lines
5.8 KiB
Makefile
ifneq ($(MKENV_INCLUDED),1)
|
|
# We assume that mkenv is in the same directory as this file.
|
|
THIS_MAKEFILE = $(lastword $(MAKEFILE_LIST))
|
|
include $(dir $(THIS_MAKEFILE))mkenv.mk
|
|
endif
|
|
|
|
# This file expects that OBJ contains a list of all of the object files.
|
|
# The directory portion of each object file is used to locate the source
|
|
# and should not contain any ..'s but rather be relative to the top of the
|
|
# tree.
|
|
#
|
|
# So for example, py/map.c would have an object file name py/map.o
|
|
# The object files will go into the build directory and mantain the same
|
|
# directory structure as the source tree. So the final dependency will look
|
|
# like this:
|
|
#
|
|
# build/py/map.o: py/map.c
|
|
#
|
|
# We set vpath to point to the top of the tree so that the source files
|
|
# can be located. By following this scheme, it allows a single build rule
|
|
# to be used to compile all .c files.
|
|
|
|
vpath %.S . $(TOP)
|
|
$(BUILD)/%.o: %.S
|
|
$(STEPECHO) "CC $<"
|
|
$(Q)$(CC) $(CFLAGS) -c -o $@ $<
|
|
|
|
vpath %.s . $(TOP)
|
|
$(BUILD)/%.o: %.s
|
|
$(STEPECHO) "AS $<"
|
|
$(Q)$(AS) -o $@ $<
|
|
|
|
define compile_c
|
|
$(STEPECHO) "CC $<"
|
|
$(Q)$(CC) $(CFLAGS) -c -MD -o $@ $<
|
|
@# The following fixes the dependency file.
|
|
@# See http://make.paulandlesley.org/autodep.html for details.
|
|
@# Regex adjusted from the above to play better with Windows paths, etc.
|
|
@$(CP) $(@:.o=.d) $(@:.o=.P); \
|
|
$(SED) -e 's/#.*//' -e 's/^.*: *//' -e 's/ *\\$$//' \
|
|
-e '/^$$/ d' -e 's/$$/ :/' < $(@:.o=.d) >> $(@:.o=.P); \
|
|
$(RM) -f $(@:.o=.d)
|
|
endef
|
|
|
|
vpath %.c . $(TOP)
|
|
$(BUILD)/%.o: %.c
|
|
$(call compile_c)
|
|
|
|
# List all native flags since the current build system doesn't have
|
|
# the micropython configuration available. However, these flags are
|
|
# needed to extract all qstrings
|
|
QSTR_GEN_EXTRA_CFLAGS += -DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB -DN_ARM -DN_XTENSA
|
|
QSTR_GEN_EXTRA_CFLAGS += -I$(BUILD)/tmp
|
|
|
|
vpath %.c . $(TOP)
|
|
|
|
$(BUILD)/%.pp: %.c
|
|
$(STEPECHO) "PreProcess $<"
|
|
$(Q)$(CC) $(CFLAGS) -E -Wp,-C,-dD,-dI -o $@ $<
|
|
|
|
# The following rule uses | to create an order only prerequisite. Order only
|
|
# prerequisites only get built if they don't exist. They don't cause timestamp
|
|
# checking to be performed.
|
|
#
|
|
# We don't know which source files actually need the generated.h (since
|
|
# it is #included from str.h). The compiler generated dependencies will cause
|
|
# the right .o's to get recompiled if the generated.h file changes. Adding
|
|
# an order-only dependency to all of the .o's will cause the generated .h
|
|
# to get built before we try to compile any of them.
|
|
$(OBJ): | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/mpversion.h
|
|
|
|
$(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) | $(HEADER_BUILD)/mpversion.h
|
|
$(ECHO) "GEN $@"
|
|
$(Q)$(CPP) $(QSTR_GEN_EXTRA_CFLAGS) $(CFLAGS) $(if $?,$?,$^) >$(HEADER_BUILD)/qstr.i.last;
|
|
|
|
$(HEADER_BUILD)/qstr.split: $(HEADER_BUILD)/qstr.i.last
|
|
$(STEPECHO) "GEN $@"
|
|
$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py split $(HEADER_BUILD)/qstr.i.last $(HEADER_BUILD)/qstr $(QSTR_DEFS_COLLECTED)
|
|
$(Q)touch $@
|
|
|
|
$(QSTR_DEFS_COLLECTED): $(HEADER_BUILD)/qstr.split
|
|
$(STEPECHO) "GEN $@"
|
|
$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py cat $(HEADER_BUILD)/qstr.i.last $(HEADER_BUILD)/qstr $(QSTR_DEFS_COLLECTED)
|
|
|
|
# $(sort $(var)) removes duplicates
|
|
#
|
|
# The net effect of this, is it causes the objects to depend on the
|
|
# object directories (but only for existence), and the object directories
|
|
# will be created if they don't exist.
|
|
OBJ_DIRS = $(sort $(dir $(OBJ)))
|
|
$(OBJ): | $(OBJ_DIRS)
|
|
$(OBJ_DIRS):
|
|
$(Q)$(MKDIR) -p $@
|
|
|
|
$(HEADER_BUILD):
|
|
$(Q)$(MKDIR) -p $@
|
|
|
|
ifneq ($(FROZEN_DIR),)
|
|
$(BUILD)/frozen.c: $(wildcard $(FROZEN_DIR)/*) $(HEADER_BUILD) $(FROZEN_EXTRA_DEPS)
|
|
$(STEPECHO) "Generating $@"
|
|
$(Q)$(MAKE_FROZEN) $(FROZEN_DIR) > $@
|
|
endif
|
|
|
|
ifneq ($(FROZEN_MPY_DIR),)
|
|
# to build the MicroPython cross compiler
|
|
$(TOP)/mpy-cross/mpy-cross: $(TOP)/py/*.[ch] $(TOP)/mpy-cross/*.[ch] $(TOP)/windows/fmode.c
|
|
$(Q)$(MAKE) -C $(TOP)/mpy-cross
|
|
|
|
# make a list of all the .py files that need compiling and freezing
|
|
|
|
FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py' | $(SED) -e 's=^$(FROZEN_MPY_DIR)/==')
|
|
FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/frozen_mpy/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
|
|
|
|
# to build .mpy files from .py files
|
|
$(BUILD)/frozen_mpy/%.mpy: $(FROZEN_MPY_DIR)/%.py $(TOP)/mpy-cross/mpy-cross
|
|
@$(ECHO) "MPY $<"
|
|
$(Q)$(MKDIR) -p $(dir $@)
|
|
$(Q)$(MPY_CROSS) -o $@ -s $(<:$(FROZEN_MPY_DIR)/%=%) $(MPY_CROSS_FLAGS) $<
|
|
|
|
# to build frozen_mpy.c from all .mpy files
|
|
$(BUILD)/frozen_mpy.c: $(FROZEN_MPY_MPY_FILES) $(BUILD)/genhdr/qstrdefs.generated.h
|
|
$(STEPECHO) "Creating $@"
|
|
$(Q)$(PYTHON) $(MPY_TOOL) -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h $(FROZEN_MPY_MPY_FILES) > $@
|
|
endif
|
|
|
|
ifneq ($(PROG),)
|
|
# Build a standalone executable (unix does this)
|
|
|
|
all: $(PROG)
|
|
|
|
$(PROG): $(OBJ)
|
|
$(STEPECHO) "LINK $@"
|
|
# Do not pass COPT here - it's *C* compiler optimizations. For example,
|
|
# we may want to compile using Thumb, but link with non-Thumb libc.
|
|
$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)
|
|
ifndef DEBUG
|
|
$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $(PROG)
|
|
endif
|
|
$(Q)$(SIZE) $(PROG)
|
|
|
|
clean: clean-prog
|
|
clean-prog:
|
|
$(RM) -f $(PROG)
|
|
$(RM) -f $(PROG).map
|
|
|
|
.PHONY: clean-prog
|
|
endif
|
|
|
|
LIBMICROPYTHON = libmicropython.a
|
|
|
|
# We can execute extra commands after library creation using
|
|
# LIBMICROPYTHON_EXTRA_CMD. This may be needed e.g. to integrate
|
|
# with 3rd-party projects which don't have proper dependency
|
|
# tracking. Then LIBMICROPYTHON_EXTRA_CMD can e.g. touch some
|
|
# other file to cause needed effect, e.g. relinking with new lib.
|
|
lib $(LIBMICROPYTHON): $(OBJ)
|
|
$(AR) rcs $(LIBMICROPYTHON) $^
|
|
$(LIBMICROPYTHON_EXTRA_CMD)
|
|
|
|
clean:
|
|
$(RM) -rf $(BUILD) $(CLEAN_EXTRA)
|
|
.PHONY: clean
|
|
|
|
print-cfg:
|
|
$(ECHO) "PY_SRC = $(PY_SRC)"
|
|
$(ECHO) "BUILD = $(BUILD)"
|
|
$(ECHO) "OBJ = $(OBJ)"
|
|
.PHONY: print-cfg
|
|
|
|
print-def:
|
|
@$(ECHO) "The following defines are built into the $(CC) compiler"
|
|
touch __empty__.c
|
|
@$(CC) -E -Wp,-dM __empty__.c
|
|
@$(RM) -f __empty__.c
|
|
|
|
-include $(OBJ:.o=.P)
|