summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2017-06-17 15:44:28 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2017-06-17 15:44:28 +0300
commit9ae0713cef470b2fe9c75cae77c136bda2b1672d (patch)
tree845f970047295a941a0147cd0b52080bc60b09d7
parentb8fef67c696f3fc5dfe8c4144c4a3fca1c769674 (diff)
downloadmicropython-9ae0713cef470b2fe9c75cae77c136bda2b1672d.tar.gz
micropython-9ae0713cef470b2fe9c75cae77c136bda2b1672d.zip
unix/mpconfigport.mk: Update descriptions of readline and TLS options.
-rw-r--r--unix/mpconfigport.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/unix/mpconfigport.mk b/unix/mpconfigport.mk
index 8819546bfe..f0aa955c0c 100644
--- a/unix/mpconfigport.mk
+++ b/unix/mpconfigport.mk
@@ -4,7 +4,7 @@
MICROPY_FORCE_32BIT = 0
# This variable can take the following values:
-# 0 - no readline, just simple input
+# 0 - no readline, just simple stdin input
# 1 - use MicroPython version of readline
MICROPY_USE_READLINE = 1
@@ -23,9 +23,15 @@ MICROPY_PY_SOCKET = 1
# ffi module requires libffi (libffi-dev Debian package)
MICROPY_PY_FFI = 1
-# ussl module requires axtls
+# ussl module requires one of the TLS libraries below
MICROPY_PY_USSL = 1
+# axTLS has minimal size and fully integrated with MicroPython, but
+# implements only a subset of modern TLS functionality, so may have
+# problems with some servers.
MICROPY_SSL_AXTLS = 1
+# mbedTLS is more up to date and complete implementation, but also
+# more bloated. Configuring and building of mbedTLS should be done
+# outside of MicroPython, it can just link with mbedTLS library.
MICROPY_SSL_MBEDTLS = 0
# jni module requires JVM/JNI