unix: Refactor mpconfigport.h and mpconfigvariant.h.

This is a no-op for coverage and minimal.

The standard and dev variants have been merged and enable the same feature
set as a typical bare-metal board.  And remove the CI for the dev build.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>

13 files changed, 268 insertions, 383 deletions

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 45cc87e72..3b738634a 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -49,18 +49,6 @@ jobs:
       if: failure()
       run: tests/run-tests.py --print-failures
 
-  dev:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: source tools/ci.sh && ci_unix_dev_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_dev_run_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests.py --print-failures
-
   coverage:
     runs-on: ubuntu-latest
     steps:
diff --git a/ports/unix/main.c b/ports/unix/main.c
index c388106a6..4f019b6c2 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -63,6 +63,11 @@ STATIC uint emit_opt = MP_EMIT_OPT_NONE;
 long heap_size = 1024 * 1024 * (sizeof(mp_uint_t) / 4);
 #endif
 
+// Number of heaps to assign by default if MICROPY_GC_SPLIT_HEAP=1
+#ifndef MICROPY_GC_SPLIT_HEAP_N_HEAPS
+#define MICROPY_GC_SPLIT_HEAP_N_HEAPS (1)
+#endif
+
 STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
     (void)env;
     ssize_t ret;
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index cb389d9a5..08ddd21f6 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -24,85 +24,36 @@
  * THE SOFTWARE.
  */
 
-// Options to control how MicroPython is built for this port,
-// overriding defaults in py/mpconfig.h.
+// Options to control how MicroPython is built for this port, overriding
+// defaults in py/mpconfig.h. This file is mostly about configuring the
+// features to work on Unix-like systems, see mpconfigvariant.h (and
+// mpconfigvariant_common.h) for feature enabling.
+
+// For size_t and ssize_t
+#include <unistd.h>
 
 // Variant-specific definitions.
 #include "mpconfigvariant.h"
 
-// The minimal variant's config covers everything.
-// If we're building the minimal variant, ignore the rest of this file.
-#ifndef MICROPY_UNIX_MINIMAL
-
-// If the variant did not set a feature level then configure a set of features.
 #ifndef MICROPY_CONFIG_ROM_LEVEL
-#define MICROPY_COMP_MODULE_CONST               (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN        (1)
-#define MICROPY_COMP_RETURN_IF_EXPR             (1)
-#ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH         (1)
-#endif
-#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
-#define MICROPY_OPT_MAP_LOOKUP_CACHE            (1)
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
 #endif
-#define MICROPY_STACK_CHECK                     (1)
-#define MICROPY_KBD_EXCEPTION                   (1)
-#define MICROPY_HELPER_REPL                     (1)
-#define MICROPY_REPL_EMACS_KEYS                 (1)
-#define MICROPY_REPL_AUTO_INDENT                (1)
-#define MICROPY_ENABLE_SOURCE_LINE              (1)
-#ifndef MICROPY_STREAMS_NON_BLOCK
-#define MICROPY_STREAMS_NON_BLOCK               (1)
+
+#ifndef MICROPY_PY_SYS_PLATFORM
+#if defined(__APPLE__) && defined(__MACH__)
+    #define MICROPY_PY_SYS_PLATFORM  "darwin"
+#else
+    #define MICROPY_PY_SYS_PLATFORM  "linux"
 #endif
-#define MICROPY_MODULE_WEAK_LINKS               (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS           (1)
-#define MICROPY_PY_FUNCTION_ATTRS               (1)
-#define MICROPY_PY_DESCRIPTORS                  (1)
-#define MICROPY_PY_DELATTR_SETATTR              (1)
-#define MICROPY_PY_FSTRINGS                     (1)
-#define MICROPY_PY_BUILTINS_BYTES_HEX           (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE         (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER          (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION       (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES      (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW          (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS         (1)
-#define MICROPY_PY_BUILTINS_SLICE_INDICES       (1)
-#define MICROPY_PY_BUILTINS_FROZENSET           (1)
-#define MICROPY_PY_BUILTINS_ROUND_INT           (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS          (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS      (1)
-#define MICROPY_PY_BUILTINS_COMPILE             (1)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED      (1)
-#define MICROPY_PY_BUILTINS_INPUT               (1)
-#define MICROPY_PY_BUILTINS_POW3                (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO         (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN           (1)
-#define MICROPY_PY_COLLECTIONS_DEQUE            (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT      (1)
-#ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS       (1)
 #endif
