From afa4d0a4b75bc8d21ae95cc76627952d61df93d0 Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 29 Jun 2022 12:47:14 +1000 Subject: [PATCH] unix/variants/dev: Allow all config options to be overridden. They can be overridden on the make command line, for example. Signed-off-by: Damien George --- ports/unix/variants/dev/mpconfigvariant.h | 6 ++++++ ports/unix/variants/dev/mpconfigvariant.mk | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h index 0084d00dd6..2522f1861f 100644 --- a/ports/unix/variants/dev/mpconfigvariant.h +++ b/ports/unix/variants/dev/mpconfigvariant.h @@ -28,7 +28,13 @@ #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES) // Enable some additional features. +#ifndef MICROPY_REPL_EMACS_WORDS_MOVE #define MICROPY_REPL_EMACS_WORDS_MOVE (1) +#endif +#ifndef MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE #define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (1) +#endif +#ifndef MICROPY_PY_SYS_SETTRACE #define MICROPY_PY_SYS_SETTRACE (1) +#endif #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_urandom_seed_init()) diff --git a/ports/unix/variants/dev/mpconfigvariant.mk b/ports/unix/variants/dev/mpconfigvariant.mk index 91bd28da9b..78588d379b 100644 --- a/ports/unix/variants/dev/mpconfigvariant.mk +++ b/ports/unix/variants/dev/mpconfigvariant.mk @@ -3,8 +3,8 @@ PROG ?= micropython-dev FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py MICROPY_ROM_TEXT_COMPRESSION = 1 -MICROPY_VFS_FAT = 1 -MICROPY_VFS_LFS1 = 1 -MICROPY_VFS_LFS2 = 1 +MICROPY_VFS_FAT ?= 1 +MICROPY_VFS_LFS1 ?= 1 +MICROPY_VFS_LFS2 ?= 1 MICROPY_PY_BLUETOOTH ?= 1