2014-12-22 12:35:05 +01:00
|
|
|
#############################################################
|
|
|
|
# Required variables for each makefile
|
|
|
|
# Discard this section from all parent makefiles
|
|
|
|
# Expected variables (with automatic defaults):
|
|
|
|
# CSRCS (all "C" files in the dir)
|
|
|
|
# SUBDIRS (all subdirs with a Makefile)
|
|
|
|
# GEN_LIBS - list of libs to be generated ()
|
|
|
|
# GEN_IMAGES - list of object file images to be generated ()
|
|
|
|
# GEN_BINS - list of binaries to be generated ()
|
|
|
|
# COMPONENTS_xxx - a list of libs/objs in the form
|
|
|
|
# subdir/lib to be extracted and rolled up into
|
|
|
|
# a generated lib/image xxx.a ()
|
|
|
|
#
|
|
|
|
TARGET = eagle
|
|
|
|
#FLAVOR = release
|
|
|
|
FLAVOR = debug
|
|
|
|
|
|
|
|
#EXTRA_CCFLAGS += -u
|
|
|
|
|
|
|
|
ifndef PDIR # {
|
|
|
|
GEN_IMAGES= eagle.app.v6.out
|
|
|
|
GEN_BINS= eagle.app.v6.bin
|
|
|
|
SPECIAL_MKTARGETS=$(APP_MKTARGETS)
|
2015-06-18 11:36:27 +02:00
|
|
|
SUBDIRS= \
|
|
|
|
user \
|
|
|
|
driver \
|
2016-06-05 23:21:36 +02:00
|
|
|
pcm \
|
2016-12-11 21:03:00 +01:00
|
|
|
mbedtls \
|
2015-06-18 11:36:27 +02:00
|
|
|
platform \
|
|
|
|
libc \
|
|
|
|
lua \
|
2015-10-09 06:32:59 +02:00
|
|
|
lwip \
|
2015-06-18 11:36:27 +02:00
|
|
|
coap \
|
|
|
|
mqtt \
|
Add New Tasking I/F and rework GPIO, UART, etc to support it
As with the last commit this rolls up the follwowing, but include the various
review comments on the PR.
- **Documentation changes**. I've added the taks FAQ as a stub new Extension
developer FAQ, and split the old FAQ into a Lua Developer FAQ and a Hardware
FAQ.
- **Tasking I/F**. New `app/task/Makefile`, `app/task/task.c`,
`app/include/task/task.h` and `app/Makefile` as per previous commit. Cascade
changes to `app/driver/uart.c`, `app/include/driver/uart.h`,
`app/user/user_main.c` and `app/modules/node.c`
- **GPIO Rework** to `app/modules/gpio.c` and `pin_map.[hc]`, `platform.[hc]`
in `app/platform`
- **Other Optimisations** Move the `platform_*_exists()` from
`app/platform/common.c` to static inline declarations in `platform.h` as
this generates faster, smaller code. Move lgc.a routines out of iram0.
2016-02-17 18:13:17 +01:00
|
|
|
task \
|
2015-06-18 11:36:27 +02:00
|
|
|
u8glib \
|
2015-08-05 00:47:34 +02:00
|
|
|
ucglib \
|
2015-06-18 11:36:27 +02:00
|
|
|
smart \
|
|
|
|
modules \
|
|
|
|
spiffs \
|
|
|
|
crypto \
|
2015-08-22 14:25:47 +02:00
|
|
|
dhtlib \
|
2015-12-29 12:25:37 +01:00
|
|
|
tsl2561 \
|
2016-04-03 20:10:52 +02:00
|
|
|
net \
|
2016-08-18 13:59:44 +02:00
|
|
|
http \
|
2016-09-05 20:17:13 +02:00
|
|
|
fatfs \
|
2016-09-21 03:38:12 +02:00
|
|
|
esp-gdbstub \
|
2017-04-04 21:31:06 +02:00
|
|
|
websocket \
|
|
|
|
swTimer \
|
|
|
|
misc \
|
2017-07-03 05:31:32 +02:00
|
|
|
pm \
|
|
|
|
sjson \
|
2018-01-10 22:45:56 +01:00
|
|
|
sqlite3 \
|
2017-04-04 21:31:06 +02:00
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
endif # } PDIR
|
|
|
|
|
|
|
|
APPDIR = .
|
|
|
|
LDDIR = ../ld
|
|
|
|
|
2015-01-24 16:36:04 +01:00
|
|
|
CCFLAGS += -Os
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2015-06-18 11:36:27 +02:00
|
|
|
TARGET_LDFLAGS = \
|
2015-06-17 10:30:12 +02:00
|
|
|
-nostdlib \
|
|
|
|
-Wl,-EL \
|
2015-06-18 11:36:27 +02:00
|
|
|
--longcalls \
|
2014-12-22 12:35:05 +01:00
|
|
|
--text-section-literals
|
|
|
|
|
|
|
|
ifeq ($(FLAVOR),debug)
|
2015-05-14 17:27:43 +02:00
|
|
|
TARGET_LDFLAGS += -g -Os
|
2014-12-22 12:35:05 +01:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(FLAVOR),release)
|
2015-05-14 17:27:43 +02:00
|
|
|
TARGET_LDFLAGS += -Os
|
2014-12-22 12:35:05 +01:00
|
|
|
endif
|
|
|
|
|
2015-10-07 03:02:49 +02:00
|
|
|
LD_FILE = $(LDDIR)/nodemcu.ld
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2015-06-18 11:36:27 +02:00
|
|
|
COMPONENTS_eagle.app.v6 = \
|
2015-06-17 10:30:12 +02:00
|
|
|
user/libuser.a \
|
|
|
|
driver/libdriver.a \
|
2016-06-05 23:21:36 +02:00
|
|
|
pcm/pcm.a \
|
2015-06-18 11:36:27 +02:00
|
|
|
platform/libplatform.a \
|
Add New Tasking I/F and rework GPIO, UART, etc to support it
As with the last commit this rolls up the follwowing, but include the various
review comments on the PR.
- **Documentation changes**. I've added the taks FAQ as a stub new Extension
developer FAQ, and split the old FAQ into a Lua Developer FAQ and a Hardware
FAQ.
- **Tasking I/F**. New `app/task/Makefile`, `app/task/task.c`,
`app/include/task/task.h` and `app/Makefile` as per previous commit. Cascade
changes to `app/driver/uart.c`, `app/include/driver/uart.h`,
`app/user/user_main.c` and `app/modules/node.c`
- **GPIO Rework** to `app/modules/gpio.c` and `pin_map.[hc]`, `platform.[hc]`
in `app/platform`
- **Other Optimisations** Move the `platform_*_exists()` from
`app/platform/common.c` to static inline declarations in `platform.h` as
this generates faster, smaller code. Move lgc.a routines out of iram0.
2016-02-17 18:13:17 +01:00
|
|
|
task/libtask.a \
|
2015-06-17 10:30:12 +02:00
|
|
|
libc/liblibc.a \
|
|
|
|
lua/liblua.a \
|
2015-10-09 06:32:59 +02:00
|
|
|
lwip/liblwip.a \
|
2015-06-17 10:30:12 +02:00
|
|
|
coap/coap.a \
|
|
|
|
mqtt/mqtt.a \
|
|
|
|
u8glib/u8glib.a \
|
2015-08-05 00:47:34 +02:00
|
|
|
ucglib/ucglib.a \
|
2015-06-17 10:30:12 +02:00
|
|
|
smart/smart.a \
|
|
|
|
spiffs/spiffs.a \
|
2016-09-05 20:17:13 +02:00
|
|
|
fatfs/libfatfs.a \
|
2015-06-17 10:30:12 +02:00
|
|
|
crypto/libcrypto.a \
|
|
|
|
dhtlib/libdhtlib.a \
|
2015-10-08 03:07:08 +02:00
|
|
|
tsl2561/tsl2561lib.a \
|
2015-12-29 12:25:37 +01:00
|
|
|
http/libhttp.a \
|
2017-07-03 05:31:32 +02:00
|
|
|
pm/libpm.a \
|
2016-09-21 03:38:12 +02:00
|
|
|
websocket/libwebsocket.a \
|
|
|
|
esp-gdbstub/libgdbstub.a \
|
2016-04-03 20:10:52 +02:00
|
|
|
net/libnodemcu_net.a \
|
2017-07-03 05:31:32 +02:00
|
|
|
mbedtls/libmbedtls.a \
|
2015-12-17 02:37:01 +01:00
|
|
|
modules/libmodules.a \
|
2017-04-04 21:31:06 +02:00
|
|
|
swTimer/libswtimer.a \
|
2017-07-03 05:31:32 +02:00
|
|
|
misc/libmisc.a \
|
|
|
|
sjson/libsjson.a \
|
2018-01-10 22:45:56 +01:00
|
|
|
sqlite3/libsqlite3.a \
|
2017-04-04 21:31:06 +02:00
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2015-12-18 03:10:48 +01:00
|
|
|
# Inspect the modules library and work out which modules need to be linked.
|
|
|
|
# For each enabled module, a symbol name of the form XYZ_module_selected is
|
|
|
|
# returned. At link time those names are declared undefined, so those (and
|
|
|
|
# only those) modules are pulled in.
|
|
|
|
SELECTED_MODULE_SYMS=$(filter %_module_selected %module_selected1,$(shell $(NM) modules/.output/$(TARGET)/$(FLAVOR)/lib/libmodules.a))
|
2015-10-08 03:07:08 +02:00
|
|
|
|
2015-06-18 11:36:27 +02:00
|
|
|
LINKFLAGS_eagle.app.v6 = \
|
2015-06-17 10:30:12 +02:00
|
|
|
-Wl,--gc-sections \
|
2015-10-05 08:53:23 +02:00
|
|
|
-Wl,-Map=mapfile \
|
2015-06-18 11:36:27 +02:00
|
|
|
-nostdlib \
|
2015-10-08 03:07:08 +02:00
|
|
|
-T$(LD_FILE) \
|
|
|
|
-Wl,@../ld/defsym.rom \
|
2015-06-18 11:36:27 +02:00
|
|
|
-Wl,--no-check-sections \
|
2015-10-08 03:07:08 +02:00
|
|
|
-Wl,--wrap=_xtos_set_exception_handler \
|
2015-06-17 10:30:12 +02:00
|
|
|
-Wl,-static \
|
2015-12-18 03:10:48 +01:00
|
|
|
$(addprefix -u , $(SELECTED_MODULE_SYMS)) \
|
2015-06-17 10:30:12 +02:00
|
|
|
-Wl,--start-group \
|
2016-12-11 21:03:00 +01:00
|
|
|
-lmain \
|
2015-06-18 11:36:27 +02:00
|
|
|
-lc \
|
|
|
|
-lgcc \
|
|
|
|
-lhal \
|
|
|
|
-lphy \
|
|
|
|
-lpp \
|
|
|
|
-lnet80211 \
|
|
|
|
-lwpa \
|
2015-12-20 04:39:17 +01:00
|
|
|
-lwpa2 \
|
2015-06-17 10:30:12 +02:00
|
|
|
-lsmartconfig \
|
2015-12-20 04:39:17 +01:00
|
|
|
-lcrypto \
|
2017-01-09 08:43:47 +01:00
|
|
|
-lwps \
|
2015-06-18 11:36:27 +02:00
|
|
|
$(DEP_LIBS_eagle.app.v6) \
|
2015-06-17 10:30:12 +02:00
|
|
|
-Wl,--end-group \
|
2015-03-06 08:55:24 +01:00
|
|
|
-lm
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2015-06-18 11:36:27 +02:00
|
|
|
DEPENDS_eagle.app.v6 = \
|
|
|
|
$(LD_FILE) \
|
2015-10-08 03:07:08 +02:00
|
|
|
Makefile
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
#############################################################
|
|
|
|
# Configuration i.e. compile options etc.
|
|
|
|
# Target specific stuff (defines etc.) goes in here!
|
|
|
|
# Generally values applying to a tree are captured in the
|
|
|
|
# makefile at its root level - these are then overridden
|
|
|
|
# for a subtree within the makefile rooted therein
|
|
|
|
#
|
|
|
|
|
2015-06-18 11:36:27 +02:00
|
|
|
#UNIVERSAL_TARGET_DEFINES = \
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
# Other potential configuration flags include:
|
|
|
|
# -DTXRX_TXBUF_DEBUG
|
|
|
|
# -DTXRX_RXBUF_DEBUG
|
|
|
|
# -DWLAN_CONFIG_CCX
|
2015-06-18 11:36:27 +02:00
|
|
|
CONFIGURATION_DEFINES = -D__ets__ \
|
2015-10-09 06:32:59 +02:00
|
|
|
-DICACHE_FLASH \
|
2015-12-12 04:27:31 +01:00
|
|
|
-DLUA_OPTIMIZE_MEMORY=2 \
|
|
|
|
-DMIN_OPT_LEVEL=2 \
|
2015-10-09 06:32:59 +02:00
|
|
|
-DLWIP_OPEN_SRC \
|
|
|
|
-DPBUF_RSV_FOR_WLAN \
|
2015-12-12 04:27:31 +01:00
|
|
|
-DEBUF_LWIP \
|
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
|
|
|
-DUSE_OPTIMIZE_PRINTF \
|
2016-12-11 21:03:00 +01:00
|
|
|
-DMBEDTLS_USER_CONFIG_FILE=\"user_mbedtls.h\" \
|
2014-12-22 12:35:05 +01:00
|
|
|
|
2015-06-18 11:36:27 +02:00
|
|
|
DEFINES += \
|
|
|
|
$(UNIVERSAL_TARGET_DEFINES) \
|
2014-12-22 12:35:05 +01:00
|
|
|
$(CONFIGURATION_DEFINES)
|
|
|
|
|
2015-06-18 11:36:27 +02:00
|
|
|
DDEFINES += \
|
|
|
|
$(UNIVERSAL_TARGET_DEFINES) \
|
2014-12-22 12:35:05 +01:00
|
|
|
$(CONFIGURATION_DEFINES)
|
|
|
|
|
|
|
|
|
|
|
|
#############################################################
|
|
|
|
# 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
|
|
|
|
#
|
|
|
|
|
|
|
|
INCLUDES := $(INCLUDES) -I $(PDIR)include
|
|
|
|
INCLUDES += -I ./
|
|
|
|
PDIR := ../$(PDIR)
|
|
|
|
sinclude $(PDIR)Makefile
|
|
|
|
|
|
|
|
|
|
|
|
.PHONY: FORCE
|
|
|
|
FORCE:
|