-#define MICROPY_PY_MATH_ISCLOSE                 (MICROPY_PY_MATH_SPECIAL_FUNCTIONS)
-#define MICROPY_PY_CMATH                        (1)
-#define MICROPY_PY_IO_IOBASE                    (1)
-#define MICROPY_PY_SYS_MAXSIZE                  (1)
-#define MICROPY_PY_SYS_STDFILES                 (1)
-#define MICROPY_PY_UERRNO                       (1)
-#define MICROPY_PY_UCTYPES                      (1)
-#define MICROPY_PY_UZLIB                        (1)
-#define MICROPY_PY_UJSON                        (1)
-#define MICROPY_PY_UOS                          (1)
-#define MICROPY_PY_URE                          (1)
-#define MICROPY_PY_UHEAPQ                       (1)
-#define MICROPY_PY_UHASHLIB                     (1)
-#define MICROPY_PY_UBINASCII                    (1)
-#define MICROPY_PY_UBINASCII_CRC32              (1)
-#define MICROPY_PY_URANDOM                      (1)
+
+#ifndef MICROPY_PY_SYS_PATH_DEFAULT
+#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
 #endif
 
-#define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
-#define MICROPY_PERSISTENT_CODE_LOAD (1)
+#define MP_STATE_PORT MP_STATE_VM
+
+// Configure which emitter to use for this target.
 #if !defined(MICROPY_EMIT_X64) && defined(__x86_64__)
     #define MICROPY_EMIT_X64        (1)
 #endif
@@ -118,83 +69,75 @@
 #if !defined(MICROPY_EMIT_ARM) && defined(__arm__) && !defined(__thumb2__)
     #define MICROPY_EMIT_ARM        (1)
 #endif
-#define MICROPY_ENABLE_GC           (1)
-// Number of heaps to assign if MICROPY_GC_SPLIT_HEAP=1
-#ifndef MICROPY_GC_SPLIT_HEAP_N_HEAPS
-#define MICROPY_GC_SPLIT_HEAP_N_HEAPS (1)
-#endif
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
-#define MICROPY_MEM_STATS           (1)
-#define MICROPY_DEBUG_PRINTERS      (1)
-// Printing debug to stderr may give tests which
-// check stdout a chance to pass, etc.
-#define MICROPY_DEBUG_PRINTER       (&mp_stderr_print)
-#define MICROPY_READER_POSIX        (1)
-#define MICROPY_READER_VFS          (1)
-#define MICROPY_USE_READLINE_HISTORY (1)
-#ifndef MICROPY_READLINE_HISTORY_SIZE
-#define MICROPY_READLINE_HISTORY_SIZE 50
+
+// Type definitions for the specific machine based on the word size.
+#ifndef MICROPY_OBJ_REPR
+#ifdef __LP64__
+typedef long mp_int_t; // must be pointer size
+typedef unsigned long mp_uint_t; // must be pointer size
+#else
+// These are definitions for machines where sizeof(int) == sizeof(void*),
+// regardless of actual size.
+typedef int mp_int_t; // must be pointer size
+typedef unsigned int mp_uint_t; // must be pointer size
 #endif
-#define MICROPY_HELPER_LEXER_UNIX   (1)
-#ifndef MICROPY_FLOAT_IMPL
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
+#else
+// Assume that if we already defined the obj repr then we also defined types.
 #endif
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_STREAMS_POSIX_API   (1)
-#define MICROPY_OPT_COMPUTED_GOTO   (1)
-#define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (1)
-#define MICROPY_VFS                 (1)
-#define MICROPY_VFS_POSIX           (1)
-#define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (0)
-#define MICROPY_PY_SYS_EXIT         (1)
-#define MICROPY_PY_SYS_ATEXIT       (1)
-#if MICROPY_PY_SYS_SETTRACE
-#define MICROPY_PERSISTENT_CODE_SAVE (1)
-#define MICROPY_COMP_CONST (0)
+
+// Cannot include <sys/types.h>, as it may lead to symbol name clashes
+#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
+typedef long long mp_off_t;
+#else
+typedef long mp_off_t;
 #endif
