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
397 lines
11 KiB
Makefile
397 lines
11 KiB
Makefile
# Select the board to build for: if not given on the command line,
|
|
# then default to PYBV10.
|
|
BOARD ?= PYBV10
|
|
ifeq ($(wildcard boards/$(BOARD)/.),)
|
|
$(error Invalid BOARD specified)
|
|
endif
|
|
|
|
# If the build directory is not given, make it reflect the board name.
|
|
BUILD ?= build-$(BOARD)
|
|
|
|
include ../py/mkenv.mk
|
|
-include mpconfigport.mk
|
|
include boards/$(BOARD)/mpconfigboard.mk
|
|
|
|
# qstr definitions (must come before including py.mk)
|
|
QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h $(BUILD)/modstm_qstr.h
|
|
|
|
# directory containing scripts to be frozen as bytecode
|
|
FROZEN_MPY_DIR ?= modules
|
|
|
|
# include py core make definitions
|
|
include ../py/py.mk
|
|
|
|
LD_DIR=boards
|
|
CMSIS_DIR=cmsis
|
|
HAL_DIR=hal/$(MCU_SERIES)
|
|
USBDEV_DIR=usbdev
|
|
#USBHOST_DIR=usbhost
|
|
FATFS_DIR=lib/oofatfs
|
|
DFU=../tools/dfu.py
|
|
# may need to prefix dfu-util with sudo
|
|
USE_PYDFU ?= 1
|
|
PYDFU ?= ../tools/pydfu.py
|
|
DFU_UTIL ?= dfu-util
|
|
DEVICE=0483:df11
|
|
STFLASH ?= st-flash
|
|
OPENOCD ?= openocd
|
|
OPENOCD_CONFIG ?= boards/openocd_stm32f4.cfg
|
|
|
|
CROSS_COMPILE = arm-none-eabi-
|
|
|
|
INC += -I.
|
|
INC += -I..
|
|
INC += -I$(BUILD)
|
|
INC += -I../lib/cmsis/inc
|
|
INC += -I$(CMSIS_DIR)/
|
|
INC += -I$(HAL_DIR)/inc
|
|
INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/inc
|
|
#INC += -I$(USBHOST_DIR)
|
|
|
|
CFLAGS_CORTEX_M = -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
|
|
CFLAGS_MCU_f4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 -DMCU_SERIES_F4
|
|
CFLAGS_MCU_f7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7 -DMCU_SERIES_F7
|
|
CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 -DMCU_SERIES_L4
|
|
|
|
CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib $(CFLAGS_MOD)
|
|
CFLAGS += -D$(CMSIS_MCU)
|
|
CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
|
|
CFLAGS += $(COPT)
|
|
CFLAGS += -Iboards/$(BOARD)
|
|
CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES)xx_hal.h>'
|
|
|
|
LDFLAGS = -nostdlib -L $(LD_DIR) -T $(LD_FILE) -Map=$(@:.elf=.map) --cref
|
|
LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
|
|
|
|
# Remove uncalled code from the final image.
|
|
CFLAGS += -fdata-sections -ffunction-sections
|
|
LDFLAGS += --gc-sections
|
|
|
|
# Debugging/Optimization
|
|
ifeq ($(DEBUG), 1)
|
|
CFLAGS += -g -DPENDSV_DEBUG
|
|
COPT = -O0
|
|
else
|
|
COPT += -Os -DNDEBUG
|
|
endif
|
|
|
|
SRC_LIB = $(addprefix lib/,\
|
|
libc/string0.c \
|
|
libm/math.c \
|
|
libm/thumb_vfp_sqrtf.c \
|
|
libm/asinfacosf.c \
|
|
libm/atanf.c \
|
|
libm/atan2f.c \
|
|
libm/fmodf.c \
|
|
libm/nearbyintf.c \
|
|
libm/log1pf.c \
|
|
libm/acoshf.c \
|
|
libm/asinhf.c \
|
|
libm/atanhf.c \
|
|
libm/kf_rem_pio2.c \
|
|
libm/kf_sin.c \
|
|
libm/kf_cos.c \
|
|
libm/kf_tan.c \
|
|
libm/ef_rem_pio2.c \
|
|
libm/erf_lgamma.c \
|
|
libm/sf_sin.c \
|
|
libm/sf_cos.c \
|
|
libm/sf_tan.c \
|
|
libm/sf_frexp.c \
|
|
libm/sf_modf.c \
|
|
libm/sf_ldexp.c \
|
|
libm/sf_erf.c \
|
|
libm/wf_lgamma.c \
|
|
libm/wf_tgamma.c \
|
|
oofatfs/ff.c \
|
|
oofatfs/option/unicode.c \
|
|
mp-readline/builtin_input.c \
|
|
mp-readline/readline.c \
|
|
netutils/netutils.c \
|
|
timeutils/timeutils.c \
|
|
utils/pyexec.c \
|
|
utils/interrupt_char.c \
|
|
)
|
|
|
|
DRIVERS_SRC_C = $(addprefix drivers/,\
|
|
memory/spiflash.c \
|
|
)
|
|
|
|
SRC_C = \
|
|
main.c \
|
|
system_stm32.c \
|
|
stm32_it.c \
|
|
usbd_conf.c \
|
|
usbd_desc.c \
|
|
usbd_cdc_interface.c \
|
|
usbd_hid_interface.c \
|
|
usbd_msc_storage.c \
|
|
mphalport.c \
|
|
mpthreadport.c \
|
|
irq.c \
|
|
pendsv.c \
|
|
systick.c \
|
|
pybthread.c \
|
|
timer.c \
|
|
led.c \
|
|
pin.c \
|
|
pin_defs_stmhal.c \
|
|
pin_named_pins.c \
|
|
bufhelper.c \
|
|
dma.c \
|
|
i2c.c \
|
|
spi.c \
|
|
uart.c \
|
|
can.c \
|
|
usb.c \
|
|
wdt.c \
|
|
gccollect.c \
|
|
pybstdio.c \
|
|
help.c \
|
|
machine_i2c.c \
|
|
modmachine.c \
|
|
modpyb.c \
|
|
modstm.c \
|
|
moduos.c \
|
|
modutime.c \
|
|
modusocket.c \
|
|
modnetwork.c \
|
|
extint.c \
|
|
usrsw.c \
|
|
rng.c \
|
|
rtc.c \
|
|
flash.c \
|
|
storage.c \
|
|
sdcard.c \
|
|
fatfs_port.c \
|
|
lcd.c \
|
|
accel.c \
|
|
servo.c \
|
|
dac.c \
|
|
adc.c \
|
|
$(wildcard boards/$(BOARD)/*.c)
|
|
|
|
SRC_O = \
|
|
startup_stm32.o \
|
|
gchelper.o \
|
|
|
|
SRC_HAL = $(addprefix $(HAL_DIR)/src/stm32$(MCU_SERIES)xx_,\
|
|
hal.c \
|
|
hal_adc.c \
|
|
hal_adc_ex.c \
|
|
hal_can.c \
|
|
hal_cortex.c \
|
|
hal_dac.c \
|
|
hal_dac_ex.c \
|
|
hal_dma.c \
|
|
hal_flash.c \
|
|
hal_flash_ex.c \
|
|
hal_gpio.c \
|
|
hal_i2c.c \
|
|
hal_pcd.c \
|
|
hal_pcd_ex.c \
|
|
hal_pwr.c \
|
|
hal_pwr_ex.c \
|
|
hal_rcc.c \
|
|
hal_rcc_ex.c \
|
|
hal_rng.c \
|
|
hal_rtc.c \
|
|
hal_rtc_ex.c \
|
|
hal_sd.c \
|
|
hal_spi.c \
|
|
hal_tim.c \
|
|
hal_tim_ex.c \
|
|
hal_uart.c \
|
|
ll_sdmmc.c \
|
|
ll_usb.c \
|
|
)
|
|
|
|
SRC_USBDEV = $(addprefix $(USBDEV_DIR)/,\
|
|
core/src/usbd_core.c \
|
|
core/src/usbd_ctlreq.c \
|
|
core/src/usbd_ioreq.c \
|
|
class/src/usbd_cdc_msc_hid.c \
|
|
class/src/usbd_msc_bot.c \
|
|
class/src/usbd_msc_scsi.c \
|
|
class/src/usbd_msc_data.c \
|
|
)
|
|
|
|
ifeq ($(MICROPY_PY_WIZNET5K),1)
|
|
WIZNET5K_DIR=drivers/wiznet5k
|
|
INC += -I$(TOP)/$(WIZNET5K_DIR)
|
|
CFLAGS_MOD += -DMICROPY_PY_WIZNET5K=1
|
|
SRC_MOD += modnwwiznet5k.c
|
|
SRC_MOD += $(addprefix $(WIZNET5K_DIR)/,\
|
|
ethernet/w5200/w5200.c \
|
|
ethernet/wizchip_conf.c \
|
|
ethernet/socket.c \
|
|
internet/dns/dns.c \
|
|
)
|
|
endif
|
|
|
|
# for CC3000 module
|
|
ifeq ($(MICROPY_PY_CC3K),1)
|
|
CC3000_DIR=drivers/cc3000
|
|
INC += -I$(TOP)/$(CC3000_DIR)/inc
|
|
CFLAGS_MOD += -DMICROPY_PY_CC3K=1
|
|
SRC_MOD += modnwcc3k.c
|
|
SRC_MOD += $(addprefix $(CC3000_DIR)/src/,\
|
|
cc3000_common.c \
|
|
evnt_handler.c \
|
|
hci.c \
|
|
netapp.c \
|
|
nvmem.c \
|
|
security.c \
|
|
socket.c \
|
|
wlan.c \
|
|
ccspi.c \
|
|
inet_ntop.c \
|
|
inet_pton.c \
|
|
patch.c \
|
|
patch_prog.c \
|
|
)
|
|
endif
|
|
|
|
OBJ =
|
|
OBJ += $(PY_O)
|
|
OBJ += $(addprefix $(BUILD)/, $(SRC_LIB:.c=.o))
|
|
OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
|
|
OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
|
|
OBJ += $(addprefix $(BUILD)/, $(SRC_O))
|
|
OBJ += $(addprefix $(BUILD)/, $(SRC_HAL:.c=.o))
|
|
OBJ += $(addprefix $(BUILD)/, $(SRC_USBDEV:.c=.o))
|
|
OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
|
|
OBJ += $(BUILD)/pins_$(BOARD).o
|
|
|
|
# We put several files into the first 16K section with the ISRs.
|
|
# If we compile these using -O0 then it won't fit. So if you really want these
|
|
# to be compiled with -O0, then edit boards/common.ld (in the .isr_vector section)
|
|
# and comment out the following lines.
|
|
$(BUILD)/$(FATFS_DIR)/ff.o: COPT += -Os
|
|
$(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os
|
|
$(PY_BUILD)/formatfloat.o: COPT += -Os
|
|
$(PY_BUILD)/parsenum.o: COPT += -Os
|
|
$(PY_BUILD)/mpprint.o: COPT += -Os
|
|
|
|
all: $(BUILD)/firmware.dfu $(BUILD)/firmware.hex
|
|
|
|
ifneq ($(FROZEN_DIR),)
|
|
# To use frozen source modules, put your .py files in a subdirectory (eg scripts/)
|
|
# and then invoke make with FROZEN_DIR=scripts (be sure to build from scratch).
|
|
CFLAGS += -DMICROPY_MODULE_FROZEN_STR
|
|
endif
|
|
|
|
ifneq ($(FROZEN_MPY_DIR),)
|
|
# To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and
|
|
# then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch).
|
|
CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
|
|
CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
|
|
endif
|
|
|
|
.PHONY: deploy
|
|
|
|
deploy: $(BUILD)/firmware.dfu
|
|
$(ECHO) "Writing $< to the board"
|
|
ifeq ($(USE_PYDFU),1)
|
|
$(Q)$(PYTHON) $(PYDFU) -u $<
|
|
else
|
|
$(Q)$(DFU_UTIL) -a 0 -d $(DEVICE) -D $<
|
|
endif
|
|
|
|
FLASH_ADDR ?= 0x08000000
|
|
TEXT_ADDR ?= 0x08020000
|
|
|
|
deploy-stlink: $(BUILD)/firmware.dfu
|
|
$(ECHO) "Writing $(BUILD)/firmware0.bin to the board via ST-LINK"
|
|
$(Q)$(STFLASH) write $(BUILD)/firmware0.bin $(FLASH_ADDR)
|
|
$(ECHO) "Writing $(BUILD)/firmware1.bin to the board via ST-LINK"
|
|
$(Q)$(STFLASH) --reset write $(BUILD)/firmware1.bin $(TEXT_ADDR)
|
|
|
|
deploy-openocd: $(BUILD)/firmware.dfu
|
|
$(ECHO) "Writing $(BUILD)/firmware{0,1}.bin to the board via ST-LINK using OpenOCD"
|
|
$(Q)$(OPENOCD) -f $(OPENOCD_CONFIG) -c "stm_flash $(BUILD)/firmware0.bin $(FLASH_ADDR) $(BUILD)/firmware1.bin $(TEXT_ADDR)"
|
|
|
|
$(BUILD)/firmware.dfu: $(BUILD)/firmware.elf
|
|
$(ECHO) "Create $@"
|
|
$(Q)$(OBJCOPY) -O binary -j .isr_vector $^ $(BUILD)/firmware0.bin
|
|
$(Q)$(OBJCOPY) -O binary -j .text -j .data $^ $(BUILD)/firmware1.bin
|
|
$(Q)$(PYTHON) $(DFU) -b $(FLASH_ADDR):$(BUILD)/firmware0.bin -b $(TEXT_ADDR):$(BUILD)/firmware1.bin $@
|
|
|
|
$(BUILD)/firmware.hex: $(BUILD)/firmware.elf
|
|
$(ECHO) "Create $@"
|
|
$(Q)$(OBJCOPY) -O ihex $< $@
|
|
|
|
$(BUILD)/firmware.elf: $(OBJ)
|
|
$(ECHO) "LINK $@"
|
|
$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
|
|
$(Q)$(SIZE) $@
|
|
|
|
MAKE_PINS = boards/make-pins.py
|
|
BOARD_PINS = boards/$(BOARD)/pins.csv
|
|
PREFIX_FILE = boards/stm32f4xx_prefix.c
|
|
GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
|
|
GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
|
|
GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
|
|
GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
|
|
GEN_PINS_AF_PY = $(BUILD)/pins_af.py
|
|
|
|
INSERT_USB_IDS = ../tools/insert-usb-ids.py
|
|
FILE2H = ../tools/file2h.py
|
|
|
|
USB_IDS_FILE = usb.h
|
|
CDCINF_TEMPLATE = pybcdc.inf_template
|
|
GEN_CDCINF_FILE = $(HEADER_BUILD)/pybcdc.inf
|
|
GEN_CDCINF_HEADER = $(HEADER_BUILD)/pybcdc_inf.h
|
|
|
|
# List of sources for qstr extraction
|
|
SRC_QSTR += $(SRC_C) $(SRC_MOD) $(SRC_LIB)
|
|
# Append any auto-generated sources that are needed by sources listed in
|
|
# SRC_QSTR
|
|
SRC_QSTR_AUTO_DEPS += $(GEN_CDCINF_HEADER)
|
|
|
|
# Making OBJ use an order-only depenedency on the generated pins.h file
|
|
# has the side effect of making the pins.h file before we actually compile
|
|
# any of the objects. The normal dependency generation will deal with the
|
|
# case when pins.h is modified. But when it doesn't exist, we don't know
|
|
# which source files might need it.
|
|
$(OBJ): | $(HEADER_BUILD)/pins.h
|
|
|
|
# With conditional pins, we may need to regenerate qstrdefs.h when config
|
|
# options change.
|
|
$(HEADER_BUILD)/qstrdefs.generated.h: boards/$(BOARD)/mpconfigboard.h
|
|
|
|
# main.c can't be even preprocessed without $(GEN_CDCINF_HEADER)
|
|
main.c: $(GEN_CDCINF_HEADER)
|
|
|
|
# Use a pattern rule here so that make will only call make-pins.py once to make
|
|
# both pins_$(BOARD).c and pins.h
|
|
$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(BUILD)/%_qstr.h: boards/$(BOARD)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
|
|
$(ECHO) "Create $@"
|
|
$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --qstr $(GEN_PINS_QSTR) --af-const $(GEN_PINS_AF_CONST) --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
|
|
|
|
$(BUILD)/pins_$(BOARD).o: $(BUILD)/pins_$(BOARD).c
|
|
$(call compile_c)
|
|
|
|
GEN_STMCONST_HDR = $(HEADER_BUILD)/modstm_const.h
|
|
GEN_STMCONST_QSTR = $(BUILD)/modstm_qstr.h
|
|
GEN_STMCONST_MPZ = $(HEADER_BUILD)/modstm_mpz.h
|
|
CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
|
|
CMSIS_MCU_HDR = cmsis/$(CMSIS_MCU_LOWER).h
|
|
|
|
$(BUILD)/modstm.o: $(GEN_STMCONST_HDR)
|
|
# Use a pattern rule here so that make will only call make-stmconst.py once to
|
|
# make both modstm_const.h and modstm_qstr.h
|
|
$(HEADER_BUILD)/%_const.h $(BUILD)/%_qstr.h: $(CMSIS_MCU_HDR) make-stmconst.py | $(HEADER_BUILD)
|
|
$(ECHO) "Create stmconst $@"
|
|
$(Q)$(PYTHON) make-stmconst.py --qstr $(GEN_STMCONST_QSTR) --mpz $(GEN_STMCONST_MPZ) $(CMSIS_MCU_HDR) > $(GEN_STMCONST_HDR)
|
|
|
|
$(GEN_CDCINF_HEADER): $(GEN_CDCINF_FILE) $(FILE2H) | $(HEADER_BUILD)
|
|
$(ECHO) "Create $@"
|
|
$(Q)$(PYTHON) $(FILE2H) $< > $@
|
|
|
|
$(GEN_CDCINF_FILE): $(CDCINF_TEMPLATE) $(INSERT_USB_IDS) $(USB_IDS_FILE) | $(HEADER_BUILD)
|
|
$(ECHO) "Create $@"
|
|
$(Q)$(PYTHON) $(INSERT_USB_IDS) $(USB_IDS_FILE) $< > $@
|
|
|
|
include ../py/mkrules.mk
|