diff options
| author | Daniel Mizyrycki <mzdaniel@glidelink.net> | 2021-08-10 15:52:25 -0700 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-08-13 23:22:54 +1000 |
| commit | 8f45f5ee4f58c64226a25a7070de0d18727be273 (patch) | |
| tree | 7cd186b1e56c66ea8d7c2494b911da8cf08bc149 | |
| parent | d7fbc755dc208be0d252afb379ab4e9880a2b693 (diff) | |
nrf: Set .mpy features consistent with documentation and other ports.
This allows nrf devices to load .mpy files. And nrf52840 and nrf9160 based
boards also support compiling and loading native code.
| -rw-r--r-- | ports/nrf/mpconfigdevice_nrf52840.h | 10 | ||||
| -rw-r--r-- | ports/nrf/mpconfigdevice_nrf9160.h | 10 | ||||
| -rw-r--r-- | ports/nrf/mpconfigport.h | 4 |
3 files changed, 22 insertions, 2 deletions
diff --git a/ports/nrf/mpconfigdevice_nrf52840.h b/ports/nrf/mpconfigdevice_nrf52840.h index fa9258f2a..581c52ea8 100644 --- a/ports/nrf/mpconfigdevice_nrf52840.h +++ b/ports/nrf/mpconfigdevice_nrf52840.h @@ -34,6 +34,16 @@ #define MICROPY_VFS (1) #endif +// Board overridable emitter configuration. + +#ifndef MICROPY_EMIT_THUMB +#define MICROPY_EMIT_THUMB (1) +#endif + +#ifndef MICROPY_EMIT_INLINE_THUMB +#define MICROPY_EMIT_INLINE_THUMB (1) +#endif + // Board overridable feature configuration. #ifndef MICROPY_ENABLE_SOURCE_LINE diff --git a/ports/nrf/mpconfigdevice_nrf9160.h b/ports/nrf/mpconfigdevice_nrf9160.h index fa9258f2a..581c52ea8 100644 --- a/ports/nrf/mpconfigdevice_nrf9160.h +++ b/ports/nrf/mpconfigdevice_nrf9160.h @@ -34,6 +34,16 @@ #define MICROPY_VFS (1) #endif +// Board overridable emitter configuration. + +#ifndef MICROPY_EMIT_THUMB +#define MICROPY_EMIT_THUMB (1) +#endif + +#ifndef MICROPY_EMIT_INLINE_THUMB +#define MICROPY_EMIT_INLINE_THUMB (1) +#endif + // Board overridable feature configuration. #ifndef MICROPY_ENABLE_SOURCE_LINE diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h index af77ef69c..8a622d811 100644 --- a/ports/nrf/mpconfigport.h +++ b/ports/nrf/mpconfigport.h @@ -43,7 +43,7 @@ #define MICROPY_VFS (0) #endif #define MICROPY_ALLOC_PATH_MAX (512) -#define MICROPY_PERSISTENT_CODE_LOAD (0) +#define MICROPY_PERSISTENT_CODE_LOAD (1) #define MICROPY_COMP_MODULE_CONST (0) #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0) #define MICROPY_READER_VFS (MICROPY_VFS) @@ -103,7 +103,7 @@ #define MICROPY_CAN_OVERRIDE_BUILTINS (1) #define MICROPY_USE_INTERNAL_ERRNO (1) #define MICROPY_PY_FUNCTION_ATTRS (1) -#define MICROPY_PY_BUILTINS_STR_UNICODE (0) +#define MICROPY_PY_BUILTINS_STR_UNICODE (1) #define MICROPY_PY_BUILTINS_STR_CENTER (0) #define MICROPY_PY_BUILTINS_STR_PARTITION (0) #define MICROPY_PY_BUILTINS_STR_SPLITLINES (0) |