-#ifndef MICROPY_PY_SYS_PLATFORM
-#if defined(__APPLE__) && defined(__MACH__)
-    #define MICROPY_PY_SYS_PLATFORM  "darwin"
+
+// We need to provide a declaration/definition of alloca()
+// unless support for it is disabled.
+#if !defined(MICROPY_NO_ALLOCA) || MICROPY_NO_ALLOCA == 0
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <stdlib.h>
 #else
-    #define MICROPY_PY_SYS_PLATFORM  "linux"
+#include <alloca.h>
 #endif
 #endif
-#ifndef MICROPY_PY_SYS_PATH_DEFAULT
-#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
+
+// Always enable GC.
+#define MICROPY_ENABLE_GC           (1)
+
+#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
+// Fall back to setjmp() implementation for discovery of GC pointers in registers.
+#define MICROPY_GCREGS_SETJMP (1)
 #endif
-#define MICROPY_PY_SYS_EXC_INFO     (1)
-#define MICROPY_PY_GC_COLLECT_RETVAL (1)
 
+// Enable the VFS, and enable the posix "filesystem".
+#define MICROPY_ENABLE_FINALISER    (1)
+#define MICROPY_VFS                 (1)
+#define MICROPY_READER_VFS          (1)
+#define MICROPY_HELPER_LEXER_UNIX   (1)
+#define MICROPY_VFS_POSIX           (1)
+#define MICROPY_READER_POSIX        (1)
+
+// VFS stat functions should return time values relative to 1970/1/1
+#define MICROPY_EPOCH_IS_1970       (1)
+
+// Assume that select() call, interrupted with a signal, and erroring
+// with EINTR, updates remaining timeout value.
+#define MICROPY_SELECT_REMAINING_TIME (1)
+
+// Disable stackless by default.
 #ifndef MICROPY_STACKLESS
 #define MICROPY_STACKLESS           (0)
 #define MICROPY_STACKLESS_STRICT    (0)
 #endif
 
-#define MICROPY_PY_UOS_INCLUDEFILE  "ports/unix/moduos.c"
-#define MICROPY_PY_UOS_ERRNO        (1)
-#define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1)
-#define MICROPY_PY_UOS_SEP          (1)
-#define MICROPY_PY_UOS_SYSTEM       (1)
-#define MICROPY_PY_UOS_URANDOM      (1)
-#define MICROPY_PY_UTIME            (1)
-#define MICROPY_PY_UTIME_MP_HAL     (1)
-#define MICROPY_PY_UTIMEQ           (1)
-#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128)
-#if MICROPY_PY_USSL
-#define MICROPY_PY_UHASHLIB_MD5     (1)
-#define MICROPY_PY_UHASHLIB_SHA1    (1)
-#define MICROPY_PY_UCRYPTOLIB       (1)
-#endif
-#ifndef MICROPY_PY_USELECT
-#define MICROPY_PY_USELECT          (0)
-#endif
-#ifndef MICROPY_PY_USELECT_POSIX
-#define MICROPY_PY_USELECT_POSIX    (!MICROPY_PY_USELECT)
+// If settrace is enabled then we need code saving.
+#if MICROPY_PY_SYS_SETTRACE
+#define MICROPY_PERSISTENT_CODE_SAVE (1)
+#define MICROPY_COMP_CONST (0)
 #endif
-#define MICROPY_PY_UWEBSOCKET       (1)
-#define MICROPY_PY_MACHINE          (1)
-#define MICROPY_PY_MACHINE_PULSE    (1)
+
+// Unix-specific configuration of machine.mem*.
 #define MICROPY_MACHINE_MEM_GET_READ_ADDR   mod_machine_mem_get_addr
 #define MICROPY_MACHINE_MEM_GET_WRITE_ADDR  mod_machine_mem_get_addr
 
@@ -203,52 +146,23 @@
 #define MICROPY_FATFS_MAX_SS           (4096)
 #define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 
-// Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc.
-// names in exception messages (may require more RAM).
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
-#define MICROPY_WARNINGS            (1)
-#define MICROPY_ERROR_PRINTER       (&mp_stderr_print)
-#define MICROPY_PY_STR_BYTES_CMP_WARN (1)
-
-// VFS stat functions should return time values relative to 1970/1/1
-#define MICROPY_EPOCH_IS_1970       (1)
-
-extern const struct _mp_print_t mp_stderr_print;
-
-#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
-// Fall back to setjmp() implementation for discovery of GC pointers in registers.
-#define MICROPY_GCREGS_SETJMP (1)
-#endif
-
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
-#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (256)
-#define MICROPY_ASYNC_KBD_INTR      (1)
+#define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
 
-// type definitions for the specific machine
+// Ensure builtinimport.c works with -m.
+#define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (1)
 
-// For size_t and ssize_t
-#include <unistd.h>
+// Don't default sys.argv because we do that in main.
+#define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (0)
 
-// assume that if we already defined the obj repr then we also defined types
-#ifndef MICROPY_OBJ_REPR
-#ifdef __LP64__
-typedef long mp_int_t; // must be pointer size
-typedef unsigned long mp_uint_t; // must be pointer size
-#else
-// These are definitions for machines where sizeof(int) == sizeof(void*),
-// regardless of actual size.
-typedef int mp_int_t; // must be pointer size
-typedef unsigned int mp_uint_t; // must be pointer size
-#endif
-#endif
+#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128)
 
-// Cannot include <sys/types.h>, as it may lead to symbol name clashes
-#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
-typedef long long mp_off_t;
-#else
-typedef long mp_off_t;
-#endif
+// Bare-metal ports don't have stderr. Printing debug to stderr may give tests
+// which check stdout a chance to pass, etc.
+extern const struct _mp_print_t mp_stderr_print;
+#define MICROPY_DEBUG_PRINTER (&mp_stderr_print)
+#define MICROPY_ERROR_PRINTER (&mp_stderr_print)
 
+// For the native emitter configure how to mark a region as executable.
 void mp_unix_alloc_exec(size_t min_size, void **ptr, size_t *size);
 void mp_unix_free_exec(void *ptr, size_t size);
 void mp_unix_mark_exec(void);
@@ -260,8 +174,8 @@ void mp_unix_mark_exec(void);
 #define MICROPY_FORCE_PLAT_ALLOC_EXEC (1)
 #endif
 
+// If enabled, configure how to seed random on init.
 #ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
