Merge pull request micropython#5166 from jepler/issue5154

microdev1 · web-flow · commit dd5b711dc715 · 2021-08-20T09:25:03.000+05:30
Don't double-list modules that MP_REGISTER_MODULE
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
@@ -637,12 +637,7 @@ extern const struct _mp_obj_module_t pwmio_module;
 #define PWMIO_MODULE
 #endif
 
-#if CIRCUITPY_QRIO
-extern const struct _mp_obj_module_t qrio_module;
-#define QRIO_MODULE            { MP_OBJ_NEW_QSTR(MP_QSTR_qrio), (mp_obj_t)&qrio_module },
-#else
-#define QRIO_MODULE
-#endif
+// CIRCUITPY_QRIO uses MP_REGISTER_MODULE
 
 #if CIRCUITPY_RAINBOWIO
 extern const struct _mp_obj_module_t rainbowio_module;
@@ -930,7 +925,6 @@ extern const struct _mp_obj_module_t msgpack_module;
     PS2IO_MODULE \
     PULSEIO_MODULE \
     PWMIO_MODULE \
-    QRIO_MODULE \
     RAINBOWIO_MODULE \
     RANDOM_MODULE \
     RE_MODULE \
diff --git a/py/objmodule.c b/py/objmodule.c
@@ -161,9 +161,6 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
     { MP_ROM_QSTR(MP_QSTR_builtins), MP_ROM_PTR(&mp_module_builtins) },
     { MP_ROM_QSTR(MP_QSTR_micropython), MP_ROM_PTR(&mp_module_micropython) },
 
-    #if MICROPY_PY_ARRAY
-    { MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mp_module_array) },
-    #endif
     #if MICROPY_PY_IO
     #if CIRCUITPY
     { MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) },
