summaryrefslogtreecommitdiffstatshomepage
path: root/esp8266
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2016-02-11 11:36:19 +0000
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-03-23 14:16:46 +0200
commit8000d51b689d01b084e76f7bc9158759707f1e57 (patch)
treef2a6a254eb3e05c9c4980febac5e053f9826f180 /esp8266
parent1a0adf49dfd3b3027a139fe1d2831da4474a352b (diff)
downloadmicropython-8000d51b689d01b084e76f7bc9158759707f1e57.tar.gz
micropython-8000d51b689d01b084e76f7bc9158759707f1e57.zip
esp8266: Add module weak link from json to ujson.
Diffstat (limited to 'esp8266')
-rw-r--r--esp8266/mpconfigport.h1
-rw-r--r--esp8266/qstrdefsport.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h
index 4dbaed8871..6e236c506c 100644
--- a/esp8266/mpconfigport.h
+++ b/esp8266/mpconfigport.h
@@ -102,6 +102,7 @@ extern const struct _mp_obj_module_t mp_module_machine;
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
{ MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&utime_module }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
+ { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
#define MP_STATE_PORT MP_STATE_VM
diff --git a/esp8266/qstrdefsport.h b/esp8266/qstrdefsport.h
index e201e983f9..baddfe350e 100644
--- a/esp8266/qstrdefsport.h
+++ b/esp8266/qstrdefsport.h
@@ -163,3 +163,5 @@ Q(mode)
Q(period)
Q(ONE_SHOT)
Q(PERIODIC)
+
+Q(json)