-// Support for seeding the random module on import.
 #include <stddef.h>
 void mp_hal_get_random(size_t n, void *buf);
 static inline unsigned long mp_urandom_seed_init(void) {
@@ -276,10 +190,6 @@ static inline unsigned long mp_urandom_seed_init(void) {
 #define MICROPY_PLAT_DEV_MEM  (1)
 #endif
 
-// Assume that select() call, interrupted with a signal, and erroring
-// with EINTR, updates remaining timeout value.
-#define MICROPY_SELECT_REMAINING_TIME (1)
-
 #ifdef __ANDROID__
 #include <android/api-level.h>
 #if __ANDROID_API__ < 4
@@ -289,18 +199,6 @@ static inline unsigned long mp_urandom_seed_init(void) {
 #endif
 #endif
 
-#define MP_STATE_PORT MP_STATE_VM
-
-// We need to provide a declaration/definition of alloca()
-// unless support for it is disabled.
-#if !defined(MICROPY_NO_ALLOCA) || MICROPY_NO_ALLOCA == 0
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <stdlib.h>
-#else
-#include <alloca.h>
-#endif
-#endif
-
 // From "man readdir": "Under glibc, programs can check for the availability
 // of the fields [in struct dirent] not defined in POSIX.1 by testing whether
 // the macros [...], _DIRENT_HAVE_D_TYPE are defined."
@@ -320,11 +218,13 @@ static inline unsigned long mp_urandom_seed_init(void) {
 #include <stdio.h>
 #endif
 
+// If threading is enabled, configure the atomic section.
 #if MICROPY_PY_THREAD
 #define MICROPY_BEGIN_ATOMIC_SECTION() (mp_thread_unix_begin_atomic_section(), 0xffffffff)
 #define MICROPY_END_ATOMIC_SECTION(x) (void)x; mp_thread_unix_end_atomic_section()
 #endif
 
+// In lieu of a WFI(), slow down polling from being a tight loop.
 #ifndef MICROPY_EVENT_POLL_HOOK
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
@@ -334,7 +234,6 @@ static inline unsigned long mp_urandom_seed_init(void) {
     } while (0);
 #endif
 
+// Configure the implementation of machine.idle().
 #include <sched.h>
 #define MICROPY_UNIX_MACHINE_IDLE sched_yield();
-
-#endif // MICROPY_UNIX_MINIMAL
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index fb70d791a..9857c6687 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -30,6 +30,9 @@
 // Set base feature level.
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EVERYTHING)
 
+// Enable extra Unix features.
+#include "../mpconfigvariant_common.h"
+
 // Enable additional features.
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
 #define MICROPY_GC_SPLIT_HEAP          (1)
@@ -45,11 +48,9 @@
 #define MICROPY_PY_BUILTINS_RANGE_BINOP (1)
 #define MICROPY_PY_SYS_GETSIZEOF       (1)
 #define MICROPY_PY_IO_BUFFEREDWRITER (1)
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_urandom_seed_init())
 #define MICROPY_PY_URE_DEBUG           (1)
 #define MICROPY_PY_URE_MATCH_GROUPS    (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
 #define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (1)
-#define MICROPY_PY_UCRYPTOLIB          (1)
 #define MICROPY_PY_UCRYPTOLIB_CTR      (1)
 #define MICROPY_PY_MICROPYTHON_HEAP_LOCKED (1)
diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
deleted file mode 100644
index 2522f1861..000000000
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// Set base feature level.
-#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
deleted file mode 100644
index 058eda2f8..000000000
--- a/ports/unix/variants/dev/mpconfigvariant.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
-
-MICROPY_ROM_TEXT_COMPRESSION = 1
-MICROPY_VFS_FAT ?= 1
-MICROPY_VFS_LFS1 ?= 1
-MICROPY_VFS_LFS2 ?= 1
-
-MICROPY_PY_BLUETOOTH ?= 1
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index d9d2a6c48..6b107e779 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -26,117 +26,44 @@
 
 // options to control how MicroPython is built
 
-// Prevent the rest of the default mpconfigport.h being used.
-#define MICROPY_UNIX_MINIMAL (1)
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_MINIMUM)
 
+// Disable native emitters.
+#define MICROPY_EMIT_X86 (0)
+#define MICROPY_EMIT_X64 (0)
+#define MICROPY_EMIT_THUMB (0)
+#define MICROPY_EMIT_ARM (0)
+
+// Tune the parser to use less RAM by default.
 #define MICROPY_ALLOC_QSTR_CHUNK_INIT (64)
 #define MICROPY_ALLOC_PARSE_RULE_INIT (8)
 #define MICROPY_ALLOC_PARSE_RULE_INC  (8)
 #define MICROPY_ALLOC_PARSE_RESULT_INIT (8)
 #define MICROPY_ALLOC_PARSE_RESULT_INC (8)
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT (64)
-#define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
-#define MICROPY_ENABLE_GC           (1)
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_GC_ALLOC_THRESHOLD  (0)
-#define MICROPY_STACK_CHECK         (0)
-#define MICROPY_COMP_CONST          (0)
-#define MICROPY_MEM_STATS           (0)
-#define MICROPY_DEBUG_PRINTERS      (0)
-#define MICROPY_READER_POSIX        (1)
-#define MICROPY_READER_VFS          (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (0)
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
-#define MICROPY_WARNINGS            (0)
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (0)
-#define MICROPY_KBD_EXCEPTION       (1)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_NONE)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_NONE)
-#define MICROPY_STREAMS_NON_BLOCK   (0)
-#define MICROPY_OPT_COMPUTED_GOTO   (0)
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (0)
-#define MICROPY_OPT_MAP_LOOKUP_CACHE (0)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (0)
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
-#define MICROPY_VFS                 (1)
-#define MICROPY_VFS_POSIX           (1)
-#define MICROPY_CPYTHON_COMPAT      (0)
-#define MICROPY_PY_BUILTINS_BYTEARRAY (0)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
-#define MICROPY_PY_BUILTINS_COMPILE (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE (0)
-#define MICROPY_PY_BUILTINS_FILTER  (0)
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
-#define MICROPY_PY_BUILTINS_REVERSED (0)
-#define MICROPY_PY_BUILTINS_SET     (0)
-#define MICROPY_PY_BUILTINS_SLICE   (0)
-#define MICROPY_PY_BUILTINS_STR_COUNT (0)
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO (0)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
-#define MICROPY_PY_BUILTINS_PROPERTY (0)
-#define MICROPY_PY_BUILTINS_MIN_MAX (0)
-#define MICROPY_PY___FILE__         (0)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (0)
-#define MICROPY_PY_GC               (0)
-#define MICROPY_PY_GC_COLLECT_RETVAL (0)
-#define MICROPY_PY_ARRAY            (0)
-#define MICROPY_PY_COLLECTIONS      (0)
-#define MICROPY_PY_MATH             (0)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_IO               (0)
-#define MICROPY_PY_STRUCT           (0)
-#define MICROPY_PY_SYS              (1)
-#define MICROPY_PY_SYS_EXIT         (0)
-#define MICROPY_PY_SYS_PLATFORM     "linux"
-#ifndef MICROPY_PY_SYS_PATH_DEFAULT
-#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
-#endif
-#define MICROPY_PY_SYS_MAXSIZE      (0)
-#define MICROPY_PY_SYS_STDFILES     (0)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_UCTYPES          (0)
-#define MICROPY_PY_UTIME            (0)
-#define MICROPY_PY_UZLIB            (0)
-#define MICROPY_PY_UJSON            (0)
-#define MICROPY_PY_UOS              (1)
-#define MICROPY_PY_URE              (0)
-#define MICROPY_PY_UHEAPQ           (0)
-#define MICROPY_PY_UHASHLIB         (0)
-#define MICROPY_PY_UBINASCII        (0)
-
-//////////////////////////////////////////
-// Do not change anything beyond this line
-//////////////////////////////////////////
-
-#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
-// Fall back to setjmp() implementation for discovery of GC pointers in registers.
-#define MICROPY_GCREGS_SETJMP (1)
-#endif
-
-// type definitions for the specific machine
 
-#ifdef __LP64__
-typedef long mp_int_t; // must be pointer size
-typedef unsigned long mp_uint_t; // must be pointer size
-#else
-// These are definitions for machines where sizeof(int) == sizeof(void*),
-// regardless for actual size.
-typedef int mp_int_t; // must be pointer size
-typedef unsigned int mp_uint_t; // must be pointer size
-#endif
+// Enable features that are not enabled by default with the minimum config.
+#define MICROPY_COMP_CONST_FOLDING (1)
+#define MICROPY_COMP_CONST_LITERAL (1)
+#define MICROPY_COMP_CONST_TUPLE (1)
+#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
+#define MICROPY_ENABLE_COMPILER (1)
+#define MICROPY_ENABLE_EXTERNAL_IMPORT (1)
+#define MICROPY_FULL_CHECKS (1)
+#define MICROPY_HELPER_REPL (1)
+#define MICROPY_KBD_EXCEPTION (1)
+#define MICROPY_MODULE_GETATTR (1)
+#define MICROPY_MULTIPLE_INHERITANCE (1)
+#define MICROPY_PY_ASSIGN_EXPR (1)
+#define MICROPY_PY_ASYNC_AWAIT (1)
+#define MICROPY_PY_ATTRTUPLE (1)
+#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (1)
+#define MICROPY_PY_BUILTINS_RANGE_ATTRS (1)
+#define MICROPY_PY_GENERATOR_PEND_THROW (1)
 
-// Cannot include <sys/types.h>, as it may lead to symbol name clashes
-#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
-typedef long long mp_off_t;
-#else
-typedef long mp_off_t;
-#endif
+// Enable just the sys and os built-in modules.
+#define MICROPY_PY_SYS (1)
+#define MICROPY_PY_UOS (1)
 
-// We need to provide a declaration/definition of alloca()
-#ifdef __FreeBSD__
-#include <stdlib.h>
-#else
-#include <alloca.h>
-#endif
+// The minimum sets this to 1 to save flash.
+#define MICROPY_QSTR_BYTES_IN_HASH (2)
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
new file mode 100644
index 000000000..1128f21d2
--- /dev/null
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -0,0 +1,124 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// This file enables and configures features common to all variants
+// other than "minimal".
+
+// Send raise KeyboardInterrupt directly from the signal handler rather than
+// scheduling it into the VM.
+#define MICROPY_ASYNC_KBD_INTR         (1)
+
+// Enable helpers for printing debugging information.
+#ifndef MICROPY_DEBUG_PRINTERS
+#define MICROPY_DEBUG_PRINTERS         (1)
+#endif
+
+// Enable floating point by default.
+#ifndef MICROPY_FLOAT_IMPL
+#define MICROPY_FLOAT_IMPL             (MICROPY_FLOAT_IMPL_DOUBLE)
+#endif
+
+// Enable arbritrary precision long-int by default.
+#ifndef MICROPY_LONGINT_IMPL
+#define MICROPY_LONGINT_IMPL           (MICROPY_LONGINT_IMPL_MPZ)
+#endif
+
+// Enable use of C libraries that need read/write/lseek/fsync, e.g. axtls.
+#define MICROPY_STREAMS_POSIX_API      (1)
+
+// REPL conveniences.
+#define MICROPY_REPL_EMACS_WORDS_MOVE  (1)
+#define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (1)
+#define MICROPY_USE_READLINE_HISTORY   (1)
+#ifndef MICROPY_READLINE_HISTORY_SIZE
+#define MICROPY_READLINE_HISTORY_SIZE  (50)
+#endif
+
+// Seed random on import.
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_urandom_seed_init())
+
+// Allow exception details in low-memory conditions.
+#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
+#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (256)
+
+// Allow loading of .mpy files.
+#define MICROPY_PERSISTENT_CODE_LOAD   (1)
+
+// Extra memory debugging.
+#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
+#define MICROPY_MEM_STATS              (1)
+
+// Enable a small performance boost for the VM.
+#define MICROPY_OPT_COMPUTED_GOTO      (1)
+
+// Return number of collected objects from gc.collect().
+#define MICROPY_PY_GC_COLLECT_RETVAL   (1)
+
+// Enable detailed error messages and warnings.
+#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
+#define MICROPY_WARNINGS               (1)
+#define MICROPY_PY_STR_BYTES_CMP_WARN  (1)
+
+// Configure the "sys" module with features not usually enabled on bare-metal.
+#define MICROPY_PY_SYS_ATEXIT          (1)
+#define MICROPY_PY_SYS_EXC_INFO        (1)
+
+// Configure the "os" module with extra unix features.
+#define MICROPY_PY_UOS_INCLUDEFILE     "ports/unix/moduos.c"
+#define MICROPY_PY_UOS_ERRNO           (1)
+#define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1)
+#define MICROPY_PY_UOS_SEP             (1)
+#define MICROPY_PY_UOS_SYSTEM          (1)
+#define MICROPY_PY_UOS_URANDOM         (1)
+
+// Enable the unix-specific "time" module.
+#define MICROPY_PY_UTIME               (1)
+#define MICROPY_PY_UTIME_MP_HAL        (1)
+
+// Enable the utimeq module used by the previous (v2) version of uasyncio.
+#define MICROPY_PY_UTIMEQ              (1)
+
+#if MICROPY_PY_USSL
+#define MICROPY_PY_UHASHLIB_MD5        (1)
+#define MICROPY_PY_UHASHLIB_SHA1       (1)
+#define MICROPY_PY_UCRYPTOLIB          (1)
+#endif
+
+// Use the posix implementation of the "select" module (unless the variant
+// specifically asks for the MicroPython version).
+#ifndef MICROPY_PY_USELECT
+#define MICROPY_PY_USELECT             (0)
+#endif
+#ifndef MICROPY_PY_USELECT_POSIX
+#define MICROPY_PY_USELECT_POSIX       (!MICROPY_PY_USELECT)
+#endif
+
+// Enable the "websocket" module.
+#define MICROPY_PY_UWEBSOCKET          (1)
+
+// Enable the "machine" module, mostly for machine.mem*.
+#define MICROPY_PY_MACHINE             (1)
+#define MICROPY_PY_MACHINE_PULSE       (1)
diff --git a/ports/unix/variants/nanbox/mpconfigvariant.h b/ports/unix/variants/nanbox/mpconfigvariant.h
index f827158fb..7b13b7dc6 100644
--- a/ports/unix/variants/nanbox/mpconfigvariant.h
+++ b/ports/unix/variants/nanbox/mpconfigvariant.h
@@ -28,6 +28,11 @@
 // continues to build (i.e. catches usage of mp_obj_t that don't work with
 // this representation).
 
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
+// Enable extra Unix features.
+#include "../mpconfigvariant_common.h"
+
 // select nan-boxing object model
 #define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_D)
 
