diff options
| author | Damien George <damien.p.george@gmail.com> | 2019-10-10 23:49:37 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2019-10-15 21:36:55 +1100 |
| commit | 2e90ff7fa8f57edeaaa66aba0a6c3286cdb265d6 (patch) | |
| tree | 8a3298cd8ea2ec07669efb6a8c5701287b29db8a | |
| parent | 287800d6e1dd86f8750c432a166f36ee63cb29cc (diff) | |
qemu-arm: Convert to use FROZEN_MANIFEST to specify frozen code.
| -rw-r--r-- | ports/qemu-arm/Makefile | 7 | ||||
| -rw-r--r-- | ports/qemu-arm/Makefile.test | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile index c730c8297..92574d0e1 100644 --- a/ports/qemu-arm/Makefile +++ b/ports/qemu-arm/Makefile @@ -114,11 +114,10 @@ OBJ = $(OBJ_COMMON) $(OBJ_RUN) $(OBJ_TEST) # List of sources for qstr extraction SRC_QSTR += $(SRC_COMMON_C) $(SRC_RUN_C) $(LIB_SRC_C) -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 +ifneq ($(FROZEN_MANIFEST),) +CFLAGS += -DMICROPY_MODULE_FROZEN_STR CFLAGS += -DMICROPY_MODULE_FROZEN_MPY +CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool MPY_CROSS_FLAGS += -march=armv7m endif diff --git a/ports/qemu-arm/Makefile.test b/ports/qemu-arm/Makefile.test index 32ec95a4f..4204a84f0 100644 --- a/ports/qemu-arm/Makefile.test +++ b/ports/qemu-arm/Makefile.test @@ -1,6 +1,6 @@ LIB_SRC_C = lib/upytesthelper/upytesthelper.c -FROZEN_MPY_DIR ?= test-frzmpy +FROZEN_MANIFEST ?= "freeze('test-frzmpy')" include Makefile |