aboutsummaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
authorDave Hylands2015-12-12 17:15:33 -0500
committerPaul Sokolovsky2015-12-13 01:21:36 +0200
commitf9251659424664ed3f30c2b2a990bd7b9fa22c65 (patch)
tree296dc8d7e5e32aeb01ad110c06a81af8d478658b /py
parentf2ed736b29a8e9e772a5fd4b97162b2efdaf9716 (diff)
unix: Move modmachine into unix directory
This leaves behind the common functionality in extmod/machine_mem.c which can be used by all ports.
Diffstat (limited to 'py')
-rw-r--r--py/objmodule.c3
-rw-r--r--py/py.mk2
2 files changed, 1 insertions, 4 deletions
diff --git a/py/objmodule.c b/py/objmodule.c
index 71b0b0a26..32ded8919 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -184,9 +184,6 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
#if MICROPY_PY_UBINASCII
{ MP_ROM_QSTR(MP_QSTR_ubinascii), MP_ROM_PTR(&mp_module_ubinascii) },
#endif
-#if MICROPY_PY_MACHINE
- { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) },
-#endif
#if MICROPY_PY_USSL
{ MP_ROM_QSTR(MP_QSTR_ussl), MP_ROM_PTR(&mp_module_ussl) },
#endif
diff --git a/py/py.mk b/py/py.mk
index 75e7f461e..b2f62468d 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -165,7 +165,7 @@ PY_O_BASENAME = \
../extmod/moduheapq.o \
../extmod/moduhashlib.o \
../extmod/modubinascii.o \
- ../extmod/modmachine.o \
+ ../extmod/machine_mem.o \
../extmod/modussl.o \
../extmod/fsusermount.o \