diff --git a/ports/unix/variants/dev/manifest.py b/ports/unix/variants/standard/manifest.py
index dd521258e..dd521258e 100644
--- a/ports/unix/variants/dev/manifest.py
+++ b/ports/unix/variants/standard/manifest.py
diff --git a/ports/unix/variants/standard/mpconfigvariant.h b/ports/unix/variants/standard/mpconfigvariant.h
index 31618652e..75201e9ab 100644
--- a/ports/unix/variants/standard/mpconfigvariant.h
+++ b/ports/unix/variants/standard/mpconfigvariant.h
@@ -27,18 +27,5 @@
 // Set base feature level.
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
-// Disable some features that come enabled by default with the feature level.
-#define MICROPY_OPT_MPZ_BITWISE                 (0)
-#define MICROPY_OPT_MATH_FACTORIAL              (0)
-#define MICROPY_MODULE_ATTR_DELEGATION          (0)
-#define MICROPY_MODULE_BUILTIN_INIT             (0)
-#define MICROPY_ENABLE_SCHEDULER                (0)
-#define MICROPY_PY_BUILTINS_EXECFILE            (0)
-#define MICROPY_PY_MATH_CONSTANTS               (0)
-#define MICROPY_PY_MATH_FACTORIAL               (0)
-#define MICROPY_PY_SYS_PS1_PS2                  (0)
-#define MICROPY_PY_SYS_STDIO_BUFFER             (0)
-#define MICROPY_PY_UASYNCIO                     (0)
-#define MICROPY_PY_URE_SUB                      (0)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (0)
-#define MICROPY_PY_FRAMEBUF                     (0)
+// Enable extra Unix features.
+#include "../mpconfigvariant_common.h"
diff --git a/ports/unix/variants/standard/mpconfigvariant.mk b/ports/unix/variants/standard/mpconfigvariant.mk
index def7987d8..929a1aec1 100644
--- a/ports/unix/variants/standard/mpconfigvariant.mk
+++ b/ports/unix/variants/standard/mpconfigvariant.mk
@@ -1 +1,8 @@
 # This is the default variant when you `make` the Unix port.
