diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2019-10-19 00:39:04 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2019-10-21 23:21:14 +1100 |
| commit | df7f632fd7003824500ec6c05f4395f667667d54 (patch) | |
| tree | 21c89740589e2e32f95b0bc4b3e584ce4646149d | |
| parent | 7662501d5b7c93fad6466b972d9912ee4fcc7660 (diff) | |
esp8266: Allow building without a manifest.
| -rw-r--r-- | ports/esp8266/Makefile | 9 | ||||
| -rw-r--r-- | ports/esp8266/mpconfigport.h | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile index c4ffd4f81..f1b718c78 100644 --- a/ports/esp8266/Makefile +++ b/ports/esp8266/Makefile @@ -189,6 +189,15 @@ $(BUILD)/uart.o: $(CONFVARS_FILE) FROZEN_EXTRA_DEPS = $(CONFVARS_FILE) +ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),) +CFLAGS += -DMICROPY_MODULE_FROZEN_MPY +CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool +endif + +ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),) +CFLAGS += -DMICROPY_MODULE_FROZEN_STR +endif + .PHONY: deploy deploy: $(BUILD)/firmware-combined.bin diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h index fa809d91a..e77f88c83 100644 --- a/ports/esp8266/mpconfigport.h +++ b/ports/esp8266/mpconfigport.h @@ -94,10 +94,7 @@ #define MICROPY_PY_STR_BYTES_CMP_WARN (1) #define MICROPY_STREAMS_NON_BLOCK (1) #define MICROPY_STREAMS_POSIX_API (1) -#define MICROPY_MODULE_FROZEN_STR (1) -#define MICROPY_MODULE_FROZEN_MPY (1) #define MICROPY_MODULE_FROZEN_LEXER mp_lexer_new_from_str32 -#define MICROPY_QSTR_EXTRA_POOL mp_qstr_frozen_const_pool #define MICROPY_FATFS_ENABLE_LFN (1) #define MICROPY_FATFS_RPATH (2) |