2014-12-22 12:35:05 +01:00
|
|
|
# copyright (c) 2010 Espressif System
|
|
|
|
#
|
2015-10-01 07:27:42 +02:00
|
|
|
.NOTPARALLEL:
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
TOP_DIR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
|
2018-12-03 03:24:19 +01:00
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
# SDK base version, as released by Espressif depends on the RELEASE flag
|
|
|
|
#
|
|
|
|
# RELEASE = lastest pulls the latest V3.0.0 branch version as at the issue of this make
|
|
|
|
# otherwise it pulls the labelled version in the SDK version's release directory
|
|
|
|
#
|
2019-05-17 14:04:19 +02:00
|
|
|
ifeq ("$(RELEASE)","latest-3.0")
|
|
|
|
SDK_VER := 3.0.0
|
|
|
|
SDK_FILE_SHA1 := NA
|
|
|
|
SDK_ZIP_ROOT := ESP8266_NONOS_SDK-release-v$(SDK_VER)
|
|
|
|
SDK_FILE_VER := release/v$(SDK_VER)
|
|
|
|
else ifeq ("$(RELEASE)","master")
|
|
|
|
SDK_VER := master
|
|
|
|
SDK_FILE_SHA1 := NA
|
2019-05-01 19:29:11 +02:00
|
|
|
SDK_ZIP_ROOT := ESP8266_NONOS_SDK-$(SDK_VER)
|
2019-05-17 14:04:19 +02:00
|
|
|
SDK_FILE_VER := $(SDK_VER)
|
|
|
|
else
|
|
|
|
# SDK_VER := 3.0
|
|
|
|
# SDK_FILE_VER := v$(SDK_VER)
|
|
|
|
SDK_FILE_VER := e4434aa730e78c63040ace360493aef420ec267c
|
|
|
|
SDK_VER := 3.0-e4434aa
|
|
|
|
SDK_FILE_SHA1 := ac6528a6a206d3d4c220e4035ced423eb314cfbf
|
|
|
|
SDK_ZIP_ROOT := ESP8266_NONOS_SDK-$(SDK_FILE_VER)
|
2019-05-01 19:29:11 +02:00
|
|
|
endif
|
|
|
|
SDK_REL_DIR := sdk/esp_iot_sdk_v$(SDK_VER)
|
|
|
|
SDK_DIR := $(TOP_DIR)/$(SDK_REL_DIR)
|
2019-07-23 17:47:18 +02:00
|
|
|
APP_DIR := $(TOP_DIR)/app
|
2018-03-24 09:29:49 +01:00
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
ESPTOOL_VER := 2.6
|
2019-04-05 17:01:45 +02:00
|
|
|
|
2019-07-23 17:47:18 +02:00
|
|
|
# Ensure that the Espresif SDK is search before application paths and also prevent
|
|
|
|
# the SDK's c_types.h from being included from anywhere, by predefining its include-guard.
|
|
|
|
|
|
|
|
CCFLAGS := $(CCFLAGS) -I $(PDIR)sdk-overrides/include -I $(SDK_DIR)/include -D_C_TYPES_H_
|
|
|
|
LDFLAGS := -L$(SDK_DIR)/lib -L$(SDK_DIR)/ld $(LDFLAGS)
|
2015-10-01 07:04:18 +02:00
|
|
|
|
2016-09-21 03:38:12 +02:00
|
|
|
ifdef DEBUG
|
|
|
|
CCFLAGS += -ggdb -O0
|
|
|
|
LDFLAGS += -ggdb
|
|
|
|
else
|
2018-03-08 01:20:59 +01:00
|
|
|
CCFLAGS += -O2
|
2016-09-21 03:38:12 +02:00
|
|
|
endif
|
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
|
|
|
|
# Handling of V=1/VERBOSE=1 flag
|
2018-12-09 21:39:43 +01:00
|
|
|
#
|
|
|
|
# if V=1, $(summary) does nothing
|
|
|
|
# if V is unset or not 1, $(summary) echoes a summary
|
|
|
|
VERBOSE ?=
|
|
|
|
V ?= $(VERBOSE)
|
|
|
|
ifeq ("$(V)","1")
|
2019-05-01 19:29:11 +02:00
|
|
|
export summary := @true
|
2018-12-09 21:39:43 +01:00
|
|
|
else
|
2019-05-01 19:29:11 +02:00
|
|
|
export summary := @echo
|
|
|
|
# disable echoing of commands, directory names
|
|
|
|
MAKEFLAGS += --silent -w
|
2018-12-09 21:39:43 +01:00
|
|
|
endif # $(V)==1
|
|
|
|
|
2019-03-15 08:33:16 +01:00
|
|
|
ifndef BAUDRATE
|
2019-07-23 17:47:18 +02:00
|
|
|
BAUDRATE=115200
|
2019-03-15 08:33:16 +01:00
|
|
|
endif
|
2018-12-09 21:39:43 +01:00
|
|
|
|
2015-01-05 06:15:59 +01:00
|
|
|
#############################################################
|
|
|
|
# Select compile
|
|
|
|
#
|
2019-07-23 17:47:18 +02:00
|
|
|
# ** HEALTH WARNING ** This section is largely legacy directives left over from
|
2019-05-01 19:29:11 +02:00
|
|
|
# an Espressif template. As far as I (TerrryE) know, we've only used the Linux
|
|
|
|
# Path. I have successfully build AMD and Intel (both x86, AMD64) and RPi ARM6
|
|
|
|
# all under Ubuntu. Our docker container runs on Windows in an Ubuntu VM.
|
|
|
|
# Johny Mattson maintains a prebuild AMD64 xtensa cross-compile gcc v4.8.5
|
2019-07-23 17:47:18 +02:00
|
|
|
# toolchain which is compatible with the non-OS SDK and can be used on any recent
|
2019-05-01 19:29:11 +02:00
|
|
|
# Ubuntu version including the Docker and Travis build environments.
|
|
|
|
#
|
|
|
|
# You have the option to build your own toolchain and specify a TOOLCHAIN_ROOT
|
|
|
|
# environment variable (see https://github.com/pfalcon/esp-open-sdk). If your
|
|
|
|
# architecture is compatable then you can omit this variable and the make will
|
|
|
|
# download and use this prebuilt toolchain.
|
|
|
|
#
|
2019-07-23 17:47:18 +02:00
|
|
|
# If any developers wish to develop, test and support alternative environments
|
2019-05-01 19:29:11 +02:00
|
|
|
# then please raise a GitHub issue on this work.
|
|
|
|
#
|
|
|
|
|
|
|
|
ifndef $(OS)
|
|
|
|
# Assume Windows if MAKE_HOST contains "indows" and Linux otherwise
|
|
|
|
ifneq (,$(findstring indows,$(MAKE_HOST)))
|
|
|
|
OS := windows
|
|
|
|
else
|
|
|
|
OS := linux
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq (,$(findstring indows,$(OS)))
|
|
|
|
#------------ BEGIN UNTESTED ------------ We are not under Linux, e.g.under windows.
|
2019-07-23 17:47:18 +02:00
|
|
|
ifeq ($(XTENSA_CORE),lx106)
|
|
|
|
# It is xcc
|
|
|
|
AR = xt-ar
|
|
|
|
CC = xt-xcc
|
|
|
|
CXX = xt-xcc
|
|
|
|
NM = xt-nm
|
|
|
|
CPP = xt-cpp
|
|
|
|
OBJCOPY = xt-objcopy
|
|
|
|
#MAKE = xt-make
|
|
|
|
CCFLAGS += --rename-section .text=.irom0.text --rename-section .literal=.irom0.literal
|
|
|
|
else
|
|
|
|
# It is gcc, may be cygwin
|
|
|
|
# Can we use -fdata-sections?
|
|
|
|
CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections
|
|
|
|
AR = xtensa-lx106-elf-ar
|
|
|
|
CC = xtensa-lx106-elf-gcc
|
|
|
|
CXX = xtensa-lx106-elf-g++
|
|
|
|
NM = xtensa-lx106-elf-nm
|
|
|
|
CPP = xtensa-lx106-elf-cpp
|
|
|
|
OBJCOPY = xtensa-lx106-elf-objcopy
|
|
|
|
endif
|
|
|
|
FIRMWAREDIR = ..\\bin\\
|
|
|
|
ifndef COMPORT
|
|
|
|
ESPPORT = com1
|
|
|
|
else
|
|
|
|
ESPPORT = $(COMPORT)
|
|
|
|
endif
|
|
|
|
ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
|
2015-01-05 06:15:59 +01:00
|
|
|
# ->AMD64
|
2019-07-23 17:47:18 +02:00
|
|
|
endif
|
|
|
|
ifeq ($(PROCESSOR_ARCHITECTURE),x86)
|
2015-01-05 06:15:59 +01:00
|
|
|
# ->IA32
|
2019-07-23 17:47:18 +02:00
|
|
|
endif
|
2019-05-01 19:29:11 +02:00
|
|
|
#---------------- END UNTESTED ---------------- We are under windows.
|
2015-01-05 06:15:59 +01:00
|
|
|
else
|
2019-05-01 19:29:11 +02:00
|
|
|
# We are under other system, may be Linux. Assume using gcc.
|
|
|
|
|
|
|
|
UNAME_S := $(shell uname -s)
|
|
|
|
UNAME_P := $(shell uname -p)
|
|
|
|
ifeq ($(OS),linux)
|
|
|
|
ifndef TOOLCHAIN_ROOT
|
|
|
|
TOOLCHAIN_VERSION = 20181106.0
|
|
|
|
GCCTOOLCHAIN = linux-x86_64-$(TOOLCHAIN_VERSION)
|
|
|
|
TOOLCHAIN_ROOT = $(TOP_DIR)/tools/toolchains/esp8266-$(GCCTOOLCHAIN)
|
|
|
|
GITHUB_TOOLCHAIN = https://github.com/jmattsson/esp-toolchains
|
|
|
|
export PATH:=$(PATH):$(TOOLCHAIN_ROOT)/bin
|
2019-07-23 17:47:18 +02:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef COMPORT
|
|
|
|
ESPPORT = /dev/ttyUSB0
|
|
|
|
else
|
|
|
|
ESPPORT = $(COMPORT)
|
|
|
|
endif
|
|
|
|
|
|
|
|
CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections
|
|
|
|
AR = xtensa-lx106-elf-ar
|
|
|
|
CC = $(WRAPCC) xtensa-lx106-elf-gcc
|
|
|
|
CXX = $(WRAPCC) xtensa-lx106-elf-g++
|
|
|
|
NM = xtensa-lx106-elf-nm
|
|
|
|
CPP = $(WRAPCC) xtensa-lx106-elf-gcc -E
|
|
|
|
OBJCOPY = xtensa-lx106-elf-objcopy
|
|
|
|
FIRMWAREDIR = ../bin/
|
2019-04-05 17:01:45 +02:00
|
|
|
WGET = wget --tries=10 --timeout=15 --waitretry=30 --read-timeout=20 --retry-connrefused
|
2015-01-05 06:15:59 +01:00
|
|
|
endif
|
2015-01-10 22:37:12 +01:00
|
|
|
|
2019-04-05 17:01:45 +02:00
|
|
|
GITHUB_SDK = https://github.com/espressif/ESP8266_NONOS_SDK
|
|
|
|
GITHUB_ESPTOOL = https://github.com/espressif/esptool
|
|
|
|
|
|
|
|
ESPTOOL ?= $(TOP_DIR)/tools/toolchains/esptool.py
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2016-06-05 23:10:58 +02:00
|
|
|
SUBDIRS ?= $(patsubst %/,%,$(dir $(filter-out tools/Makefile,$(wildcard */Makefile))))
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
ODIR := .output
|
|
|
|
|
|
|
|
ifdef TARGET
|
|
|
|
CSRCS ?= $(wildcard *.c)
|
|
|
|
CXXSRCS ?= $(wildcard *.cpp)
|
|
|
|
ASRCs ?= $(wildcard *.s)
|
|
|
|
ASRCS ?= $(wildcard *.S)
|
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
OBJODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/obj
|
|
|
|
|
|
|
|
OBJS := $(CSRCS:%.c=$(OBJODIR)/%.o) \
|
Update to sdk 2.2
Initial commit for
https://github.com/nodemcu/nodemcu-firmware/issues/2225 .
Replay patches from Espressif's repository at
https://github.com/espressif/ESP8266_NONOS_SDK between tags v2.1.0 and
v2.2.0:
0001-sync-from-ccca00f2.patch
Superseded by existing changes, but lines reordered in app/driver/key.c
to minimize divergences.
0002-sync-from-3f38ad5a.patch
Upstream files only
0003-Update-links.patch
Not meaningful to NodeMCU
0004-sync-from-01990ad0.patch
0005-sync-from-cdf6877d.patch
Upstream files only
0006-sync-from-f29e744c.patch
Upstream files only, user_interface.h override non-conflicting
0009-feat-lwip-Move-lwip-source-code-to-third_party-folde.patch
Merged change to lwip/app/espconn_udp.c; rest is just moves or
appears to not apply.
0010-feat-mbedtls-Add-mbedtls-source-code-in-third_party-.patch
Does not apply; we use our own mbedtls
0011-added-C-support.patch
Merged to Makefile
0012-feat-mbedtls-Rebuild-libmbedtls.patch
Already applied
0013-fix-at-Fix-some-bugs-of-AT.patch
Upstream files only
0014-feat-err_t-Redefine-err_t-to-s32_t.patch
Merged to app/include/arch/cc.h and ./app/include/lwip/app/espconn.h;
the rest is upstream files.
0015-fix-wpa-Fix-wpa-wpa2-ptk-gtk-reinstallation-vulnerab.patch
0016-fix-wifi-Remove-group-key-entry-before-connecting-to.patch
0017-feat-lib-Remove-time-function-in-libmain.patch
Upstream files only
0018-feat-espconn-Modification-for-espconn.patch
Merged to app/include/lwip/app/espconn.h,
app/include/lwip/app/espconn_tcp.h, app/lwip/app/espconn.c,
app/lwip/app/espconn_tcp.c
0019-feat-at-Use-new-espconn_recv-to-fix-tcp-server-issue.patch
0020-feat-examples-Update-mqtt-demo-and-auto-bin-generate.patch
Upstream files only
0021-wifi-Add-scan-threshold-and-dwell-time.patch
0022-feat-wifi-Add-country-code-API.patch
0023-feat-wifi-Record-more-information-of-scanned-ap.patch
Upstream files only, user_interface.h override non-conflicting
0024-fix-example-Fix-IoT_Demo-user-sector-error.patch
Upstream files only
0025-fix-lwip-Fix-sequence-number-error-of-RST-ACK.patch
Merged app/lwip/core/tcp_in.c
0026-fix-mbedtls-Fix-memory-leak.patch
Merged app/mbedtls/app/lwIPSocket.c
0027-fix-mbedtls-Fix-call-send-callback-function-failed.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0028-feat-Add-USE_OPTIMIZE_PRINTF-in-third_party-Makefile.patch
Merged app/Makefile
0029-fix-api-Fix-ets_delay_us-declaration.patch
Upstream files only, osapi.h override non-conflicting
0030-fix-wifi-Remove-max_tx_power-in-wifi_country_t-in-li.patch
0031-fix-wifi-Fix-softAP-wrong-behavior-after-call-system.patch
0032-fix-wifi-bugfix-of-scan-fail-after-connected-if-max-.patch
0033-feat-at-Enable-scan-time-scan-type-and-add-scan-resu.patch
0034-feat-at-Add-command-AT-CWCOUNTRY.patch
0035-fix-at-Fix-that-AT-CIPSTART-causes-busy-if-the-serve.patch
Upstream files only
0036-feat-mbedtls-Speed-up-mbedtls-handshake-process.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0037-fix-api-Fix-os_calloc-declaration.patch
Merged app/include/lwip/mem.h; sdk-overrides/include/mem.h
non-conflicting.
0038-fix-mbedtls-Fix-disconnect-callback-function-never-b.patch
Merged app/mbedtls/app/espconn_mbedtls.c; minor revision to logic in
6576af959b1e704003ae5b93f6d6b89fcf86d429. Whitespace fixes.
0039-feat-at-Add-country-code-start-channel-in-AT-CWCOUNT.patch
0040-fix-net80211-Fix-Null-pointer-in-ieee80211_rfid_locp.patch
Upstream files only
0041-feat-wifi-Add-new-esp_init_data_default-v08-bin.patch
Upstream files only, but impacts Makefile
0042-fix-mbedtls-Fix-load-cert-fail-when-the-private-key-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0043-fix-wifi-The-start-channel-can-be-any-valid-channel.patch
0044-fix-wifi-Fix-scan-do-not-start-after-connect.patch
0045-feat-wifi-Add-keep-connection-for-station-to-keep-co.patch
0046-feat-at-Update-AT-version-to-1.6.0.0.patch
0047-fix-at-Fix-GSLP-too-long-time.patch
0048-fix-at-Fix-the-message-is-incorrect-when-creating-UD.patch
0049-feat-at-Add-AT-CIPSERVERMAXCONN.patch
Upstream files only
0050-feat-system-Add-softap-distributes-station-ip-event.patch
Upstream files only, user_interface.h override non-conflicting
0051-feat-example-Use-libmbedtls.a-instead-of-libssl.a-in.patch
Upstream files only
0052-feat-mesh-Remove-mesh-support.patch
Upstream files only, but go ahead and remove comment from
ld/nodemcu.ld.
0053-fix-example-Fix-forget-to-add-integer-parameter-when.patch
Upstream files only
0054-fix-mbedtls-Fix-reconnect_callback-is-not-triggered-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0055-feat-at-Add-AT-SYSMSG-to-enable-some-report-informat.patch
0056-fix-at-Fix-the-incorrect-link-id-when-client-connect.patch
0057-fix-at-Fix-the-bug-that-it-should-be-error-when-the-.patch
0058-fix-smartconfig-Fix-the-smartconfig-scan-time-issue.patch
0059-fix-lwip-Fix-the-bug-of-lwip-output.patch
Upstream files only
0060-fix-lwip-Fix-the-length-of-TCP-data-in-one-packet-is.patch
0061-fix-lwip-Fix-send-TCP-data-with-two-or-more-pbuf.patch
Merged app/lwip/core/tcp_out.c
0062-fix-wifi-Fix-assert-happen-when-smartconfig-start-th.patch
Upstream files only
0063-fix-mbedtls-Fix-memory-leak-when-ESP8266-as-SSL-TLS-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0064-fix-mbedtls-Fix-already-freed-and-exception-bug-when.patch
Merged app/mbedtls/app/lwIPSocket.c
0065-fix-at-Fix-bug-that-there-is-no-result-when-sending-.patch
0066-feat-example-Add-AT-bin-version.patch
0067-feat-version-Update-version-to-2.2.0-and-add-version.patch
0068-feat-bin-Update-AT-bin-for-SDK-2.2.0.patch
Upstream files only
Apply local changes to build:
app/include/lwip/app/espconn.h pulls changes (and license decl) from
upstream SDK. Makefile is altered to use this file ahead of the
SDK's.
Remove lwip's sntp support, since it was never really wired in anyway.
See https://github.com/nodemcu/nodemcu-firmware/issues/2042 for more
information. Patch Makefile to strip time.o, the consumer of lwip's
sntp functionality, from libmain.a, resulting in much
easier-to-understand error messages.
This has consequences for mbedtls. The simplest thing to do, which is,
impressively, not a change in behavior, is to completely disable TLS
certificate time validation; a later patch can optionally couple this to
RTCTIME support.
Similarly, it happens that the sqlite3 import was calling time(), but
this was not going to work out well for it. Just stub it out to always
return unix timestamp 0, as would have happened anyway.
Changes unprocessed:
0007-sync-from-080c37e1.patch
0008-feat-lib-Compile-some-libraries-with-ffunction-secti.patch
These two make changes to the linker script; perhaps
they are worth porting over, but I have not done so
here.
This is build-tested (ADC, BIT, COLOR_UTILS, CRON, CRYPTO, DHT, ENCODER,
FILE, GPIO, HTTP, I2C, MQTT, NET, NODE, OW, PCM, PERF, PWM, RTCFIFO,
RTCMEM, RTCTIME, SNTP, SPI, SQLITE3, STRUCT, TLS, TMR, UART, WIFI,
WS2812, WS2812_EFFECTS) and boots, but only limited run-time testing has
been performed. Testing done does, however, include having made a few
TLS connections through the HTTP module, so things are not hopelessly
broken, at the very least.
2018-02-20 03:03:09 +01:00
|
|
|
$(CXXSRCS:%.cpp=$(OBJODIR)/%.o) \
|
2014-12-22 12:35:05 +01:00
|
|
|
$(ASRCs:%.s=$(OBJODIR)/%.o) \
|
|
|
|
$(ASRCS:%.S=$(OBJODIR)/%.o)
|
|
|
|
|
|
|
|
DEPS := $(CSRCS:%.c=$(OBJODIR)/%.d) \
|
Update to sdk 2.2
Initial commit for
https://github.com/nodemcu/nodemcu-firmware/issues/2225 .
Replay patches from Espressif's repository at
https://github.com/espressif/ESP8266_NONOS_SDK between tags v2.1.0 and
v2.2.0:
0001-sync-from-ccca00f2.patch
Superseded by existing changes, but lines reordered in app/driver/key.c
to minimize divergences.
0002-sync-from-3f38ad5a.patch
Upstream files only
0003-Update-links.patch
Not meaningful to NodeMCU
0004-sync-from-01990ad0.patch
0005-sync-from-cdf6877d.patch
Upstream files only
0006-sync-from-f29e744c.patch
Upstream files only, user_interface.h override non-conflicting
0009-feat-lwip-Move-lwip-source-code-to-third_party-folde.patch
Merged change to lwip/app/espconn_udp.c; rest is just moves or
appears to not apply.
0010-feat-mbedtls-Add-mbedtls-source-code-in-third_party-.patch
Does not apply; we use our own mbedtls
0011-added-C-support.patch
Merged to Makefile
0012-feat-mbedtls-Rebuild-libmbedtls.patch
Already applied
0013-fix-at-Fix-some-bugs-of-AT.patch
Upstream files only
0014-feat-err_t-Redefine-err_t-to-s32_t.patch
Merged to app/include/arch/cc.h and ./app/include/lwip/app/espconn.h;
the rest is upstream files.
0015-fix-wpa-Fix-wpa-wpa2-ptk-gtk-reinstallation-vulnerab.patch
0016-fix-wifi-Remove-group-key-entry-before-connecting-to.patch
0017-feat-lib-Remove-time-function-in-libmain.patch
Upstream files only
0018-feat-espconn-Modification-for-espconn.patch
Merged to app/include/lwip/app/espconn.h,
app/include/lwip/app/espconn_tcp.h, app/lwip/app/espconn.c,
app/lwip/app/espconn_tcp.c
0019-feat-at-Use-new-espconn_recv-to-fix-tcp-server-issue.patch
0020-feat-examples-Update-mqtt-demo-and-auto-bin-generate.patch
Upstream files only
0021-wifi-Add-scan-threshold-and-dwell-time.patch
0022-feat-wifi-Add-country-code-API.patch
0023-feat-wifi-Record-more-information-of-scanned-ap.patch
Upstream files only, user_interface.h override non-conflicting
0024-fix-example-Fix-IoT_Demo-user-sector-error.patch
Upstream files only
0025-fix-lwip-Fix-sequence-number-error-of-RST-ACK.patch
Merged app/lwip/core/tcp_in.c
0026-fix-mbedtls-Fix-memory-leak.patch
Merged app/mbedtls/app/lwIPSocket.c
0027-fix-mbedtls-Fix-call-send-callback-function-failed.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0028-feat-Add-USE_OPTIMIZE_PRINTF-in-third_party-Makefile.patch
Merged app/Makefile
0029-fix-api-Fix-ets_delay_us-declaration.patch
Upstream files only, osapi.h override non-conflicting
0030-fix-wifi-Remove-max_tx_power-in-wifi_country_t-in-li.patch
0031-fix-wifi-Fix-softAP-wrong-behavior-after-call-system.patch
0032-fix-wifi-bugfix-of-scan-fail-after-connected-if-max-.patch
0033-feat-at-Enable-scan-time-scan-type-and-add-scan-resu.patch
0034-feat-at-Add-command-AT-CWCOUNTRY.patch
0035-fix-at-Fix-that-AT-CIPSTART-causes-busy-if-the-serve.patch
Upstream files only
0036-feat-mbedtls-Speed-up-mbedtls-handshake-process.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0037-fix-api-Fix-os_calloc-declaration.patch
Merged app/include/lwip/mem.h; sdk-overrides/include/mem.h
non-conflicting.
0038-fix-mbedtls-Fix-disconnect-callback-function-never-b.patch
Merged app/mbedtls/app/espconn_mbedtls.c; minor revision to logic in
6576af959b1e704003ae5b93f6d6b89fcf86d429. Whitespace fixes.
0039-feat-at-Add-country-code-start-channel-in-AT-CWCOUNT.patch
0040-fix-net80211-Fix-Null-pointer-in-ieee80211_rfid_locp.patch
Upstream files only
0041-feat-wifi-Add-new-esp_init_data_default-v08-bin.patch
Upstream files only, but impacts Makefile
0042-fix-mbedtls-Fix-load-cert-fail-when-the-private-key-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0043-fix-wifi-The-start-channel-can-be-any-valid-channel.patch
0044-fix-wifi-Fix-scan-do-not-start-after-connect.patch
0045-feat-wifi-Add-keep-connection-for-station-to-keep-co.patch
0046-feat-at-Update-AT-version-to-1.6.0.0.patch
0047-fix-at-Fix-GSLP-too-long-time.patch
0048-fix-at-Fix-the-message-is-incorrect-when-creating-UD.patch
0049-feat-at-Add-AT-CIPSERVERMAXCONN.patch
Upstream files only
0050-feat-system-Add-softap-distributes-station-ip-event.patch
Upstream files only, user_interface.h override non-conflicting
0051-feat-example-Use-libmbedtls.a-instead-of-libssl.a-in.patch
Upstream files only
0052-feat-mesh-Remove-mesh-support.patch
Upstream files only, but go ahead and remove comment from
ld/nodemcu.ld.
0053-fix-example-Fix-forget-to-add-integer-parameter-when.patch
Upstream files only
0054-fix-mbedtls-Fix-reconnect_callback-is-not-triggered-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0055-feat-at-Add-AT-SYSMSG-to-enable-some-report-informat.patch
0056-fix-at-Fix-the-incorrect-link-id-when-client-connect.patch
0057-fix-at-Fix-the-bug-that-it-should-be-error-when-the-.patch
0058-fix-smartconfig-Fix-the-smartconfig-scan-time-issue.patch
0059-fix-lwip-Fix-the-bug-of-lwip-output.patch
Upstream files only
0060-fix-lwip-Fix-the-length-of-TCP-data-in-one-packet-is.patch
0061-fix-lwip-Fix-send-TCP-data-with-two-or-more-pbuf.patch
Merged app/lwip/core/tcp_out.c
0062-fix-wifi-Fix-assert-happen-when-smartconfig-start-th.patch
Upstream files only
0063-fix-mbedtls-Fix-memory-leak-when-ESP8266-as-SSL-TLS-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0064-fix-mbedtls-Fix-already-freed-and-exception-bug-when.patch
Merged app/mbedtls/app/lwIPSocket.c
0065-fix-at-Fix-bug-that-there-is-no-result-when-sending-.patch
0066-feat-example-Add-AT-bin-version.patch
0067-feat-version-Update-version-to-2.2.0-and-add-version.patch
0068-feat-bin-Update-AT-bin-for-SDK-2.2.0.patch
Upstream files only
Apply local changes to build:
app/include/lwip/app/espconn.h pulls changes (and license decl) from
upstream SDK. Makefile is altered to use this file ahead of the
SDK's.
Remove lwip's sntp support, since it was never really wired in anyway.
See https://github.com/nodemcu/nodemcu-firmware/issues/2042 for more
information. Patch Makefile to strip time.o, the consumer of lwip's
sntp functionality, from libmain.a, resulting in much
easier-to-understand error messages.
This has consequences for mbedtls. The simplest thing to do, which is,
impressively, not a change in behavior, is to completely disable TLS
certificate time validation; a later patch can optionally couple this to
RTCTIME support.
Similarly, it happens that the sqlite3 import was calling time(), but
this was not going to work out well for it. Just stub it out to always
return unix timestamp 0, as would have happened anyway.
Changes unprocessed:
0007-sync-from-080c37e1.patch
0008-feat-lib-Compile-some-libraries-with-ffunction-secti.patch
These two make changes to the linker script; perhaps
they are worth porting over, but I have not done so
here.
This is build-tested (ADC, BIT, COLOR_UTILS, CRON, CRYPTO, DHT, ENCODER,
FILE, GPIO, HTTP, I2C, MQTT, NET, NODE, OW, PCM, PERF, PWM, RTCFIFO,
RTCMEM, RTCTIME, SNTP, SPI, SQLITE3, STRUCT, TLS, TMR, UART, WIFI,
WS2812, WS2812_EFFECTS) and boots, but only limited run-time testing has
been performed. Testing done does, however, include having made a few
TLS connections through the HTTP module, so things are not hopelessly
broken, at the very least.
2018-02-20 03:03:09 +01:00
|
|
|
$(CXXSCRS:%.cpp=$(OBJODIR)/%.d) \
|
2014-12-22 12:35:05 +01:00
|
|
|
$(ASRCs:%.s=$(OBJODIR)/%.d) \
|
|
|
|
$(ASRCS:%.S=$(OBJODIR)/%.d)
|
|
|
|
|
|
|
|
LIBODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/lib
|
|
|
|
OLIBS := $(GEN_LIBS:%=$(LIBODIR)/%)
|
|
|
|
|
|
|
|
IMAGEODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/image
|
|
|
|
OIMAGES := $(GEN_IMAGES:%=$(IMAGEODIR)/%)
|
|
|
|
|
|
|
|
BINODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/bin
|
|
|
|
OBINS := $(GEN_BINS:%=$(BINODIR)/%)
|
|
|
|
|
2016-06-05 23:10:58 +02:00
|
|
|
ifndef PDIR
|
2019-05-01 19:29:11 +02:00
|
|
|
ifneq ($(wildcard $(TOP_DIR)/local/fs/*),)
|
|
|
|
SPECIAL_MKTARGETS += spiffs-image
|
|
|
|
else
|
|
|
|
SPECIAL_MKTARGETS += spiffs-image-remove
|
|
|
|
endif
|
2016-06-05 23:10:58 +02:00
|
|
|
endif
|
2019-05-01 19:29:11 +02:00
|
|
|
endif # TARGET
|
2015-05-01 17:39:47 +02:00
|
|
|
#
|
2018-12-03 03:24:19 +01:00
|
|
|
# Note:
|
2015-05-01 17:39:47 +02:00
|
|
|
# https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html
|
2019-05-01 19:29:11 +02:00
|
|
|
# If you add global optimize options then they will override "-Os" defined above.
|
|
|
|
# Note that "-Os" should NOT be used to reduce code size because of the runtime
|
|
|
|
# impact of the extra non-aligned exception burdon.
|
2015-05-01 17:39:47 +02:00
|
|
|
#
|
2014-12-22 12:35:05 +01:00
|
|
|
CCFLAGS += \
|
|
|
|
-g \
|
|
|
|
-Wpointer-arith \
|
|
|
|
-Wundef \
|
|
|
|
-Werror \
|
|
|
|
-Wl,-EL \
|
|
|
|
-fno-inline-functions \
|
|
|
|
-nostdlib \
|
|
|
|
-mlongcalls \
|
2019-07-23 17:47:18 +02:00
|
|
|
-mtext-section-literals \
|
2018-12-03 03:24:19 +01:00
|
|
|
# -Wall
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2016-01-22 00:55:57 +01:00
|
|
|
CFLAGS = $(CCFLAGS) $(DEFINES) $(EXTRA_CCFLAGS) $(STD_CFLAGS) $(INCLUDES)
|
|
|
|
DFLAGS = $(CCFLAGS) $(DDEFINES) $(EXTRA_CCFLAGS) $(STD_CFLAGS) $(INCLUDES)
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
|
|
|
|
#############################################################
|
|
|
|
# Functions
|
|
|
|
#
|
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
ifdef TARGET
|
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
define ShortcutRule
|
|
|
|
$(1): .subdirs $(2)/$(1)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define MakeLibrary
|
|
|
|
DEP_LIBS_$(1) = $$(foreach lib,$$(filter %.a,$$(COMPONENTS_$(1))),$$(dir $$(lib))$$(LIBODIR)/$$(notdir $$(lib)))
|
|
|
|
DEP_OBJS_$(1) = $$(foreach obj,$$(filter %.o,$$(COMPONENTS_$(1))),$$(dir $$(obj))$$(OBJODIR)/$$(notdir $$(obj)))
|
|
|
|
$$(LIBODIR)/$(1).a: $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1)) $$(DEPENDS_$(1))
|
|
|
|
@mkdir -p $$(LIBODIR)
|
|
|
|
$$(if $$(filter %.a,$$?),mkdir -p $$(EXTRACT_DIR)_$(1))
|
|
|
|
$$(if $$(filter %.a,$$?),cd $$(EXTRACT_DIR)_$(1); $$(foreach lib,$$(filter %.a,$$?),$$(AR) xo $$(UP_EXTRACT_DIR)/$$(lib);))
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) AR $(patsubst $(TOP_DIR)/%,%,$(CURDIR))/$<
|
2014-12-22 12:35:05 +01:00
|
|
|
$$(AR) ru $$@ $$(filter %.o,$$?) $$(if $$(filter %.a,$$?),$$(EXTRACT_DIR)_$(1)/*.o)
|
|
|
|
$$(if $$(filter %.a,$$?),$$(RM) -r $$(EXTRACT_DIR)_$(1))
|
|
|
|
endef
|
|
|
|
|
|
|
|
define MakeImage
|
|
|
|
DEP_LIBS_$(1) = $$(foreach lib,$$(filter %.a,$$(COMPONENTS_$(1))),$$(dir $$(lib))$$(LIBODIR)/$$(notdir $$(lib)))
|
|
|
|
DEP_OBJS_$(1) = $$(foreach obj,$$(filter %.o,$$(COMPONENTS_$(1))),$$(dir $$(obj))$$(OBJODIR)/$$(notdir $$(obj)))
|
|
|
|
$$(IMAGEODIR)/$(1).out: $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1)) $$(DEPENDS_$(1))
|
|
|
|
@mkdir -p $$(IMAGEODIR)
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) LD $(patsubst $(TOP_DIR)/%,%,$(CURDIR))/$$@
|
2018-12-03 03:24:19 +01:00
|
|
|
$$(CC) $$(LDFLAGS) $$(if $$(LINKFLAGS_$(1)),$$(LINKFLAGS_$(1)),$$(LINKFLAGS_DEFAULT) $$(OBJS) $$(DEP_OBJS_$(1)) $$(DEP_LIBS_$(1))) -o $$@
|
2014-12-22 12:35:05 +01:00
|
|
|
endef
|
|
|
|
|
|
|
|
$(BINODIR)/%.bin: $(IMAGEODIR)/%.out
|
|
|
|
@mkdir -p $(BINODIR)
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) NM $(patsubst $(TOP_DIR)/%,%,$(CURDIR))/$@
|
2017-07-03 05:31:32 +02:00
|
|
|
@$(NM) $< | grep -w U && { echo "Firmware has undefined (but unused) symbols!"; exit 1; } || true
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) ESPTOOL $(patsubst $(TOP_DIR)/%,%,$(CURDIR))/$< $(FIRMWAREDIR)
|
2017-06-25 20:41:36 +02:00
|
|
|
$(ESPTOOL) elf2image --flash_mode dio --flash_freq 40m $< -o $(FIRMWAREDIR)
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
endif # TARGET
|
2014-12-22 12:35:05 +01:00
|
|
|
#############################################################
|
|
|
|
# Rules base
|
|
|
|
# Should be done in top-level makefile only
|
|
|
|
#
|
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
ifndef TARGET
|
|
|
|
all: toolchain sdk_pruned pre_build .subdirs
|
|
|
|
else
|
|
|
|
all: .subdirs $(OBJS) $(OLIBS) $(OIMAGES) $(OBINS) $(SPECIAL_MKTARGETS)
|
|
|
|
endif
|
2015-12-20 04:39:17 +01:00
|
|
|
|
|
|
|
.PHONY: sdk_extracted
|
2018-03-24 09:29:49 +01:00
|
|
|
.PHONY: sdk_pruned
|
2018-12-03 03:24:19 +01:00
|
|
|
.PHONY: toolchain
|
2015-12-20 04:39:17 +01:00
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
sdk_extracted: $(TOP_DIR)/sdk/.extracted-$(SDK_VER)
|
|
|
|
sdk_pruned: sdk_extracted toolchain $(TOP_DIR)/sdk/.pruned-$(SDK_VER)
|
2015-12-20 04:39:17 +01:00
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
ifdef GITHUB_TOOLCHAIN
|
|
|
|
TOOLCHAIN_ROOT := $(TOP_DIR)/tools/toolchains/esp8266-linux-x86_64-$(TOOLCHAIN_VERSION)
|
|
|
|
|
|
|
|
toolchain: $(TOOLCHAIN_ROOT)/bin $(ESPTOOL)
|
2018-12-03 03:24:19 +01:00
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
$(TOOLCHAIN_ROOT)/bin: $(TOP_DIR)/cache/toolchain-esp8266-$(GCCTOOLCHAIN).tar.xz
|
2018-12-03 03:24:19 +01:00
|
|
|
mkdir -p $(TOP_DIR)/tools/toolchains/
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) EXTRACT $(patsubst $(TOP_DIR)/%,%,$<)
|
2018-12-03 03:24:19 +01:00
|
|
|
tar -xJf $< -C $(TOP_DIR)/tools/toolchains/
|
|
|
|
touch $@
|
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
$(TOP_DIR)/cache/toolchain-esp8266-$(GCCTOOLCHAIN).tar.xz:
|
2018-12-03 03:24:19 +01:00
|
|
|
mkdir -p $(TOP_DIR)/cache
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) WGET $(patsubst $(TOP_DIR)/%,%,$@)
|
2019-05-01 19:29:11 +02:00
|
|
|
$(WGET) $(GITHUB_TOOLCHAIN)/releases/download/$(GCCTOOLCHAIN)/toolchain-esp8266-$(GCCTOOLCHAIN).tar.xz -O $@ \
|
2019-04-05 17:01:45 +02:00
|
|
|
|| { rm -f "$@"; exit 1; }
|
2019-05-01 19:29:11 +02:00
|
|
|
else
|
|
|
|
toolchain: $(ESPTOOL)
|
2018-12-03 03:24:19 +01:00
|
|
|
endif
|
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
$(ESPTOOL): $(TOP_DIR)/cache/esptool/v$(ESPTOOL_VER).tar.gz
|
2019-04-05 17:01:45 +02:00
|
|
|
mkdir -p $(TOP_DIR)/tools/toolchains/
|
|
|
|
tar -C $(TOP_DIR)/tools/toolchains/ -xzf $< --strip-components=1 esptool-$(ESPTOOL_VER)/esptool.py
|
|
|
|
chmod +x $@
|
|
|
|
touch $@
|
|
|
|
|
|
|
|
$(TOP_DIR)/cache/esptool/v$(ESPTOOL_VER).tar.gz:
|
|
|
|
mkdir -p $(TOP_DIR)/cache/esptool/
|
|
|
|
$(WGET) $(GITHUB_ESPTOOL)/archive/v$(ESPTOOL_VER).tar.gz -O $@ || { rm -f "$@"; exit 1; }
|
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
$(TOP_DIR)/sdk/.extracted-$(SDK_VER): $(TOP_DIR)/cache/$(SDK_FILE_VER).zip
|
2015-12-20 04:39:17 +01:00
|
|
|
mkdir -p "$(dir $@)"
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) UNZIP $(patsubst $(TOP_DIR)/%,%,$<)
|
2019-04-05 17:01:45 +02:00
|
|
|
(cd "$(dir $@)" && \
|
2019-05-01 19:29:11 +02:00
|
|
|
rm -fr esp_iot_sdk_v$(SDK_VER) ESP8266_NONOS_SDK-* && \
|
|
|
|
unzip $(TOP_DIR)/cache/$(SDK_FILE_VER).zip \
|
2019-05-17 14:04:19 +02:00
|
|
|
'*/lib/*' \
|
|
|
|
'*/ld/*.v6.ld' \
|
|
|
|
'*/include/*' \
|
|
|
|
'*/bin/esp_init_data_default_v05.bin' \
|
2019-04-05 17:01:45 +02:00
|
|
|
)
|
2019-05-01 19:29:11 +02:00
|
|
|
mv $(dir $@)/$(SDK_ZIP_ROOT) $(dir $@)/esp_iot_sdk_v$(SDK_VER)
|
2018-03-24 09:29:49 +01:00
|
|
|
touch $@
|
|
|
|
|
|
|
|
$(TOP_DIR)/sdk/.pruned-$(SDK_VER):
|
Update to sdk 2.2
Initial commit for
https://github.com/nodemcu/nodemcu-firmware/issues/2225 .
Replay patches from Espressif's repository at
https://github.com/espressif/ESP8266_NONOS_SDK between tags v2.1.0 and
v2.2.0:
0001-sync-from-ccca00f2.patch
Superseded by existing changes, but lines reordered in app/driver/key.c
to minimize divergences.
0002-sync-from-3f38ad5a.patch
Upstream files only
0003-Update-links.patch
Not meaningful to NodeMCU
0004-sync-from-01990ad0.patch
0005-sync-from-cdf6877d.patch
Upstream files only
0006-sync-from-f29e744c.patch
Upstream files only, user_interface.h override non-conflicting
0009-feat-lwip-Move-lwip-source-code-to-third_party-folde.patch
Merged change to lwip/app/espconn_udp.c; rest is just moves or
appears to not apply.
0010-feat-mbedtls-Add-mbedtls-source-code-in-third_party-.patch
Does not apply; we use our own mbedtls
0011-added-C-support.patch
Merged to Makefile
0012-feat-mbedtls-Rebuild-libmbedtls.patch
Already applied
0013-fix-at-Fix-some-bugs-of-AT.patch
Upstream files only
0014-feat-err_t-Redefine-err_t-to-s32_t.patch
Merged to app/include/arch/cc.h and ./app/include/lwip/app/espconn.h;
the rest is upstream files.
0015-fix-wpa-Fix-wpa-wpa2-ptk-gtk-reinstallation-vulnerab.patch
0016-fix-wifi-Remove-group-key-entry-before-connecting-to.patch
0017-feat-lib-Remove-time-function-in-libmain.patch
Upstream files only
0018-feat-espconn-Modification-for-espconn.patch
Merged to app/include/lwip/app/espconn.h,
app/include/lwip/app/espconn_tcp.h, app/lwip/app/espconn.c,
app/lwip/app/espconn_tcp.c
0019-feat-at-Use-new-espconn_recv-to-fix-tcp-server-issue.patch
0020-feat-examples-Update-mqtt-demo-and-auto-bin-generate.patch
Upstream files only
0021-wifi-Add-scan-threshold-and-dwell-time.patch
0022-feat-wifi-Add-country-code-API.patch
0023-feat-wifi-Record-more-information-of-scanned-ap.patch
Upstream files only, user_interface.h override non-conflicting
0024-fix-example-Fix-IoT_Demo-user-sector-error.patch
Upstream files only
0025-fix-lwip-Fix-sequence-number-error-of-RST-ACK.patch
Merged app/lwip/core/tcp_in.c
0026-fix-mbedtls-Fix-memory-leak.patch
Merged app/mbedtls/app/lwIPSocket.c
0027-fix-mbedtls-Fix-call-send-callback-function-failed.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0028-feat-Add-USE_OPTIMIZE_PRINTF-in-third_party-Makefile.patch
Merged app/Makefile
0029-fix-api-Fix-ets_delay_us-declaration.patch
Upstream files only, osapi.h override non-conflicting
0030-fix-wifi-Remove-max_tx_power-in-wifi_country_t-in-li.patch
0031-fix-wifi-Fix-softAP-wrong-behavior-after-call-system.patch
0032-fix-wifi-bugfix-of-scan-fail-after-connected-if-max-.patch
0033-feat-at-Enable-scan-time-scan-type-and-add-scan-resu.patch
0034-feat-at-Add-command-AT-CWCOUNTRY.patch
0035-fix-at-Fix-that-AT-CIPSTART-causes-busy-if-the-serve.patch
Upstream files only
0036-feat-mbedtls-Speed-up-mbedtls-handshake-process.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0037-fix-api-Fix-os_calloc-declaration.patch
Merged app/include/lwip/mem.h; sdk-overrides/include/mem.h
non-conflicting.
0038-fix-mbedtls-Fix-disconnect-callback-function-never-b.patch
Merged app/mbedtls/app/espconn_mbedtls.c; minor revision to logic in
6576af959b1e704003ae5b93f6d6b89fcf86d429. Whitespace fixes.
0039-feat-at-Add-country-code-start-channel-in-AT-CWCOUNT.patch
0040-fix-net80211-Fix-Null-pointer-in-ieee80211_rfid_locp.patch
Upstream files only
0041-feat-wifi-Add-new-esp_init_data_default-v08-bin.patch
Upstream files only, but impacts Makefile
0042-fix-mbedtls-Fix-load-cert-fail-when-the-private-key-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0043-fix-wifi-The-start-channel-can-be-any-valid-channel.patch
0044-fix-wifi-Fix-scan-do-not-start-after-connect.patch
0045-feat-wifi-Add-keep-connection-for-station-to-keep-co.patch
0046-feat-at-Update-AT-version-to-1.6.0.0.patch
0047-fix-at-Fix-GSLP-too-long-time.patch
0048-fix-at-Fix-the-message-is-incorrect-when-creating-UD.patch
0049-feat-at-Add-AT-CIPSERVERMAXCONN.patch
Upstream files only
0050-feat-system-Add-softap-distributes-station-ip-event.patch
Upstream files only, user_interface.h override non-conflicting
0051-feat-example-Use-libmbedtls.a-instead-of-libssl.a-in.patch
Upstream files only
0052-feat-mesh-Remove-mesh-support.patch
Upstream files only, but go ahead and remove comment from
ld/nodemcu.ld.
0053-fix-example-Fix-forget-to-add-integer-parameter-when.patch
Upstream files only
0054-fix-mbedtls-Fix-reconnect_callback-is-not-triggered-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0055-feat-at-Add-AT-SYSMSG-to-enable-some-report-informat.patch
0056-fix-at-Fix-the-incorrect-link-id-when-client-connect.patch
0057-fix-at-Fix-the-bug-that-it-should-be-error-when-the-.patch
0058-fix-smartconfig-Fix-the-smartconfig-scan-time-issue.patch
0059-fix-lwip-Fix-the-bug-of-lwip-output.patch
Upstream files only
0060-fix-lwip-Fix-the-length-of-TCP-data-in-one-packet-is.patch
0061-fix-lwip-Fix-send-TCP-data-with-two-or-more-pbuf.patch
Merged app/lwip/core/tcp_out.c
0062-fix-wifi-Fix-assert-happen-when-smartconfig-start-th.patch
Upstream files only
0063-fix-mbedtls-Fix-memory-leak-when-ESP8266-as-SSL-TLS-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0064-fix-mbedtls-Fix-already-freed-and-exception-bug-when.patch
Merged app/mbedtls/app/lwIPSocket.c
0065-fix-at-Fix-bug-that-there-is-no-result-when-sending-.patch
0066-feat-example-Add-AT-bin-version.patch
0067-feat-version-Update-version-to-2.2.0-and-add-version.patch
0068-feat-bin-Update-AT-bin-for-SDK-2.2.0.patch
Upstream files only
Apply local changes to build:
app/include/lwip/app/espconn.h pulls changes (and license decl) from
upstream SDK. Makefile is altered to use this file ahead of the
SDK's.
Remove lwip's sntp support, since it was never really wired in anyway.
See https://github.com/nodemcu/nodemcu-firmware/issues/2042 for more
information. Patch Makefile to strip time.o, the consumer of lwip's
sntp functionality, from libmain.a, resulting in much
easier-to-understand error messages.
This has consequences for mbedtls. The simplest thing to do, which is,
impressively, not a change in behavior, is to completely disable TLS
certificate time validation; a later patch can optionally couple this to
RTCTIME support.
Similarly, it happens that the sqlite3 import was calling time(), but
this was not going to work out well for it. Just stub it out to always
return unix timestamp 0, as would have happened anyway.
Changes unprocessed:
0007-sync-from-080c37e1.patch
0008-feat-lib-Compile-some-libraries-with-ffunction-secti.patch
These two make changes to the linker script; perhaps
they are worth porting over, but I have not done so
here.
This is build-tested (ADC, BIT, COLOR_UTILS, CRON, CRYPTO, DHT, ENCODER,
FILE, GPIO, HTTP, I2C, MQTT, NET, NODE, OW, PCM, PERF, PWM, RTCFIFO,
RTCMEM, RTCTIME, SNTP, SPI, SQLITE3, STRUCT, TLS, TMR, UART, WIFI,
WS2812, WS2812_EFFECTS) and boots, but only limited run-time testing has
been performed. Testing done does, however, include having made a few
TLS connections through the HTTP module, so things are not hopelessly
broken, at the very least.
2018-02-20 03:03:09 +01:00
|
|
|
rm -f $(SDK_DIR)/lib/liblwip.a $(SDK_DIR)/lib/libssl.a $(SDK_DIR)/lib/libmbedtls.a
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) PRUNE libmain.a libc.a
|
2019-05-01 19:29:11 +02:00
|
|
|
echo $(PATH)
|
2018-08-01 22:18:53 +02:00
|
|
|
$(AR) d $(SDK_DIR)/lib/libmain.a time.o
|
|
|
|
$(AR) d $(SDK_DIR)/lib/libc.a lib_a-time.o
|
2016-07-22 23:18:47 +02:00
|
|
|
touch $@
|
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
$(TOP_DIR)/cache/$(SDK_FILE_VER).zip:
|
2016-01-10 07:57:24 +01:00
|
|
|
mkdir -p "$(dir $@)"
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) WGET $(patsubst $(TOP_DIR)/%,%,$@)
|
2019-05-01 19:29:11 +02:00
|
|
|
$(WGET) $(GITHUB_SDK)/archive/$(SDK_FILE_VER).zip -O $@ || { rm -f "$@"; exit 1; }
|
2019-05-17 14:04:19 +02:00
|
|
|
if test "$(SDK_FILE_SHA1)" != "NA"; then echo "$(SDK_FILE_SHA1) $@" | sha1sum -c - || { rm -f "$@"; exit 1; }; fi
|
2016-01-10 07:57:24 +01:00
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
clean:
|
|
|
|
$(foreach d, $(SUBDIRS), $(MAKE) -C $(d) clean;)
|
|
|
|
$(RM) -r $(ODIR)/$(TARGET)/$(FLAVOR)
|
2015-12-20 04:39:17 +01:00
|
|
|
$(RM) -r "$(TOP_DIR)/sdk"
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
clobber: $(SPECIAL_CLOBBER)
|
|
|
|
$(foreach d, $(SUBDIRS), $(MAKE) -C $(d) clobber;)
|
|
|
|
$(RM) -r $(ODIR)
|
|
|
|
|
2016-08-06 21:46:42 +02:00
|
|
|
flash:
|
|
|
|
@echo "use one of the following targets to flash the firmware"
|
2019-02-18 14:18:47 +01:00
|
|
|
@echo " make flash512k - for ESP with 512kB flash size"
|
|
|
|
@echo " make flash1m-dout - for ESP with 1MB flash size and flash mode = dout (Sonoff, ESP8285)"
|
|
|
|
@echo " make flash4m - for ESP with 4MB flash size"
|
2016-08-06 21:46:42 +02:00
|
|
|
|
|
|
|
flash512k:
|
|
|
|
$(MAKE) -e FLASHOPTIONS="-fm qio -fs 4m -ff 40m" flashinternal
|
|
|
|
|
|
|
|
flash4m:
|
|
|
|
$(MAKE) -e FLASHOPTIONS="-fm dio -fs 32m -ff 40m" flashinternal
|
|
|
|
|
2019-02-18 14:18:47 +01:00
|
|
|
flash1m-dout:
|
|
|
|
$(MAKE) -e FLASHOPTIONS="-fm dout -fs 8m -ff 40m" flashinternal
|
|
|
|
|
|
|
|
|
2016-08-06 21:46:42 +02:00
|
|
|
flashinternal:
|
2015-01-10 21:48:04 +01:00
|
|
|
ifndef PDIR
|
2019-07-23 17:47:18 +02:00
|
|
|
$(MAKE) -C $(APP_DIR) flashinternal
|
2015-01-10 21:48:04 +01:00
|
|
|
else
|
2019-02-18 14:18:47 +01:00
|
|
|
$(ESPTOOL) --port $(ESPPORT) --baud $(BAUDRATE) write_flash $(FLASHOPTIONS) 0x00000 $(FIRMWAREDIR)0x00000.bin 0x10000 $(FIRMWAREDIR)0x10000.bin
|
2015-01-10 21:48:04 +01:00
|
|
|
endif
|
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
.subdirs:
|
|
|
|
@set -e; $(foreach d, $(SUBDIRS), $(MAKE) -C $(d);)
|
|
|
|
|
|
|
|
ifneq ($(MAKECMDGOALS),clean)
|
2019-05-01 19:29:11 +02:00
|
|
|
ifneq ($(MAKECMDGOALS),clobber)
|
|
|
|
ifdef DEPS
|
|
|
|
sinclude $(DEPS)
|
|
|
|
endif
|
|
|
|
endif
|
2014-12-22 12:35:05 +01:00
|
|
|
endif
|
|
|
|
|
2016-06-05 23:10:58 +02:00
|
|
|
.PHONY: spiffs-image-remove
|
|
|
|
|
|
|
|
spiffs-image-remove:
|
2016-09-21 03:45:53 +02:00
|
|
|
$(MAKE) -C tools remove-image spiffsimg/spiffsimg
|
2016-06-05 23:10:58 +02:00
|
|
|
|
|
|
|
.PHONY: spiffs-image
|
|
|
|
|
|
|
|
spiffs-image: bin/0x10000.bin
|
|
|
|
$(MAKE) -C tools
|
2019-07-23 17:47:18 +02:00
|
|
|
############ Note: this target needs moving into app/modules make ############
|
2016-03-07 02:25:05 +01:00
|
|
|
.PHONY: pre_build
|
|
|
|
|
|
|
|
ifneq ($(wildcard $(TOP_DIR)/server-ca.crt),)
|
2019-07-23 17:47:18 +02:00
|
|
|
pre_build: $(APP_DIR)/modules/server-ca.crt.h
|
2016-06-05 23:10:58 +02:00
|
|
|
|
2019-07-23 17:47:18 +02:00
|
|
|
$(APP_DIR)/modules/server-ca.crt.h: $(TOP_DIR)/server-ca.crt
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) MKCERT $(patsubst $(TOP_DIR)/%,%,$<)
|
2019-07-23 17:47:18 +02:00
|
|
|
python $(TOP_DIR)/tools/make_server_cert.py $(TOP_DIR)/server-ca.crt > $(APP_DIR)/modules/server-ca.crt.h
|
2016-06-05 23:10:58 +02:00
|
|
|
|
2016-03-07 02:25:05 +01:00
|
|
|
DEFINES += -DHAVE_SSL_SERVER_CRT=\"server-ca.crt.h\"
|
|
|
|
else
|
2016-03-10 04:33:19 +01:00
|
|
|
pre_build:
|
2019-07-23 17:47:18 +02:00
|
|
|
@-rm -f $(APP_DIR)/modules/server-ca.crt.h
|
2016-03-07 02:25:05 +01:00
|
|
|
endif
|
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
ifdef TARGET
|
2014-12-22 12:35:05 +01:00
|
|
|
$(OBJODIR)/%.o: %.c
|
2017-11-18 21:29:57 +01:00
|
|
|
@mkdir -p $(dir $@);
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) CC $(patsubst $(TOP_DIR)/%,%,$(CURDIR))/$<
|
2014-12-22 12:35:05 +01:00
|
|
|
$(CC) $(if $(findstring $<,$(DSRCS)),$(DFLAGS),$(CFLAGS)) $(COPTS_$(*F)) -o $@ -c $<
|
|
|
|
|
|
|
|
$(OBJODIR)/%.d: %.c
|
2017-11-18 21:29:57 +01:00
|
|
|
@mkdir -p $(dir $@);
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) DEPEND: CC $(patsubst $(TOP_DIR)/%,%,$(CURDIR))/$<
|
2014-12-22 12:35:05 +01:00
|
|
|
@set -e; rm -f $@; \
|
|
|
|
$(CC) -M $(CFLAGS) $< > $@.$$$$; \
|
|
|
|
sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \
|
|
|
|
rm -f $@.$$$$
|
|
|
|
|
Update to sdk 2.2
Initial commit for
https://github.com/nodemcu/nodemcu-firmware/issues/2225 .
Replay patches from Espressif's repository at
https://github.com/espressif/ESP8266_NONOS_SDK between tags v2.1.0 and
v2.2.0:
0001-sync-from-ccca00f2.patch
Superseded by existing changes, but lines reordered in app/driver/key.c
to minimize divergences.
0002-sync-from-3f38ad5a.patch
Upstream files only
0003-Update-links.patch
Not meaningful to NodeMCU
0004-sync-from-01990ad0.patch
0005-sync-from-cdf6877d.patch
Upstream files only
0006-sync-from-f29e744c.patch
Upstream files only, user_interface.h override non-conflicting
0009-feat-lwip-Move-lwip-source-code-to-third_party-folde.patch
Merged change to lwip/app/espconn_udp.c; rest is just moves or
appears to not apply.
0010-feat-mbedtls-Add-mbedtls-source-code-in-third_party-.patch
Does not apply; we use our own mbedtls
0011-added-C-support.patch
Merged to Makefile
0012-feat-mbedtls-Rebuild-libmbedtls.patch
Already applied
0013-fix-at-Fix-some-bugs-of-AT.patch
Upstream files only
0014-feat-err_t-Redefine-err_t-to-s32_t.patch
Merged to app/include/arch/cc.h and ./app/include/lwip/app/espconn.h;
the rest is upstream files.
0015-fix-wpa-Fix-wpa-wpa2-ptk-gtk-reinstallation-vulnerab.patch
0016-fix-wifi-Remove-group-key-entry-before-connecting-to.patch
0017-feat-lib-Remove-time-function-in-libmain.patch
Upstream files only
0018-feat-espconn-Modification-for-espconn.patch
Merged to app/include/lwip/app/espconn.h,
app/include/lwip/app/espconn_tcp.h, app/lwip/app/espconn.c,
app/lwip/app/espconn_tcp.c
0019-feat-at-Use-new-espconn_recv-to-fix-tcp-server-issue.patch
0020-feat-examples-Update-mqtt-demo-and-auto-bin-generate.patch
Upstream files only
0021-wifi-Add-scan-threshold-and-dwell-time.patch
0022-feat-wifi-Add-country-code-API.patch
0023-feat-wifi-Record-more-information-of-scanned-ap.patch
Upstream files only, user_interface.h override non-conflicting
0024-fix-example-Fix-IoT_Demo-user-sector-error.patch
Upstream files only
0025-fix-lwip-Fix-sequence-number-error-of-RST-ACK.patch
Merged app/lwip/core/tcp_in.c
0026-fix-mbedtls-Fix-memory-leak.patch
Merged app/mbedtls/app/lwIPSocket.c
0027-fix-mbedtls-Fix-call-send-callback-function-failed.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0028-feat-Add-USE_OPTIMIZE_PRINTF-in-third_party-Makefile.patch
Merged app/Makefile
0029-fix-api-Fix-ets_delay_us-declaration.patch
Upstream files only, osapi.h override non-conflicting
0030-fix-wifi-Remove-max_tx_power-in-wifi_country_t-in-li.patch
0031-fix-wifi-Fix-softAP-wrong-behavior-after-call-system.patch
0032-fix-wifi-bugfix-of-scan-fail-after-connected-if-max-.patch
0033-feat-at-Enable-scan-time-scan-type-and-add-scan-resu.patch
0034-feat-at-Add-command-AT-CWCOUNTRY.patch
0035-fix-at-Fix-that-AT-CIPSTART-causes-busy-if-the-serve.patch
Upstream files only
0036-feat-mbedtls-Speed-up-mbedtls-handshake-process.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0037-fix-api-Fix-os_calloc-declaration.patch
Merged app/include/lwip/mem.h; sdk-overrides/include/mem.h
non-conflicting.
0038-fix-mbedtls-Fix-disconnect-callback-function-never-b.patch
Merged app/mbedtls/app/espconn_mbedtls.c; minor revision to logic in
6576af959b1e704003ae5b93f6d6b89fcf86d429. Whitespace fixes.
0039-feat-at-Add-country-code-start-channel-in-AT-CWCOUNT.patch
0040-fix-net80211-Fix-Null-pointer-in-ieee80211_rfid_locp.patch
Upstream files only
0041-feat-wifi-Add-new-esp_init_data_default-v08-bin.patch
Upstream files only, but impacts Makefile
0042-fix-mbedtls-Fix-load-cert-fail-when-the-private-key-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0043-fix-wifi-The-start-channel-can-be-any-valid-channel.patch
0044-fix-wifi-Fix-scan-do-not-start-after-connect.patch
0045-feat-wifi-Add-keep-connection-for-station-to-keep-co.patch
0046-feat-at-Update-AT-version-to-1.6.0.0.patch
0047-fix-at-Fix-GSLP-too-long-time.patch
0048-fix-at-Fix-the-message-is-incorrect-when-creating-UD.patch
0049-feat-at-Add-AT-CIPSERVERMAXCONN.patch
Upstream files only
0050-feat-system-Add-softap-distributes-station-ip-event.patch
Upstream files only, user_interface.h override non-conflicting
0051-feat-example-Use-libmbedtls.a-instead-of-libssl.a-in.patch
Upstream files only
0052-feat-mesh-Remove-mesh-support.patch
Upstream files only, but go ahead and remove comment from
ld/nodemcu.ld.
0053-fix-example-Fix-forget-to-add-integer-parameter-when.patch
Upstream files only
0054-fix-mbedtls-Fix-reconnect_callback-is-not-triggered-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0055-feat-at-Add-AT-SYSMSG-to-enable-some-report-informat.patch
0056-fix-at-Fix-the-incorrect-link-id-when-client-connect.patch
0057-fix-at-Fix-the-bug-that-it-should-be-error-when-the-.patch
0058-fix-smartconfig-Fix-the-smartconfig-scan-time-issue.patch
0059-fix-lwip-Fix-the-bug-of-lwip-output.patch
Upstream files only
0060-fix-lwip-Fix-the-length-of-TCP-data-in-one-packet-is.patch
0061-fix-lwip-Fix-send-TCP-data-with-two-or-more-pbuf.patch
Merged app/lwip/core/tcp_out.c
0062-fix-wifi-Fix-assert-happen-when-smartconfig-start-th.patch
Upstream files only
0063-fix-mbedtls-Fix-memory-leak-when-ESP8266-as-SSL-TLS-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0064-fix-mbedtls-Fix-already-freed-and-exception-bug-when.patch
Merged app/mbedtls/app/lwIPSocket.c
0065-fix-at-Fix-bug-that-there-is-no-result-when-sending-.patch
0066-feat-example-Add-AT-bin-version.patch
0067-feat-version-Update-version-to-2.2.0-and-add-version.patch
0068-feat-bin-Update-AT-bin-for-SDK-2.2.0.patch
Upstream files only
Apply local changes to build:
app/include/lwip/app/espconn.h pulls changes (and license decl) from
upstream SDK. Makefile is altered to use this file ahead of the
SDK's.
Remove lwip's sntp support, since it was never really wired in anyway.
See https://github.com/nodemcu/nodemcu-firmware/issues/2042 for more
information. Patch Makefile to strip time.o, the consumer of lwip's
sntp functionality, from libmain.a, resulting in much
easier-to-understand error messages.
This has consequences for mbedtls. The simplest thing to do, which is,
impressively, not a change in behavior, is to completely disable TLS
certificate time validation; a later patch can optionally couple this to
RTCTIME support.
Similarly, it happens that the sqlite3 import was calling time(), but
this was not going to work out well for it. Just stub it out to always
return unix timestamp 0, as would have happened anyway.
Changes unprocessed:
0007-sync-from-080c37e1.patch
0008-feat-lib-Compile-some-libraries-with-ffunction-secti.patch
These two make changes to the linker script; perhaps
they are worth porting over, but I have not done so
here.
This is build-tested (ADC, BIT, COLOR_UTILS, CRON, CRYPTO, DHT, ENCODER,
FILE, GPIO, HTTP, I2C, MQTT, NET, NODE, OW, PCM, PERF, PWM, RTCFIFO,
RTCMEM, RTCTIME, SNTP, SPI, SQLITE3, STRUCT, TLS, TMR, UART, WIFI,
WS2812, WS2812_EFFECTS) and boots, but only limited run-time testing has
been performed. Testing done does, however, include having made a few
TLS connections through the HTTP module, so things are not hopelessly
broken, at the very least.
2018-02-20 03:03:09 +01:00
|
|
|
$(OBJODIR)/%.o: %.cpp
|
|
|
|
@mkdir -p $(OBJODIR);
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) CXX $(patsubst $(TOP_DIR)/%,%,$(CURDIR))/$<
|
Update to sdk 2.2
Initial commit for
https://github.com/nodemcu/nodemcu-firmware/issues/2225 .
Replay patches from Espressif's repository at
https://github.com/espressif/ESP8266_NONOS_SDK between tags v2.1.0 and
v2.2.0:
0001-sync-from-ccca00f2.patch
Superseded by existing changes, but lines reordered in app/driver/key.c
to minimize divergences.
0002-sync-from-3f38ad5a.patch
Upstream files only
0003-Update-links.patch
Not meaningful to NodeMCU
0004-sync-from-01990ad0.patch
0005-sync-from-cdf6877d.patch
Upstream files only
0006-sync-from-f29e744c.patch
Upstream files only, user_interface.h override non-conflicting
0009-feat-lwip-Move-lwip-source-code-to-third_party-folde.patch
Merged change to lwip/app/espconn_udp.c; rest is just moves or
appears to not apply.
0010-feat-mbedtls-Add-mbedtls-source-code-in-third_party-.patch
Does not apply; we use our own mbedtls
0011-added-C-support.patch
Merged to Makefile
0012-feat-mbedtls-Rebuild-libmbedtls.patch
Already applied
0013-fix-at-Fix-some-bugs-of-AT.patch
Upstream files only
0014-feat-err_t-Redefine-err_t-to-s32_t.patch
Merged to app/include/arch/cc.h and ./app/include/lwip/app/espconn.h;
the rest is upstream files.
0015-fix-wpa-Fix-wpa-wpa2-ptk-gtk-reinstallation-vulnerab.patch
0016-fix-wifi-Remove-group-key-entry-before-connecting-to.patch
0017-feat-lib-Remove-time-function-in-libmain.patch
Upstream files only
0018-feat-espconn-Modification-for-espconn.patch
Merged to app/include/lwip/app/espconn.h,
app/include/lwip/app/espconn_tcp.h, app/lwip/app/espconn.c,
app/lwip/app/espconn_tcp.c
0019-feat-at-Use-new-espconn_recv-to-fix-tcp-server-issue.patch
0020-feat-examples-Update-mqtt-demo-and-auto-bin-generate.patch
Upstream files only
0021-wifi-Add-scan-threshold-and-dwell-time.patch
0022-feat-wifi-Add-country-code-API.patch
0023-feat-wifi-Record-more-information-of-scanned-ap.patch
Upstream files only, user_interface.h override non-conflicting
0024-fix-example-Fix-IoT_Demo-user-sector-error.patch
Upstream files only
0025-fix-lwip-Fix-sequence-number-error-of-RST-ACK.patch
Merged app/lwip/core/tcp_in.c
0026-fix-mbedtls-Fix-memory-leak.patch
Merged app/mbedtls/app/lwIPSocket.c
0027-fix-mbedtls-Fix-call-send-callback-function-failed.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0028-feat-Add-USE_OPTIMIZE_PRINTF-in-third_party-Makefile.patch
Merged app/Makefile
0029-fix-api-Fix-ets_delay_us-declaration.patch
Upstream files only, osapi.h override non-conflicting
0030-fix-wifi-Remove-max_tx_power-in-wifi_country_t-in-li.patch
0031-fix-wifi-Fix-softAP-wrong-behavior-after-call-system.patch
0032-fix-wifi-bugfix-of-scan-fail-after-connected-if-max-.patch
0033-feat-at-Enable-scan-time-scan-type-and-add-scan-resu.patch
0034-feat-at-Add-command-AT-CWCOUNTRY.patch
0035-fix-at-Fix-that-AT-CIPSTART-causes-busy-if-the-serve.patch
Upstream files only
0036-feat-mbedtls-Speed-up-mbedtls-handshake-process.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0037-fix-api-Fix-os_calloc-declaration.patch
Merged app/include/lwip/mem.h; sdk-overrides/include/mem.h
non-conflicting.
0038-fix-mbedtls-Fix-disconnect-callback-function-never-b.patch
Merged app/mbedtls/app/espconn_mbedtls.c; minor revision to logic in
6576af959b1e704003ae5b93f6d6b89fcf86d429. Whitespace fixes.
0039-feat-at-Add-country-code-start-channel-in-AT-CWCOUNT.patch
0040-fix-net80211-Fix-Null-pointer-in-ieee80211_rfid_locp.patch
Upstream files only
0041-feat-wifi-Add-new-esp_init_data_default-v08-bin.patch
Upstream files only, but impacts Makefile
0042-fix-mbedtls-Fix-load-cert-fail-when-the-private-key-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0043-fix-wifi-The-start-channel-can-be-any-valid-channel.patch
0044-fix-wifi-Fix-scan-do-not-start-after-connect.patch
0045-feat-wifi-Add-keep-connection-for-station-to-keep-co.patch
0046-feat-at-Update-AT-version-to-1.6.0.0.patch
0047-fix-at-Fix-GSLP-too-long-time.patch
0048-fix-at-Fix-the-message-is-incorrect-when-creating-UD.patch
0049-feat-at-Add-AT-CIPSERVERMAXCONN.patch
Upstream files only
0050-feat-system-Add-softap-distributes-station-ip-event.patch
Upstream files only, user_interface.h override non-conflicting
0051-feat-example-Use-libmbedtls.a-instead-of-libssl.a-in.patch
Upstream files only
0052-feat-mesh-Remove-mesh-support.patch
Upstream files only, but go ahead and remove comment from
ld/nodemcu.ld.
0053-fix-example-Fix-forget-to-add-integer-parameter-when.patch
Upstream files only
0054-fix-mbedtls-Fix-reconnect_callback-is-not-triggered-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0055-feat-at-Add-AT-SYSMSG-to-enable-some-report-informat.patch
0056-fix-at-Fix-the-incorrect-link-id-when-client-connect.patch
0057-fix-at-Fix-the-bug-that-it-should-be-error-when-the-.patch
0058-fix-smartconfig-Fix-the-smartconfig-scan-time-issue.patch
0059-fix-lwip-Fix-the-bug-of-lwip-output.patch
Upstream files only
0060-fix-lwip-Fix-the-length-of-TCP-data-in-one-packet-is.patch
0061-fix-lwip-Fix-send-TCP-data-with-two-or-more-pbuf.patch
Merged app/lwip/core/tcp_out.c
0062-fix-wifi-Fix-assert-happen-when-smartconfig-start-th.patch
Upstream files only
0063-fix-mbedtls-Fix-memory-leak-when-ESP8266-as-SSL-TLS-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0064-fix-mbedtls-Fix-already-freed-and-exception-bug-when.patch
Merged app/mbedtls/app/lwIPSocket.c
0065-fix-at-Fix-bug-that-there-is-no-result-when-sending-.patch
0066-feat-example-Add-AT-bin-version.patch
0067-feat-version-Update-version-to-2.2.0-and-add-version.patch
0068-feat-bin-Update-AT-bin-for-SDK-2.2.0.patch
Upstream files only
Apply local changes to build:
app/include/lwip/app/espconn.h pulls changes (and license decl) from
upstream SDK. Makefile is altered to use this file ahead of the
SDK's.
Remove lwip's sntp support, since it was never really wired in anyway.
See https://github.com/nodemcu/nodemcu-firmware/issues/2042 for more
information. Patch Makefile to strip time.o, the consumer of lwip's
sntp functionality, from libmain.a, resulting in much
easier-to-understand error messages.
This has consequences for mbedtls. The simplest thing to do, which is,
impressively, not a change in behavior, is to completely disable TLS
certificate time validation; a later patch can optionally couple this to
RTCTIME support.
Similarly, it happens that the sqlite3 import was calling time(), but
this was not going to work out well for it. Just stub it out to always
return unix timestamp 0, as would have happened anyway.
Changes unprocessed:
0007-sync-from-080c37e1.patch
0008-feat-lib-Compile-some-libraries-with-ffunction-secti.patch
These two make changes to the linker script; perhaps
they are worth porting over, but I have not done so
here.
This is build-tested (ADC, BIT, COLOR_UTILS, CRON, CRYPTO, DHT, ENCODER,
FILE, GPIO, HTTP, I2C, MQTT, NET, NODE, OW, PCM, PERF, PWM, RTCFIFO,
RTCMEM, RTCTIME, SNTP, SPI, SQLITE3, STRUCT, TLS, TMR, UART, WIFI,
WS2812, WS2812_EFFECTS) and boots, but only limited run-time testing has
been performed. Testing done does, however, include having made a few
TLS connections through the HTTP module, so things are not hopelessly
broken, at the very least.
2018-02-20 03:03:09 +01:00
|
|
|
$(CXX) $(if $(findstring $<,$(DSRCS)),$(DFLAGS),$(CFLAGS)) $(COPTS_$(*F)) -o $@ -c $<
|
|
|
|
|
|
|
|
$(OBJODIR)/%.d: %.cpp
|
|
|
|
@mkdir -p $(OBJODIR);
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) DEPEND: CXX $(patsubst $(TOP_DIR)/%,%,$(CURDIR))/$<
|
Update to sdk 2.2
Initial commit for
https://github.com/nodemcu/nodemcu-firmware/issues/2225 .
Replay patches from Espressif's repository at
https://github.com/espressif/ESP8266_NONOS_SDK between tags v2.1.0 and
v2.2.0:
0001-sync-from-ccca00f2.patch
Superseded by existing changes, but lines reordered in app/driver/key.c
to minimize divergences.
0002-sync-from-3f38ad5a.patch
Upstream files only
0003-Update-links.patch
Not meaningful to NodeMCU
0004-sync-from-01990ad0.patch
0005-sync-from-cdf6877d.patch
Upstream files only
0006-sync-from-f29e744c.patch
Upstream files only, user_interface.h override non-conflicting
0009-feat-lwip-Move-lwip-source-code-to-third_party-folde.patch
Merged change to lwip/app/espconn_udp.c; rest is just moves or
appears to not apply.
0010-feat-mbedtls-Add-mbedtls-source-code-in-third_party-.patch
Does not apply; we use our own mbedtls
0011-added-C-support.patch
Merged to Makefile
0012-feat-mbedtls-Rebuild-libmbedtls.patch
Already applied
0013-fix-at-Fix-some-bugs-of-AT.patch
Upstream files only
0014-feat-err_t-Redefine-err_t-to-s32_t.patch
Merged to app/include/arch/cc.h and ./app/include/lwip/app/espconn.h;
the rest is upstream files.
0015-fix-wpa-Fix-wpa-wpa2-ptk-gtk-reinstallation-vulnerab.patch
0016-fix-wifi-Remove-group-key-entry-before-connecting-to.patch
0017-feat-lib-Remove-time-function-in-libmain.patch
Upstream files only
0018-feat-espconn-Modification-for-espconn.patch
Merged to app/include/lwip/app/espconn.h,
app/include/lwip/app/espconn_tcp.h, app/lwip/app/espconn.c,
app/lwip/app/espconn_tcp.c
0019-feat-at-Use-new-espconn_recv-to-fix-tcp-server-issue.patch
0020-feat-examples-Update-mqtt-demo-and-auto-bin-generate.patch
Upstream files only
0021-wifi-Add-scan-threshold-and-dwell-time.patch
0022-feat-wifi-Add-country-code-API.patch
0023-feat-wifi-Record-more-information-of-scanned-ap.patch
Upstream files only, user_interface.h override non-conflicting
0024-fix-example-Fix-IoT_Demo-user-sector-error.patch
Upstream files only
0025-fix-lwip-Fix-sequence-number-error-of-RST-ACK.patch
Merged app/lwip/core/tcp_in.c
0026-fix-mbedtls-Fix-memory-leak.patch
Merged app/mbedtls/app/lwIPSocket.c
0027-fix-mbedtls-Fix-call-send-callback-function-failed.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0028-feat-Add-USE_OPTIMIZE_PRINTF-in-third_party-Makefile.patch
Merged app/Makefile
0029-fix-api-Fix-ets_delay_us-declaration.patch
Upstream files only, osapi.h override non-conflicting
0030-fix-wifi-Remove-max_tx_power-in-wifi_country_t-in-li.patch
0031-fix-wifi-Fix-softAP-wrong-behavior-after-call-system.patch
0032-fix-wifi-bugfix-of-scan-fail-after-connected-if-max-.patch
0033-feat-at-Enable-scan-time-scan-type-and-add-scan-resu.patch
0034-feat-at-Add-command-AT-CWCOUNTRY.patch
0035-fix-at-Fix-that-AT-CIPSTART-causes-busy-if-the-serve.patch
Upstream files only
0036-feat-mbedtls-Speed-up-mbedtls-handshake-process.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0037-fix-api-Fix-os_calloc-declaration.patch
Merged app/include/lwip/mem.h; sdk-overrides/include/mem.h
non-conflicting.
0038-fix-mbedtls-Fix-disconnect-callback-function-never-b.patch
Merged app/mbedtls/app/espconn_mbedtls.c; minor revision to logic in
6576af959b1e704003ae5b93f6d6b89fcf86d429. Whitespace fixes.
0039-feat-at-Add-country-code-start-channel-in-AT-CWCOUNT.patch
0040-fix-net80211-Fix-Null-pointer-in-ieee80211_rfid_locp.patch
Upstream files only
0041-feat-wifi-Add-new-esp_init_data_default-v08-bin.patch
Upstream files only, but impacts Makefile
0042-fix-mbedtls-Fix-load-cert-fail-when-the-private-key-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0043-fix-wifi-The-start-channel-can-be-any-valid-channel.patch
0044-fix-wifi-Fix-scan-do-not-start-after-connect.patch
0045-feat-wifi-Add-keep-connection-for-station-to-keep-co.patch
0046-feat-at-Update-AT-version-to-1.6.0.0.patch
0047-fix-at-Fix-GSLP-too-long-time.patch
0048-fix-at-Fix-the-message-is-incorrect-when-creating-UD.patch
0049-feat-at-Add-AT-CIPSERVERMAXCONN.patch
Upstream files only
0050-feat-system-Add-softap-distributes-station-ip-event.patch
Upstream files only, user_interface.h override non-conflicting
0051-feat-example-Use-libmbedtls.a-instead-of-libssl.a-in.patch
Upstream files only
0052-feat-mesh-Remove-mesh-support.patch
Upstream files only, but go ahead and remove comment from
ld/nodemcu.ld.
0053-fix-example-Fix-forget-to-add-integer-parameter-when.patch
Upstream files only
0054-fix-mbedtls-Fix-reconnect_callback-is-not-triggered-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0055-feat-at-Add-AT-SYSMSG-to-enable-some-report-informat.patch
0056-fix-at-Fix-the-incorrect-link-id-when-client-connect.patch
0057-fix-at-Fix-the-bug-that-it-should-be-error-when-the-.patch
0058-fix-smartconfig-Fix-the-smartconfig-scan-time-issue.patch
0059-fix-lwip-Fix-the-bug-of-lwip-output.patch
Upstream files only
0060-fix-lwip-Fix-the-length-of-TCP-data-in-one-packet-is.patch
0061-fix-lwip-Fix-send-TCP-data-with-two-or-more-pbuf.patch
Merged app/lwip/core/tcp_out.c
0062-fix-wifi-Fix-assert-happen-when-smartconfig-start-th.patch
Upstream files only
0063-fix-mbedtls-Fix-memory-leak-when-ESP8266-as-SSL-TLS-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0064-fix-mbedtls-Fix-already-freed-and-exception-bug-when.patch
Merged app/mbedtls/app/lwIPSocket.c
0065-fix-at-Fix-bug-that-there-is-no-result-when-sending-.patch
0066-feat-example-Add-AT-bin-version.patch
0067-feat-version-Update-version-to-2.2.0-and-add-version.patch
0068-feat-bin-Update-AT-bin-for-SDK-2.2.0.patch
Upstream files only
Apply local changes to build:
app/include/lwip/app/espconn.h pulls changes (and license decl) from
upstream SDK. Makefile is altered to use this file ahead of the
SDK's.
Remove lwip's sntp support, since it was never really wired in anyway.
See https://github.com/nodemcu/nodemcu-firmware/issues/2042 for more
information. Patch Makefile to strip time.o, the consumer of lwip's
sntp functionality, from libmain.a, resulting in much
easier-to-understand error messages.
This has consequences for mbedtls. The simplest thing to do, which is,
impressively, not a change in behavior, is to completely disable TLS
certificate time validation; a later patch can optionally couple this to
RTCTIME support.
Similarly, it happens that the sqlite3 import was calling time(), but
this was not going to work out well for it. Just stub it out to always
return unix timestamp 0, as would have happened anyway.
Changes unprocessed:
0007-sync-from-080c37e1.patch
0008-feat-lib-Compile-some-libraries-with-ffunction-secti.patch
These two make changes to the linker script; perhaps
they are worth porting over, but I have not done so
here.
This is build-tested (ADC, BIT, COLOR_UTILS, CRON, CRYPTO, DHT, ENCODER,
FILE, GPIO, HTTP, I2C, MQTT, NET, NODE, OW, PCM, PERF, PWM, RTCFIFO,
RTCMEM, RTCTIME, SNTP, SPI, SQLITE3, STRUCT, TLS, TMR, UART, WIFI,
WS2812, WS2812_EFFECTS) and boots, but only limited run-time testing has
been performed. Testing done does, however, include having made a few
TLS connections through the HTTP module, so things are not hopelessly
broken, at the very least.
2018-02-20 03:03:09 +01:00
|
|
|
@set -e; rm -f $@; \
|
|
|
|
sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \
|
|
|
|
rm -f $@.$$$$
|
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
$(OBJODIR)/%.o: %.s
|
2017-11-18 21:29:57 +01:00
|
|
|
@mkdir -p $(dir $@);
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) CC $(patsubst $(TOP_DIR)/%,%,$(CURDIR))/$<
|
2014-12-22 12:35:05 +01:00
|
|
|
$(CC) $(CFLAGS) -o $@ -c $<
|
|
|
|
|
|
|
|
$(OBJODIR)/%.d: %.s
|
2017-11-18 21:29:57 +01:00
|
|
|
@mkdir -p $(dir $@); \
|
2014-12-22 12:35:05 +01:00
|
|
|
set -e; rm -f $@; \
|
|
|
|
$(CC) -M $(CFLAGS) $< > $@.$$$$; \
|
|
|
|
sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \
|
|
|
|
rm -f $@.$$$$
|
|
|
|
|
|
|
|
$(OBJODIR)/%.o: %.S
|
2017-11-18 21:29:57 +01:00
|
|
|
@mkdir -p $(dir $@);
|
2018-12-09 21:39:43 +01:00
|
|
|
$(summary) CC $(patsubst $(TOP_DIR)/%,%,$(CURDIR))/$<
|
2014-12-22 12:35:05 +01:00
|
|
|
$(CC) $(CFLAGS) -D__ASSEMBLER__ -o $@ -c $<
|
|
|
|
|
|
|
|
$(OBJODIR)/%.d: %.S
|
2017-11-18 21:29:57 +01:00
|
|
|
@mkdir -p $(dir $@); \
|
2014-12-22 12:35:05 +01:00
|
|
|
set -e; rm -f $@; \
|
|
|
|
$(CC) -M $(CFLAGS) $< > $@.$$$$; \
|
|
|
|
sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \
|
|
|
|
rm -f $@.$$$$
|
|
|
|
|
|
|
|
$(foreach lib,$(GEN_LIBS),$(eval $(call ShortcutRule,$(lib),$(LIBODIR))))
|
|
|
|
|
|
|
|
$(foreach image,$(GEN_IMAGES),$(eval $(call ShortcutRule,$(image),$(IMAGEODIR))))
|
|
|
|
|
|
|
|
$(foreach bin,$(GEN_BINS),$(eval $(call ShortcutRule,$(bin),$(BINODIR))))
|
|
|
|
|
|
|
|
$(foreach lib,$(GEN_LIBS),$(eval $(call MakeLibrary,$(basename $(lib)))))
|
|
|
|
|
|
|
|
$(foreach image,$(GEN_IMAGES),$(eval $(call MakeImage,$(basename $(image)))))
|
|
|
|
|
2019-05-01 19:29:11 +02:00
|
|
|
endif # TARGET
|
2014-12-22 12:35:05 +01:00
|
|
|
#############################################################
|
|
|
|
# Recursion Magic - Don't touch this!!
|
|
|
|
#
|
|
|
|
# Each subtree potentially has an include directory
|
|
|
|
# corresponding to the common APIs applicable to modules
|
|
|
|
# rooted at that subtree. Accordingly, the INCLUDE PATH
|
|
|
|
# of a module can only contain the include directories up
|
|
|
|
# its parent path, and not its siblings
|
|
|
|
#
|
|
|
|
# Required for each makefile to inherit from the parent
|
|
|
|
#
|
|
|
|
|
|
|
|
PDIR := ../$(PDIR)
|
|
|
|
sinclude $(PDIR)Makefile
|