+
+FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
+
+MICROPY_ROM_TEXT_COMPRESSION = 1
+MICROPY_VFS_FAT ?= 1
+MICROPY_VFS_LFS1 ?= 1
+MICROPY_VFS_LFS2 ?= 1
diff --git a/tools/ci.sh b/tools/ci.sh
index 8f1d729a1..9c670b7be 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -454,14 +454,6 @@ function ci_unix_standard_run_tests {
     ci_unix_run_tests_full_helper standard
 }
 
-function ci_unix_dev_build {
-    ci_unix_build_helper VARIANT=dev
-}
-
-function ci_unix_dev_run_tests {
-    ci_unix_run_tests_helper VARIANT=dev
-}
-
 function ci_unix_coverage_setup {
     sudo pip3 install setuptools
     sudo pip3 install pyelftools
@@ -602,8 +594,6 @@ function ci_unix_macos_build {
     #make ${MAKEOPTS} -C ports/unix deplibs
     make ${MAKEOPTS} -C ports/unix
     # check for additional compiler errors/warnings
-    make ${MAKEOPTS} -C ports/unix VARIANT=dev submodules
-    make ${MAKEOPTS} -C ports/unix VARIANT=dev
     make ${MAKEOPTS} -C ports/unix VARIANT=coverage submodules
     make ${MAKEOPTS} -C ports/unix VARIANT=coverage
 }