build-android.sh: Android build script, using NDK standalone toolchain.

Add support for MIPS big-endian, using OpenWRT SDK.
run-tests.mipsel: MIPS test runner using QEMU.
2017-07-22 18:01:31 +03:00 · 2017-07-22 18:01:31 +03:00 · 2017-07-22 18:01:31 +03:00 · 2017-07-22 18:01:31 +03:00 · 2017-07-22 18:01:30 +03:00
3798 changed files with 532292 additions and 248838 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -7,7 +7,6 @@
 *.bat text eol=crlf

 # These are binary so should never be modified by git.
-*.a binary
 *.png binary
 *.jpg binary
 *.dxf binary
@ -16,11 +15,16 @@
 # These should also not be modified by git.
 tests/basics/string_cr_conversion.py -text
 tests/basics/string_crlf_conversion.py -text
-ports/stm32/pybcdc.inf_template -text
-ports/stm32/usbhost/** -text
-ports/cc3200/hal/aes.c -text
-ports/cc3200/hal/aes.h -text
-ports/cc3200/hal/des.c -text
-ports/cc3200/hal/i2s.c -text
-ports/cc3200/hal/i2s.h -text
-ports/cc3200/version.h -text
+stmhal/pybcdc.inf_template -text
+stmhal/usbd_* -text
+stmhal/boards/*/stm32f4xx_hal_conf.h -text
+stmhal/cmsis/** -text
+stmhal/hal/** -text
+stmhal/usbdev/** -text
+stmhal/usbhost/** -text
+cc3200/hal/aes.c -text
+cc3200/hal/aes.h -text
+cc3200/hal/des.c -text
+cc3200/hal/i2s.c -text
+cc3200/hal/i2s.h -text
+cc3200/version.h -text
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1 +0,0 @@
-github: micropython
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@ -1,16 +0,0 @@
-name: Check code formatting
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v1
-    - name: Install packages
-      run: source tools/ci.sh && ci_code_formatting_setup
-    - name: Run code formatting
-      run: source tools/ci.sh && ci_code_formatting_run
-    - name: Check code formatting
-      run: git diff --exit-code
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@ -1,27 +0,0 @@
-name: Check code size
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'ports/bare-arm/**'
-      - 'ports/minimal/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 100
-    - name: Install packages
-      run: source tools/ci.sh && ci_code_size_setup
-    - name: Build
-      run: source tools/ci.sh && ci_code_size_build
-    - name: Compute code size difference
-      run: tools/metrics.py diff --error-threshold 0 ~/size0 ~/size1
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@ -1,14 +0,0 @@
-name: Check commit message formatting
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: '100'
-    - uses: actions/setup-python@v1
-    - name: Check commit message formatting
-      run: source tools/ci.sh && ci_commit_formatting_run
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@ -1,18 +0,0 @@
-name: Build docs
-
-on:
-  pull_request:
-    paths:
-      - docs/**
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v1
-    - name: Install Python packages
-      run: pip install Sphinx
-    - name: Build docs
-      run: make -C docs/ html
--- a/.github/workflows/ports_cc3200.yml
+++ b/.github/workflows/ports_cc3200.yml
@ -1,23 +0,0 @@
-name: cc3200 port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/cc3200/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_cc3200_setup
-    - name: Build
-      run: source tools/ci.sh && ci_cc3200_build
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@ -1,36 +0,0 @@
-name: esp32 port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/esp32/**'
-
-jobs:
-  idf3_build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf3_setup && ci_esp32_idf3_path >> $GITHUB_PATH
-    - name: Build
-      env:
-        IDF_PATH: ${{ github.workspace }}/esp-idf
-      run: source tools/ci.sh && ci_esp32_idf3_build
-
-  idf4_build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf4_setup && ci_esp32_idf4_path >> $GITHUB_PATH
-    - name: Build
-      env:
-        IDF_PATH: ${{ github.workspace }}/esp-idf
-      run: source tools/ci.sh && ci_esp32_idf4_build
--- a/.github/workflows/ports_esp8266.yml
+++ b/.github/workflows/ports_esp8266.yml
@ -1,23 +0,0 @@
-name: esp8266 port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/esp8266/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_esp8266_setup && ci_esp8266_path >> $GITHUB_PATH
-    - name: Build
-      run: source tools/ci.sh && ci_esp8266_build
--- a/.github/workflows/ports_nrf.yml
+++ b/.github/workflows/ports_nrf.yml
@ -1,23 +0,0 @@
-name: nrf port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/nrf/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_nrf_setup
-    - name: Build
-      run: source tools/ci.sh && ci_nrf_build
--- a/.github/workflows/ports_powerpc.yml
+++ b/.github/workflows/ports_powerpc.yml
@ -1,23 +0,0 @@
-name: powerpc port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/powerpc/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_powerpc_setup
-    - name: Build
-      run: source tools/ci.sh && ci_powerpc_build
--- a/.github/workflows/ports_qemu-arm.yml
+++ b/.github/workflows/ports_qemu-arm.yml
@ -1,27 +0,0 @@
-name: qemu-arm port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/qemu-arm/**'
-      - 'tests/**'
-
-jobs:
-  build_and_test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_qemu_arm_setup
-    - name: Build and run test suite
-      run: source tools/ci.sh && ci_qemu_arm_build
-    - name: Print failures
-      if: failure()
-      run: grep --text "FAIL" ports/qemu-arm/build/console.out
--- a/.github/workflows/ports_rp2.yml
+++ b/.github/workflows/ports_rp2.yml
@ -1,23 +0,0 @@
-name: rp2 port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/rp2/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_rp2_setup
-    - name: Build
-      run: source tools/ci.sh && ci_rp2_build
--- a/.github/workflows/ports_samd.yml
+++ b/.github/workflows/ports_samd.yml
@ -1,23 +0,0 @@
-name: samd port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/samd/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_samd_setup
-    - name: Build
-      run: source tools/ci.sh && ci_samd_build
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@ -1,32 +0,0 @@
-name: stm32 port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/stm32/**'
-
-jobs:
-  build_pyb:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_stm32_setup
-    - name: Build
-      run: source tools/ci.sh && ci_stm32_pyb_build
-
-  build_nucleo:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_stm32_setup
-    - name: Build
-      run: source tools/ci.sh && ci_stm32_nucleo_build
--- a/.github/workflows/ports_teensy.yml
+++ b/.github/workflows/ports_teensy.yml
@ -1,23 +0,0 @@
-name: teensy port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'drivers/**'
-      - 'ports/teensy/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_teensy_setup
-    - name: Build
-      run: source tools/ci.sh && ci_teensy_build
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@ -1,188 +0,0 @@
-name: unix port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'examples/**'
-      - 'ports/unix/**'
-      - 'tests/**'
-
-jobs:
-  minimal:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: source tools/ci.sh && ci_unix_minimal_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_minimal_run_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
-
-  reproducible:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build with reproducible date
-      run: source tools/ci.sh && ci_unix_minimal_build
-      env:
-        SOURCE_DATE_EPOCH: 1234567890
-    - name: Check reproducible build date
-      run: echo | ports/unix/micropython-minimal -i | grep 'on 2009-02-13;'
-
-  standard:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: source tools/ci.sh && ci_unix_standard_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_standard_run_tests
-    - name: Run performance benchmarks
-      run: source tools/ci.sh && ci_unix_standard_run_perfbench
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
-
-  coverage:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_unix_coverage_setup
-    - name: Build
-      run: source tools/ci.sh && ci_unix_coverage_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_coverage_run_tests
-    - name: Build native mpy modules
-      run: source tools/ci.sh && ci_native_mpy_modules_build
-    - name: Test importing .mpy generated by mpy_ld.py
-      run: source tools/ci.sh && ci_unix_coverage_run_native_mpy_tests
-    - name: Run lcov coverage analysis
-      run: |
-        mkdir -p coverage
-        lcov --rc lcov_branch_coverage=1 --directory ports/unix/build-coverage --capture --output-file coverage/lcov.info.all
-        lcov --remove coverage/lcov.info.all '*/lib/*' '*/ports/unix/*' '*/utils/*' --output-file coverage/lcov.info
-    - name: Send to coveralls
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
-
-  coverage_32bit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_unix_32bit_setup
-    - name: Build
-      run: source tools/ci.sh && ci_unix_coverage_32bit_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_coverage_32bit_run_tests
-    - name: Build native mpy modules
-      run: source tools/ci.sh && ci_native_mpy_modules_32bit_build
-    - name: Test importing .mpy generated by mpy_ld.py
-      run: source tools/ci.sh && ci_unix_coverage_32bit_run_native_mpy_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
-
-  nanbox:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_unix_32bit_setup
-    - name: Build
-      run: source tools/ci.sh && ci_unix_nanbox_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_nanbox_run_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
-
-  float:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: source tools/ci.sh && ci_unix_float_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_float_run_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
-
-  stackless_clang:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_unix_clang_setup
-    - name: Build
-      run: source tools/ci.sh && ci_unix_stackless_clang_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_stackless_clang_run_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
-
-  float_clang:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_unix_clang_setup
-    - name: Build
-      run: source tools/ci.sh && ci_unix_float_clang_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_float_clang_run_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
-
-  settrace:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: source tools/ci.sh && ci_unix_settrace_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_settrace_run_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
-
-  settrace_stackless:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: source tools/ci.sh && ci_unix_settrace_stackless_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_settrace_stackless_run_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
-
-  macos:
-    runs-on: macos-11.0
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v1
-    - name: Build
-      run: source tools/ci.sh && ci_unix_macos_build
-    - name: Run tests
-      run: source tools/ci.sh && ci_unix_macos_run_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests --print-failures
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@ -1,23 +0,0 @@
-name: windows port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/*.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'ports/unix/**'
-      - 'ports/windows/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_windows_setup
-    - name: Build
-      run: source tools/ci.sh && ci_windows_build
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@ -1,24 +0,0 @@
-name: zephyr port
-
-on:
-  push:
-  pull_request:
-    paths:
-      - '.github/workflows/ports_zephyr.yml'
-      - 'tools/**'
-      - 'py/**'
-      - 'extmod/**'
-      - 'lib/**'
-      - 'ports/zephyr/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_zephyr_setup
-    - name: Install Zephyr
-      run: source tools/ci.sh && ci_zephyr_install
-    - name: Build
-      run: source tools/ci.sh && ci_zephyr_build
--- a/.gitignore
+++ b/.gitignore
@ -20,14 +20,14 @@
 ######################
 *.swp

-# Build directories
+# Build directory
 ######################
 build/
-build-*/

 # Test failure outputs
 ######################
-tests/results/*
+tests/*.exp
+tests/*.out

 # Python cache files
 ######################
--- a/.gitmodules
+++ b/.gitmodules
@ -7,38 +7,7 @@
 	url = https://github.com/atgreen/libffi
 [submodule "lib/lwip"]
 	path = lib/lwip
-	url = https://git.savannah.gnu.org/r/lwip.git
+	url = http://git.savannah.gnu.org/r/lwip.git
 [submodule "lib/berkeley-db-1.xx"]
 	path = lib/berkeley-db-1.xx
 	url = https://github.com/pfalcon/berkeley-db-1.xx
-[submodule "lib/stm32lib"]
-	path = lib/stm32lib
-	url = https://github.com/micropython/stm32lib
-	branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
-[submodule "lib/nrfx"]
-	path = lib/nrfx
-	url = https://github.com/NordicSemiconductor/nrfx.git
-[submodule "lib/mbedtls"]
-	path = lib/mbedtls
-	url = https://github.com/ARMmbed/mbedtls.git
-[submodule "lib/asf4"]
-	path = lib/asf4
-	url = https://github.com/adafruit/asf4
-[submodule "lib/tinyusb"]
-	path = lib/tinyusb
-	url = https://github.com/hathach/tinyusb
-[submodule "lib/mynewt-nimble"]
-	path = lib/mynewt-nimble
-	url = https://github.com/apache/mynewt-nimble.git
-[submodule "lib/btstack"]
-	path = lib/btstack
-	url = https://github.com/bluekitchen/btstack.git
-[submodule "lib/nxp_driver"]
-	path = lib/nxp_driver
-	url = https://github.com/hathach/nxp_driver.git
-[submodule "lib/libhydrogen"]
-	path = lib/libhydrogen
-	url = https://github.com/jedisct1/libhydrogen.git
-[submodule "lib/pico-sdk"]
-	path = lib/pico-sdk
-	url = https://github.com/raspberrypi/pico-sdk.git
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,66 @@
+sudo: required
+dist: trusty
+language: c
+compiler:
+  - gcc
+cache:
+  directories:
+    - "${HOME}/persist"
+
+before_script:
+# Extra CPython versions
+#  - sudo add-apt-repository -y ppa:fkrull/deadsnakes
+# Extra gcc versions
+#  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
+  - sudo dpkg --add-architecture i386
+  - sudo apt-get update -qq || true
+  - sudo apt-get install -y python3 gcc-multilib pkg-config libffi-dev libffi-dev:i386 qemu-system gcc-mingw-w64
+  - sudo apt-get install -y --force-yes gcc-arm-none-eabi
+  # For teensy build
+  - sudo apt-get install realpath
+  # For coverage testing
+  - sudo pip install cpp-coveralls
+  - gcc --version
+  - arm-none-eabi-gcc --version
+  - python3 --version
+
+script:
+  - make -C mpy-cross
+  - make -C minimal CROSS=1 build/firmware.bin
+  - ls -l minimal/build/firmware.bin
+  - tools/check_code_size.sh
+  - mkdir -p ${HOME}/persist
+  # Save new firmware for reference, but only if building a main branch, not a pull request
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp minimal/build/firmware.bin ${HOME}/persist/; fi'
+  - make -C unix deplibs
+  - make -C unix
+  - make -C unix nanbox
+  - make -C bare-arm
+  - make -C qemu-arm test
+  - make -C stmhal
+  - make -C stmhal BOARD=PYBV11 MICROPY_PY_WIZNET5K=1 MICROPY_PY_CC3K=1
+  - make -C stmhal BOARD=STM32F769DISC
+  - make -C stmhal BOARD=STM32L476DISC
+  - make -C teensy
+  - make -C cc3200 BTARGET=application BTYPE=release
+  - make -C cc3200 BTARGET=bootloader  BTYPE=release
+  - make -C windows CROSS_COMPILE=i686-w64-mingw32-
+
+  # run tests without coverage info
+  #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests)
+  #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests --emit native)
+
+  # run tests with coverage info
+  - make -C unix coverage
+  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests)
+  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests -d thread)
+  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --emit native)
+  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --via-mpy -d basics float)
+
+  # run coveralls coverage analysis (try to, even if some builds/tests failed)
+  - (cd unix && coveralls --root .. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
+
+after_failure:
+  - (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)
+  - (grep "FAIL" qemu-arm/build/console.out)
--- a/1
+++ b/1
@ -762,6 +762,7 @@ today.  The names appear in order of pledging.
 1642 Udine
 1643 Simon Critchley
 1644 Sven Haiges, Germany
+ 1645 Yi Qing Sim
 1646 "silicium" ("silicium_one", if "silicium" is busy)
 1648 Andy O'Malia, @andyomalia
 1650 RedCamelApps.com
--- a/CODECONVENTIONS.md
+++ b/CODECONVENTIONS.md
@ -11,7 +11,7 @@ It's also ok to drop file extensions.

 Besides prefix, first line of a commit message should describe a
 change clearly and to the point, and be a grammatical sentence with
-final full stop. First line should fit within 72 characters. Examples
+final full stop. First line should fit within 78 characters. Examples
 of good first line of commit messages:

    py/objstr: Add splitlines() method.
@ -19,20 +19,16 @@ of good first line of commit messages:
    docs/machine: Fix typo in reset() description.
    ports: Switch to use lib/foo instead of duplicated code.

-After the first line add an empty line and in the following lines describe
-the change in a detail, if needed, with lines fitting within 75 characters
-(with an exception for long items like URLs which cannot be broken). Any
-change beyond 5 lines would likely require such detailed description.
+After the first line, add an empty line and in following lines describe
+a change in a detail, if needed. Any change beyond 5 lines would likely
+require such detailed description.

 To get good practical examples of good commits and their messages, browse
 the `git log` of the project.

-When committing you are encouraged to sign-off your commit by adding
-"Signed-off-by" lines and similar, eg using "git commit -s".  If you don't
-explicitly sign-off in this way then the commit message, which includes your
-name and email address in the "Author" line, implies your sign-off.  In either
-case, of explicit or implicit sign-off, you are certifying and signing off
-against the following:
+MicroPython doesn't require explicit sign-off for patches ("Signed-off-by"
+lines and similar). Instead, the commit message, and your name and email
+address on it construes your sign-off of the following:

 * That you wrote the change yourself, or took it from a project with
  a compatible license (in the latter case the commit message, and possibly
@ -46,35 +42,19 @@ against the following:
  copyright for your changes (for smaller changes, the commit message
  conveys your copyright; if you make significant changes to a particular
  source module, you're welcome to add your name to the file header).
-* Your contribution including commit message will be publicly and
-  indefinitely available for anyone to access, including redistribution
-  under the terms of the project's license.
-* Your signature for all of the above, which is the "Signed-off-by" line
-  or the "Author" line in the commit message, includes your full real name and
+* Your signature for all of the above, which is the 'Author' line in
+  the commit message, and which should include your full real name and
  a valid and active email address by which you can be contacted in the
  foreseeable future.

-Code auto-formatting
-====================
-
-Both C and Python code are auto-formatted using the `tools/codeformat.py`
-script.  This uses [uncrustify](https://github.com/uncrustify/uncrustify) to
-format C code and [black](https://github.com/psf/black) to format Python code.
-After making changes, and before committing, run this tool to reformat your
-changes to the correct style.  Without arguments this tool will reformat all
-source code (and may take some time to run).  Otherwise pass as arguments to
-the tool the files that changed and it will only reformat those.
-
 Python code conventions
 =======================

-Python code follows [PEP 8](https://legacy.python.org/dev/peps/pep-0008/) and
-is auto-formatted using [black](https://github.com/psf/black) with a line-length
-of 99 characters.
+Python code follows [PEP 8](http://legacy.python.org/dev/peps/pep-0008/).

 Naming conventions:
 - Module names are short and all lowercase; eg pyb, stm.
- Class names are CamelCase, with abbreviations all uppercase; eg I2C, not
+- Class names are CamelCase, with abreviations all uppercase; eg I2C, not
  I2c.
 - Function and method names are all lowercase with words separated by
  a single underscore as necessary to improve readability; eg mem_read.
@ -84,12 +64,7 @@ Naming conventions:
 C code conventions
 ==================

-C code is auto-formatted using [uncrustify](https://github.com/uncrustify/uncrustify)
-and the corresponding configuration file `tools/uncrustify.cfg`, with a few
-minor fix-ups applied by `tools/codeformat.py`.  When writing new C code please
-adhere to the existing style and use `tools/codeformat.py` to check any changes.
-The main conventions, and things not enforceable via the auto-formatter, are
-described below.
+When writing new C code, please adhere to the following conventions.

 White space:
 - Expand tabs to 4 spaces.
@ -150,7 +125,7 @@ Braces, spaces, names and comments:
            foo(x + TO_ADD, some_value - 1);
        }

-        for (int my_counter = 0; my_counter < x; ++my_counter) {
+        for (int my_counter = 0; my_counter < x; my_counter++) {
        }
    }

--- a/CODEOFCONDUCT.md
+++ b/CODEOFCONDUCT.md
@ -1,53 +0,0 @@
-MicroPython Code of Conduct
-===========================
-
-The MicroPython community is made up of members from around the globe with a
-diverse set of skills, personalities, and experiences.  It is through these
-differences that our community experiences great successes and continued growth.
-When you're working with members of the community, this Code of Conduct will
-help steer your interactions and keep MicroPython a positive, successful, and
-growing community.
-
-Members of the MicroPython community are open, considerate, and respectful.
-Behaviours that reinforce these values contribute to a positive environment, and
-include: acknowledging time and effort, being respectful of differing viewpoints
-and experiences, gracefully accepting constructive criticism, and using
-welcoming and inclusive language.
-
-Every member of our community has the right to have their identity respected.
-The MicroPython community is dedicated to providing a positive experience for
-everyone, regardless of age, gender identity and expression, sexual orientation,
-disability, physical appearance, body size, ethnicity, nationality, race, or
-religion (or lack thereof), education, or socio-economic status.
-
-Unacceptable behaviour includes: harassment, trolling, deliberate intimidation,
-violent threats or language directed against another person; insults, put downs,
-or jokes that are based upon stereotypes, that are exclusionary, or that hold
-others up for ridicule; unwelcome sexual attention or advances; sustained
-disruption of community discussions; publishing others' private information
-without explicit permission; and other conduct that is inappropriate for a
-professional audience including people of many different backgrounds.
-
-This code of conduct covers all online and offline presence related to the
-MicroPython project, including GitHub and the forum.  If a participant engages
-in behaviour that violates this code of conduct, the MicroPython team may take
-action as they deem appropriate, including warning the offender or expulsion
-from the community.  Community members asked to stop any inappropriate behaviour
-are expected to comply immediately.
-
-Thank you for helping make this a welcoming, friendly community for everyone.
-
-If you believe that someone is violating the code of conduct, or have any other
-concerns, please contact a member of the MicroPython team by emailing
-contact@micropython.org.
-
-License
-------
-
-This Code of Conduct is licensed under the Creative Commons
-Attribution-ShareAlike 3.0 Unported License.
-
-Attributions
------------
-
-Based on the Python code of conduct found at https://www.python.org/psf/conduct/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -3,6 +3,6 @@ make sure that you are acquainted with Contributor Guidelines:

 https://github.com/micropython/micropython/wiki/ContributorGuidelines

-as well as the Code Conventions, which includes details of how to commit:
+and Code Conventions:

 https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2013-2021 Damien P. George
+Copyright (c) 2013, 2014 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
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-[![CI badge](https://github.com/micropython/micropython/workflows/unix%20port/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![Coverage badge](https://coveralls.io/repos/micropython/micropython/badge.png?branch=master)](https://coveralls.io/r/micropython/micropython?branch=master)
+[![Build Status](https://travis-ci.org/micropython/micropython.png?branch=master)](https://travis-ci.org/micropython/micropython) [![Coverage Status](https://coveralls.io/repos/micropython/micropython/badge.png?branch=master)](https://coveralls.io/r/micropython/micropython?branch=master)

 The MicroPython project
 =======================
@ -34,25 +34,24 @@ Major components in this repository:
  core library.
 - mpy-cross/ -- the MicroPython cross-compiler which is used to turn scripts
  into precompiled bytecode.
- ports/unix/ -- a version of MicroPython that runs on Unix.
- ports/stm32/ -- a version of MicroPython that runs on the PyBoard and similar
+- unix/ -- a version of MicroPython that runs on Unix.
+- stmhal/ -- a version of MicroPython that runs on the PyBoard and similar
  STM32 boards (using ST's Cube HAL drivers).
- ports/minimal/ -- a minimal MicroPython port. Start with this if you want
+- minimal/ -- a minimal MicroPython port. Start with this if you want
  to port MicroPython to another microcontroller.
 - tests/ -- test framework and test scripts.
 - docs/ -- user documentation in Sphinx reStructuredText format. Rendered
-  HTML documentation is available at http://docs.micropython.org.
+  HTML documentation is available at http://docs.micropython.org (be sure
+  to select needed board/port at the bottom left corner).

 Additional components:
- ports/bare-arm/ -- a bare minimum version of MicroPython for ARM MCUs. Used
+- bare-arm/ -- a bare minimum version of MicroPython for ARM MCUs. Used
  mostly to control code size.
- ports/teensy/ -- a version of MicroPython that runs on the Teensy 3.1
+- teensy/ -- a version of MicroPython that runs on the Teensy 3.1
  (preliminary but functional).
- ports/pic16bit/ -- a version of MicroPython for 16-bit PIC microcontrollers.
- ports/cc3200/ -- a version of MicroPython that runs on the CC3200 from TI.
- ports/esp8266/ -- a version of MicroPython that runs on Espressif's ESP8266 SoC.
- ports/esp32/ -- a version of MicroPython that runs on Espressif's ESP32 SoC.
- ports/nrf/ -- a version of MicroPython that runs on Nordic's nRF51 and nRF52 MCUs.
+- pic16bit/ -- a version of MicroPython for 16-bit PIC microcontrollers.
+- cc3200/ -- a version of MicroPython that runs on the CC3200 from TI.
+- esp8266/ -- an experimental port for ESP8266 WiFi modules.
 - extmod/ -- additional (non-core) modules implemented in C.
 - tools/ -- various tools, including the pyboard.py module.
 - examples/ -- a few example Python scripts.
@ -60,20 +59,7 @@ Additional components:
 The subdirectories above may include READMEs with additional info.

 "make" is used to build the components, or "gmake" on BSD-based systems.
-You will also need bash, gcc, and Python 3.3+ available as the command `python3`
-(if your system only has Python 2.7 then invoke make with the additional option
-`PYTHON=python2`).
-
-The MicroPython cross-compiler, mpy-cross
-----------------------------------------
-
-Most ports require the MicroPython cross-compiler to be built first.  This
-program, called mpy-cross, is used to pre-compile Python scripts to .mpy
-files which can then be included (frozen) into the firmware/executable for
-a port.  To build mpy-cross use:
-
-    $ cd mpy-cross
-    $ make
+You will also need bash and Python (at least 2.7 or 3.3).

 The Unix version
 ----------------
@ -86,8 +72,8 @@ Alternatively, fallback implementation based on setjmp/longjmp can be used.

 To build (see section below for required dependencies):

-    $ cd ports/unix
-    $ make submodules
+    $ cd unix
+    $ make axtls
    $ make

 Then to give it a try:
@ -99,7 +85,7 @@ Use `CTRL-D` (i.e. EOF) to exit the shell.
 Learn about command-line options (in particular, how to increase heap size
 which may be needed for larger applications):

-    $ ./micropython -h
+    $ ./micropython --help

 Run complete testsuite:

@ -118,50 +104,44 @@ Standard library modules come from
 External dependencies
 ---------------------

-Building MicroPython ports may require some dependencies installed.
-
-For Unix port, `libffi` library and `pkg-config` tool are required. On
+Building Unix version requires some dependencies installed. For
 Debian/Ubuntu/Mint derivative Linux distros, install `build-essential`
 (includes toolchain and make), `libffi-dev`, and `pkg-config` packages.

-Other dependencies can be built together with MicroPython. This may
-be required to enable extra features or capabilities, and in recent
-versions of MicroPython, these may be enabled by default. To build
-these additional dependencies, in the port directory you're
-interested in (e.g. `ports/unix/`) first execute:
+Other dependencies can be built together with MicroPython. Oftentimes,
+you need to do this to enable extra features or capabilities. To build
+these additional dependencies, first fetch git submodules for them:

-    $ make submodules
+    $ git submodule update --init

-This will fetch all the relevant git submodules (sub repositories) that
-the port needs.  Use the same command to get the latest versions of
-submodules as they are updated from time to time. After that execute:
+Use this same command to get the latest versions of dependencies, as
+they are updated from time to time. After that, in `unix/` dir, execute:

    $ make deplibs

 This will build all available dependencies (regardless whether they
 are used or not). If you intend to build MicroPython with additional
 options (like cross-compiling), the same set of options should be passed
-to `make deplibs`. To actually enable/disable use of dependencies, edit
-`ports/unix/mpconfigport.mk` file, which has inline descriptions of the options.
-For example, to build SSL module (required for `upip` tool described above,
-and so enabled by default), `MICROPY_PY_USSL` should be set to 1.
+to `make deplibs`. To actually enabled use of dependencies, edit
+`unix/mpconfigport.mk` file, which has inline descriptions of the options.
+For example, to build SSL module (required for `upip` tool described above),
+set `MICROPY_PY_USSL` to 1.

-For some ports, building required dependences is transparent, and happens
-automatically.  But they still need to be fetched with the `make submodules`
-command.
+In `unix/mpconfigport.mk`, you can also disable some dependencies enabled
+by default, like FFI support, which requires libffi development files to
+be installed.

-The STM32 version
-----------------
+The STM version
+---------------

-The "stm32" port requires an ARM compiler, arm-none-eabi-gcc, and associated
-bin-utils.  For those using Arch Linux, you need arm-none-eabi-binutils,
-arm-none-eabi-gcc and arm-none-eabi-newlib packages.  Otherwise, try here:
+The "stmhal" port requires an ARM compiler, arm-none-eabi-gcc, and associated
+bin-utils.  For those using Arch Linux, you need arm-none-eabi-binutils and
+arm-none-eabi-gcc packages.  Otherwise, try here:
 https://launchpad.net/gcc-arm-embedded

 To build:

-    $ cd ports/stm32
-    $ make submodules
+    $ cd stmhal
    $ make

 You then need to get your board into DFU mode.  On the pyboard, connect the
@ -175,14 +155,4 @@ Then to flash the code via USB DFU to your device:
 This will use the included `tools/pydfu.py` script.  If flashing the firmware
 does not work it may be because you don't have the correct permissions, and
 need to use `sudo make deploy`.
-See the README.md file in the ports/stm32/ directory for further details.
-
-Contributing
------------
-
-MicroPython is an open-source project and welcomes contributions. To be
-productive, please be sure to follow the
-[Contributors' Guidelines](https://github.com/micropython/micropython/wiki/ContributorGuidelines)
-and the [Code Conventions](https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md).
-Note that MicroPython is licenced under the MIT license, and all contributions
-should follow this license.
+See the README.md file in the stmhal/ directory for further details.
--- a/bare-arm/Makefile
+++ b/bare-arm/Makefile
@ -0,0 +1,48 @@
+include ../py/mkenv.mk
+
+# qstr definitions (must come before including py.mk)
+QSTR_DEFS = qstrdefsport.h
+
+# include py core make definitions
+include ../py/py.mk
+
+CROSS_COMPILE = arm-none-eabi-
+
+INC += -I.
+INC += -I..
+INC += -I$(BUILD)
+
+CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
+CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
+
+#Debugging/Optimization
+ifeq ($(DEBUG), 1)
+CFLAGS += -O0 -ggdb
+else
+CFLAGS += -Os -DNDEBUG
+endif
+
+LDFLAGS = -nostdlib -T stm32f405.ld -Map=$@.map --cref
+LIBS =
+
+SRC_C = \
+	main.c \
+#	printf.c \
+	string0.c \
+	malloc0.c \
+	gccollect.c \
+
+SRC_S = \
+#	startup_stm32f40xx.s \
+	gchelper.s \
+
+OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(SRC_S:.s=.o))
+
+all: $(BUILD)/firmware.elf
+
+$(BUILD)/firmware.elf: $(OBJ)
+	$(ECHO) "LINK $@"
+	$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(Q)$(SIZE) $@
+
+include ../py/mkrules.mk
--- a/bare-arm/main.c
+++ b/bare-arm/main.c
@ -0,0 +1,97 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "py/nlr.h"
+#include "py/compile.h"
+#include "py/runtime.h"
+#include "py/repl.h"
+#include "py/mperrno.h"
+
+void do_str(const char *src, mp_parse_input_kind_t input_kind) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
+        qstr source_name = lex->source_name;
+        mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
+        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, MP_EMIT_OPT_NONE, true);
+        mp_call_function_0(module_fun);
+        nlr_pop();
+    } else {
+        // uncaught exception
+        mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
+    }
+}
+
+int main(int argc, char **argv) {
+    mp_init();
+    do_str("print('hello world!', list(x+1 for x in range(10)), end='eol\\n')", MP_PARSE_SINGLE_INPUT);
+    do_str("for i in range(10):\n  print(i)", MP_PARSE_FILE_INPUT);
+    mp_deinit();
+    return 0;
+}
+
+mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+    mp_raise_OSError(MP_ENOENT);
+}
+
+mp_import_stat_t mp_import_stat(const char *path) {
+    return MP_IMPORT_STAT_NO_EXIST;
+}
+
+mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
+
+void nlr_jump_fail(void *val) {
+    while (1);
+}
+
+void NORETURN __fatal_error(const char *msg) {
+    while (1);
+}
+
+#ifndef NDEBUG
+void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
+    printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
+    __fatal_error("Assertion failed");
+}
+#endif
+
+/*
+int _lseek() {return 0;}
+int _read() {return 0;}
+int _write() {return 0;}
+int _close() {return 0;}
+void _exit(int x) {for(;;){}}
+int _sbrk() {return 0;}
+int _kill() {return 0;}
+int _getpid() {return 0;}
+int _fstat() {return 0;}
+int _isatty() {return 0;}
+*/
+
+void *malloc(size_t n) {return NULL;}
+void *calloc(size_t nmemb, size_t size) {return NULL;}
+void *realloc(void *ptr, size_t size) {return NULL;}
+void free(void *p) {}
+int printf(const char *m, ...) {return 0;}
+void *memcpy(void *dest, const void *src, size_t n) {return NULL;}
+int memcmp(const void *s1, const void *s2, size_t n) {return 0;}
+void *memmove(void *dest, const void *src, size_t n) {return NULL;}
+void *memset(void *s, int c, size_t n) {return NULL;}
+int strcmp(const char *s1, const char* s2) {return 0;}
+int strncmp(const char *s1, const char* s2, size_t n) {return 0;}
+size_t strlen(const char *s) {return 0;}
+char *strcat(char *dest, const char *src) {return NULL;}
+char *strchr(const char *dest, int c) {return NULL;}
+#include <stdarg.h>
+int vprintf(const char *format, va_list ap) {return 0;}
+int vsnprintf(char *str,  size_t  size,  const  char  *format, va_list ap) {return 0;}
+
+#undef putchar
+int putchar(int c) {return 0;}
+int puts(const char *s) {return 0;}
+
+void _start(void) {main(0, NULL);}
--- a/bare-arm/mpconfigport.h
+++ b/bare-arm/mpconfigport.h
@ -0,0 +1,66 @@
+#include <stdint.h>
+
+// options to control how Micro Python is built
+
+#define MICROPY_QSTR_BYTES_IN_HASH  (1)
+#define MICROPY_ALLOC_PATH_MAX      (512)
+#define MICROPY_EMIT_X64            (0)
+#define MICROPY_EMIT_THUMB          (0)
+#define MICROPY_EMIT_INLINE_THUMB   (0)
+#define MICROPY_COMP_MODULE_CONST   (0)
+#define MICROPY_COMP_CONST          (0)
+#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
+#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
+#define MICROPY_MEM_STATS           (0)
+#define MICROPY_DEBUG_PRINTERS      (0)
+#define MICROPY_ENABLE_GC           (0)
+#define MICROPY_HELPER_REPL         (0)
+#define MICROPY_HELPER_LEXER_UNIX   (0)
+#define MICROPY_ENABLE_SOURCE_LINE  (0)
+#define MICROPY_ENABLE_DOC_STRING   (0)
+#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
+#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
+#define MICROPY_PY_ASYNC_AWAIT (0)
+#define MICROPY_PY_BUILTINS_BYTEARRAY (0)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
+#define MICROPY_PY_BUILTINS_ENUMERATE (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_PROPERTY (0)
+#define MICROPY_PY___FILE__         (0)
+#define MICROPY_PY_GC               (0)
+#define MICROPY_PY_ARRAY            (0)
+#define MICROPY_PY_ATTRTUPLE        (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              (0)
+#define MICROPY_CPYTHON_COMPAT      (0)
+#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_NONE)
+#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_NONE)
+#define MICROPY_USE_INTERNAL_PRINTF (0)
+
+// type definitions for the specific machine
+
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+
+#define UINT_FMT "%lu"
+#define INT_FMT "%ld"
+
+typedef int32_t mp_int_t; // must be pointer size
+typedef uint32_t mp_uint_t; // must be pointer size
+typedef long mp_off_t;
+
+// dummy print
+#define MP_PLAT_PRINT_STRN(str, len) (void)0
+
+// extra built in names to add to the global namespace
+#define MICROPY_PORT_BUILTINS \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
+
+// We need to provide a declaration/definition of alloca()
+#include <alloca.h>
--- a/ports/bare-arm/mphalport.h
+++ b/ports/bare-arm/mphalport.h
--- a/bare-arm/qstrdefsport.h
+++ b/bare-arm/qstrdefsport.h
@ -0,0 +1 @@
+// qstrs specific to this port
--- a/ports/bare-arm/stm32f405.ld
+++ b/ports/bare-arm/stm32f405.ld
--- a/ports/cc3200/FreeRTOS/FreeRTOSConfig.h
+++ b/ports/cc3200/FreeRTOS/FreeRTOSConfig.h
--- a/ports/cc3200/FreeRTOS/License/license.txt
+++ b/ports/cc3200/FreeRTOS/License/license.txt
--- a/ports/cc3200/FreeRTOS/Source/croutine.c
+++ b/ports/cc3200/FreeRTOS/Source/croutine.c
--- a/ports/cc3200/FreeRTOS/Source/event_groups.c
+++ b/ports/cc3200/FreeRTOS/Source/event_groups.c
--- a/ports/cc3200/FreeRTOS/Source/include/FreeRTOS.h
+++ b/ports/cc3200/FreeRTOS/Source/include/FreeRTOS.h
--- a/ports/cc3200/FreeRTOS/Source/include/StackMacros.h
+++ b/ports/cc3200/FreeRTOS/Source/include/StackMacros.h
--- a/ports/cc3200/FreeRTOS/Source/include/croutine.h
+++ b/ports/cc3200/FreeRTOS/Source/include/croutine.h
--- a/ports/cc3200/FreeRTOS/Source/include/deprecated_definitions.h
+++ b/ports/cc3200/FreeRTOS/Source/include/deprecated_definitions.h
--- a/ports/cc3200/FreeRTOS/Source/include/event_groups.h
+++ b/ports/cc3200/FreeRTOS/Source/include/event_groups.h
--- a/ports/cc3200/FreeRTOS/Source/include/list.h
+++ b/ports/cc3200/FreeRTOS/Source/include/list.h
--- a/ports/cc3200/FreeRTOS/Source/include/mpu_prototypes.h
+++ b/ports/cc3200/FreeRTOS/Source/include/mpu_prototypes.h
--- a/ports/cc3200/FreeRTOS/Source/include/mpu_wrappers.h
+++ b/ports/cc3200/FreeRTOS/Source/include/mpu_wrappers.h
--- a/ports/cc3200/FreeRTOS/Source/include/portable.h
+++ b/ports/cc3200/FreeRTOS/Source/include/portable.h
--- a/ports/cc3200/FreeRTOS/Source/include/projdefs.h
+++ b/ports/cc3200/FreeRTOS/Source/include/projdefs.h
--- a/ports/cc3200/FreeRTOS/Source/include/queue.h
+++ b/ports/cc3200/FreeRTOS/Source/include/queue.h
--- a/ports/cc3200/FreeRTOS/Source/include/semphr.h
+++ b/ports/cc3200/FreeRTOS/Source/include/semphr.h
--- a/ports/cc3200/FreeRTOS/Source/include/task.h
+++ b/ports/cc3200/FreeRTOS/Source/include/task.h
--- a/ports/cc3200/FreeRTOS/Source/include/timers.h
+++ b/ports/cc3200/FreeRTOS/Source/include/timers.h
--- a/ports/cc3200/FreeRTOS/Source/list.c
+++ b/ports/cc3200/FreeRTOS/Source/list.c
--- a/ports/cc3200/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
+++ b/ports/cc3200/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
--- a/ports/cc3200/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
+++ b/ports/cc3200/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
--- a/ports/cc3200/FreeRTOS/Source/portable/MemMang/heap_4.c
+++ b/ports/cc3200/FreeRTOS/Source/portable/MemMang/heap_4.c
--- a/ports/cc3200/FreeRTOS/Source/queue.c
+++ b/ports/cc3200/FreeRTOS/Source/queue.c
--- a/ports/cc3200/FreeRTOS/Source/tasks.c
+++ b/ports/cc3200/FreeRTOS/Source/tasks.c
--- a/ports/cc3200/FreeRTOS/Source/timers.c
+++ b/ports/cc3200/FreeRTOS/Source/timers.c
--- a/cc3200/Makefile
+++ b/cc3200/Makefile
@ -0,0 +1,63 @@
+# Select the board to build for: if not given on the command line,
+# then default to WIPY
+BOARD ?= WIPY
+ifeq ($(wildcard boards/$(BOARD)/.),)
+$(error Invalid BOARD specified)
+endif
+
+# Make 'release' the default build type
+BTYPE ?= release
+
+# Port for flashing firmware
+PORT ?= /dev/ttyUSB1
+
+# If the build directory is not given, make it reflect the board name.
+BUILD ?= build/$(BOARD)/$(BTYPE)
+
+include ../py/mkenv.mk
+-include ../../localconfig.mk
+
+CROSS_COMPILE ?= arm-none-eabi-
+
+CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -march=armv7e-m -mabi=aapcs -mcpu=cortex-m4 -msoft-float -mfloat-abi=soft -fsingle-precision-constant -Wdouble-promotion
+CFLAGS = -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) -Os
+CFLAGS += -g -ffunction-sections -fdata-sections -fno-common -fsigned-char -mno-unaligned-access
+CFLAGS += -Iboards/$(BOARD)
+CFLAGS += $(CFLAGS_MOD)
+
+LDFLAGS = -Wl,-nostdlib -Wl,--gc-sections -Wl,-Map=$@.map
+
+FLASH_SIZE_WIPY = 2M
+FLASH_SIZE_LAUNCHXL = 1M
+
+ifeq ($(BTARGET), application)
+# qstr definitions (must come before including py.mk)
+QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
+# include MicroPython make definitions
+include ../py/py.mk
+include application.mk
+else
+ifeq ($(BTARGET), bootloader)
+include bootmgr/bootloader.mk
+else
+$(error Invalid BTARGET specified)
+endif
+endif
+
+# always include MicroPython make rules
+include ../py/mkrules.mk
+
+erase:
+	cc3200tool -p $(PORT) format_flash --size $(FLASH_SIZE_$(BOARD))
+
+deploy:
+	cc3200tool -p $(PORT) \
+	    write_file bootmgr/build/$(BOARD)/$(BTYPE)/bootloader.bin /sys/mcuimg.bin \
+	    write_file build/$(BOARD)/$(BTYPE)/mcuimg.bin /sys/factimg.bin
+
+# Files *.ucf and *ucf.signed.bin come from CC3200SDK-SERVICEPACK
+# package from http://www.ti.com/tool/cc3200sdk
+servicepack:
+	cc3200tool -p $(PORT) \
+	write_file --file-size=0x20000 --signature ota_1.0.1.6-2.7.0.0.ucf.signed.bin \
+	    ota_1.0.1.6-2.7.0.0.ucf /sys/servicepack.ucf
--- a/ports/cc3200/README.md
+++ b/ports/cc3200/README.md
--- a/ports/cc3200/application.lds
+++ b/ports/cc3200/application.lds
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
@ -37,7 +37,7 @@ ENTRY(ResetISR)

 SECTIONS
 {  
-    /* place the FreeRTOS heap (the MicroPython stack will live here) */
+    /* place the FreeRTOS heap (the micropython stack will live here) */
    .rtos_heap (NOLOAD) :
    {
        . = ALIGN(8);
@ -83,7 +83,7 @@ SECTIONS
    } > SRAM

    /* place here functions that are only called during boot up, */
-    /* that way, we can re-use this area for the MicroPython heap */
+    /* that way, we can re-use this area for the micropython heap */
    .boot :
    {
        . = ALIGN(8);
@ -93,7 +93,7 @@ SECTIONS
        _eboot = .;
    } > SRAM
     
-    /* allocate the MicroPython heap */
+    /* allocate the micropython heap */
    .heap :
    {
        . = ALIGN(8);
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@ -1,5 +1,5 @@
 APP_INC =  -I.
-APP_INC += -I$(TOP)
+APP_INC += -I..
 APP_INC += -Ifatfs/src
 APP_INC += -Ifatfs/src/drivers
 APP_INC += -IFreeRTOS
@ -10,7 +10,7 @@ APP_INC += -Ihal
 APP_INC += -Ihal/inc
 APP_INC += -Imisc
 APP_INC += -Imods
-APP_INC += -I$(TOP)/drivers/cc3100/inc
+APP_INC += -I../drivers/cc3100/inc
 APP_INC += -Isimplelink
 APP_INC += -Isimplelink/oslib
 APP_INC += -Itelnet
@ -18,7 +18,7 @@ APP_INC += -Iutil
 APP_INC += -Ibootmgr
 APP_INC += -I$(BUILD)
 APP_INC += -I$(BUILD)/genhdr
-APP_INC += -I$(TOP)/ports/stm32
+APP_INC += -I../stmhal

 APP_CPPDEFINES = -Dgcc -DTARGET_IS_CC3200 -DSL_FULL -DUSE_FREERTOS

@ -73,11 +73,13 @@ APP_MISC_SRC_C = $(addprefix misc/,\
 	help.c \
 	mpirq.c \
 	mperror.c \
+	mpexception.c \
 	)

 APP_MODS_SRC_C = $(addprefix mods/,\
 	modmachine.c \
 	modnetwork.c \
+	modubinascii.c \
 	moduos.c \
 	modusocket.c \
 	modussl.c \
@ -111,12 +113,12 @@ APP_CC3100_SRC_C = $(addprefix drivers/cc3100/src/,\
 APP_SL_SRC_C = $(addprefix simplelink/,\
 	oslib/osi_freertos.c \
 	cc_pal.c \
-	)
+	) 

 APP_TELNET_SRC_C = $(addprefix telnet/,\
 	telnet.c \
 	)
-
+	
 APP_UTIL_SRC_C = $(addprefix util/,\
 	cryptohash.c \
 	fifo.c \
@ -124,33 +126,31 @@ APP_UTIL_SRC_C = $(addprefix util/,\
 	random.c \
 	socketfifo.c \
 	)
-
+	
 APP_UTIL_SRC_S = $(addprefix util/,\
-	cortex_m3_get_sp.s \
+	gchelper.s \
 	sleeprestore.s \
 	)
-
+	
 APP_MAIN_SRC_C = \
 	main.c \
 	mptask.c \
 	mpthreadport.c \
 	serverstask.c \
 	fatfs_port.c \
-
+	
 APP_LIB_SRC_C = $(addprefix lib/,\
 	oofatfs/ff.c \
-	oofatfs/ffunicode.c \
+	oofatfs/option/unicode.c \
 	libc/string0.c \
 	mp-readline/readline.c \
 	netutils/netutils.c \
 	timeutils/timeutils.c \
-	utils/gchelper_native.c \
 	utils/pyexec.c \
-	utils/interrupt_char.c \
 	utils/sys_stdio_mphal.c \
 	)
-
-APP_STM_SRC_C = $(addprefix ports/stm32/,\
+	
+APP_STM_SRC_C = $(addprefix stmhal/,\
 	bufhelper.c \
 	irq.c \
 	)
@ -158,7 +158,6 @@ APP_STM_SRC_C = $(addprefix ports/stm32/,\
 OBJ = $(PY_O) $(addprefix $(BUILD)/, $(APP_FATFS_SRC_C:.c=.o) $(APP_RTOS_SRC_C:.c=.o) $(APP_FTP_SRC_C:.c=.o) $(APP_HAL_SRC_C:.c=.o) $(APP_MISC_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_CC3100_SRC_C:.c=.o) $(APP_SL_SRC_C:.c=.o) $(APP_TELNET_SRC_C:.c=.o) $(APP_UTIL_SRC_C:.c=.o) $(APP_UTIL_SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
-OBJ += $(BUILD)/lib/utils/gchelper_m3.o
 OBJ += $(BUILD)/pins.o

 # List of sources for qstr extraction
@ -182,7 +181,7 @@ ifeq ($(BTYPE), release)
 CFLAGS += -DNDEBUG
 else
 ifeq ($(BTYPE), debug)
-CFLAGS += -DDEBUG
+CFLAGS += -DNDEBUG
 else
 $(error Invalid BTYPE specified)
 endif
--- a/ports/cc3200/appsign.sh
+++ b/ports/cc3200/appsign.sh
--- a/cc3200/boards/LAUNCHXL/mpconfigboard.h
+++ b/cc3200/boards/LAUNCHXL/mpconfigboard.h
@ -0,0 +1,49 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * 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.
+ */
+
+#define LAUNCHXL
+
+#define MICROPY_HW_BOARD_NAME                       "LaunchPad"
+#define MICROPY_HW_MCU_NAME                         "CC3200"
+
+#define MICROPY_HW_ANTENNA_DIVERSITY                (0)
+
+#define MICROPY_STDIO_UART                          1
+#define MICROPY_STDIO_UART_BAUD                     115200
+
+#define MICROPY_SYS_LED_PRCM                        PRCM_GPIOA1
+#define MICROPY_SAFE_BOOT_PRCM                      PRCM_GPIOA2
+#define MICROPY_SYS_LED_PORT                        GPIOA1_BASE
+#define MICROPY_SAFE_BOOT_PORT                      GPIOA2_BASE
+#define MICROPY_SYS_LED_GPIO                        pin_GP9
+#define MICROPY_SYS_LED_PIN_NUM                     PIN_64      // GP9
+#define MICROPY_SAFE_BOOT_PIN_NUM                   PIN_15      // GP22
+#define MICROPY_SYS_LED_PORT_PIN                    GPIO_PIN_1
+#define MICROPY_SAFE_BOOT_PORT_PIN                  GPIO_PIN_6
+
+#define MICROPY_PORT_SFLASH_BLOCK_COUNT             32
+
--- a/ports/cc3200/boards/LAUNCHXL/pins.csv
+++ b/ports/cc3200/boards/LAUNCHXL/pins.csv
--- a/cc3200/boards/WIPY/mpconfigboard.h
+++ b/cc3200/boards/WIPY/mpconfigboard.h
@ -0,0 +1,48 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * 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.
+ */
+
+#define WIPY
+
+#define MICROPY_HW_BOARD_NAME                       "WiPy"
+#define MICROPY_HW_MCU_NAME                         "CC3200"
+
+#define MICROPY_HW_ANTENNA_DIVERSITY                (1)
+
+#define MICROPY_STDIO_UART                          1
+#define MICROPY_STDIO_UART_BAUD                     115200
+
+#define MICROPY_SYS_LED_PRCM                        PRCM_GPIOA3
+#define MICROPY_SAFE_BOOT_PRCM                      PRCM_GPIOA3
+#define MICROPY_SYS_LED_PORT                        GPIOA3_BASE
+#define MICROPY_SAFE_BOOT_PORT                      GPIOA3_BASE
+#define MICROPY_SYS_LED_GPIO                        pin_GP25
+#define MICROPY_SYS_LED_PIN_NUM                     PIN_21      // GP25   (SOP2)
+#define MICROPY_SAFE_BOOT_PIN_NUM                   PIN_18      // GP28
+#define MICROPY_SYS_LED_PORT_PIN                    GPIO_PIN_1
+#define MICROPY_SAFE_BOOT_PORT_PIN                  GPIO_PIN_4
+
+#define MICROPY_PORT_SFLASH_BLOCK_COUNT             96
--- a/ports/cc3200/boards/WIPY/pins.csv
+++ b/ports/cc3200/boards/WIPY/pins.csv
--- a/ports/cc3200/boards/cc3200_af.csv
+++ b/ports/cc3200/boards/cc3200_af.csv
--- a/ports/cc3200/boards/cc3200_prefix.c
+++ b/ports/cc3200/boards/cc3200_prefix.c
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
--- a/cc3200/boards/make-pins.py
+++ b/cc3200/boards/make-pins.py
@ -0,0 +1,233 @@
+#!/usr/bin/env python
+"""Generates the pins file for the CC3200."""
+
+from __future__ import print_function
+
+import argparse
+import sys
+import csv
+
+
+SUPPORTED_AFS = { 'UART': ('TX', 'RX', 'RTS', 'CTS'),
+                  'SPI': ('CLK', 'MOSI', 'MISO', 'CS0'),
+                  #'I2S': ('CLK', 'FS', 'DAT0', 'DAT1'),
+                  'I2C': ('SDA', 'SCL'),
+                  'TIM': ('PWM'),
+                  'SD': ('CLK', 'CMD', 'DAT0'),
+                  'ADC': ('CH0', 'CH1', 'CH2', 'CH3')
+                }
+
+def parse_port_pin(name_str):
+    """Parses a string and returns a (port, gpio_bit) tuple."""
+    if len(name_str) < 3:
+        raise ValueError("Expecting pin name to be at least 3 characters")
+    if name_str[:2] != 'GP':
+        raise ValueError("Expecting pin name to start with GP")
+    if not name_str[2:].isdigit():
+        raise ValueError("Expecting numeric GPIO number")
+    port = int(int(name_str[2:]) / 8)
+    gpio_bit = 1 << int(int(name_str[2:]) % 8)
+    return (port, gpio_bit)
+
+
+class AF:
+    """Holds the description of an alternate function"""
+    def __init__(self, name, idx, fn, unit, type):
+        self.name = name
+        self.idx = idx
+        if self.idx > 15:
+            self.idx = -1
+        self.fn = fn
+        self.unit = unit
+        self.type = type
+
+    def print(self):
+        print ('    AF({:16s}, {:4d}, {:8s}, {:4d}, {:8s}),    // {}'.format(self.name, self.idx, self.fn, self.unit, self.type, self.name))
+
+
+class Pin:
+    """Holds the information associated with a pin."""
+    def __init__(self, name, port, gpio_bit, pin_num):
+        self.name = name
+        self.port = port
+        self.gpio_bit = gpio_bit
+        self.pin_num = pin_num
+        self.board_pin = False
+        self.afs = []
+
+    def add_af(self, af):
+        self.afs.append(af)
+
+    def print(self):
+        print('// {}'.format(self.name))
+        if len(self.afs):
+            print('const pin_af_t pin_{}_af[] = {{'.format(self.name))
+            for af in self.afs:
+                af.print()
+            print('};')
+            print('pin_obj_t pin_{:4s} = PIN({:6s}, {:1d}, {:3d}, {:2d}, pin_{}_af, {});\n'.format(
+                   self.name, self.name, self.port, self.gpio_bit, self.pin_num, self.name, len(self.afs)))
+        else:
+            print('pin_obj_t pin_{:4s} = PIN({:6s}, {:1d}, {:3d}, {:2d}, NULL, 0);\n'.format(
+                   self.name, self.name, self.port, self.gpio_bit, self.pin_num))
+
+    def print_header(self, hdr_file):
+        hdr_file.write('extern pin_obj_t pin_{:s};\n'.format(self.name))
+
+
+class Pins:
+    def __init__(self):
+        self.board_pins = []   # list of pin objects
+
+    def find_pin(self, port, gpio_bit):
+        for pin in self.board_pins:
+            if pin.port == port and pin.gpio_bit == gpio_bit:
+                return pin
+
+    def find_pin_by_num(self, pin_num):
+        for pin in self.board_pins:
+            if pin.pin_num == pin_num:
+                return pin
+
+    def find_pin_by_name(self, name):
+        for pin in self.board_pins:
+            if pin.name == name:
+                return pin
+
+    def parse_af_file(self, filename, pin_col, pinname_col, af_start_col):
+        with open(filename, 'r') as csvfile:
+            rows = csv.reader(csvfile)
+            for row in rows:
+                try:
+                    (port_num, gpio_bit) = parse_port_pin(row[pinname_col])
+                except:
+                    continue
+                if not row[pin_col].isdigit():
+                    raise ValueError("Invalid pin number {:s} in row {:s}".format(row[pin_col]), row)
+                # Pin numbers must start from 0 when used with the TI API
+                pin_num = int(row[pin_col]) - 1;        
+                pin = Pin(row[pinname_col], port_num, gpio_bit, pin_num)
+                self.board_pins.append(pin)
+                af_idx = 0
+                for af in row[af_start_col:]:
+                    af_splitted = af.split('_')
+                    fn_name = af_splitted[0].rstrip('0123456789')
+                    if  fn_name in SUPPORTED_AFS:
+                        type_name = af_splitted[1]
+                        if type_name in SUPPORTED_AFS[fn_name]:
+                            unit_idx = af_splitted[0][-1]
+                            pin.add_af(AF(af, af_idx, fn_name, int(unit_idx), type_name))
+                    af_idx += 1
+
+    def parse_board_file(self, filename, cpu_pin_col):
+        with open(filename, 'r') as csvfile:
+            rows = csv.reader(csvfile)
+            for row in rows:
+                # Pin numbers must start from 0 when used with the TI API
+                if row[cpu_pin_col].isdigit():
+                    pin = self.find_pin_by_num(int(row[cpu_pin_col]) - 1)
+                else:
+                    pin = self.find_pin_by_name(row[cpu_pin_col])
+                if pin:
+                    pin.board_pin = True
+
+    def print_named(self, label, pins):
+        print('')
+        print('STATIC const mp_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{'.format(label))
+        for pin in pins:
+            if pin.board_pin:
+                print('    {{ MP_OBJ_NEW_QSTR(MP_QSTR_{:6s}), (mp_obj_t)&pin_{:6s} }},'.format(pin.name, pin.name))
+        print('};')
+        print('MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);'.format(label, label));
+
+    def print(self):
+        for pin in self.board_pins:
+            if pin.board_pin:
+                pin.print()
+        self.print_named('board', self.board_pins)
+        print('')
+
+    def print_header(self, hdr_filename):
+        with open(hdr_filename, 'wt') as hdr_file:
+            for pin in self.board_pins:
+                if pin.board_pin:
+                    pin.print_header(hdr_file)
+
+    def print_qstr(self, qstr_filename):
+        with open(qstr_filename, 'wt') as qstr_file:
+            pin_qstr_set = set([])
+            af_qstr_set = set([])
+            for pin in self.board_pins:
+                if pin.board_pin:
+                    pin_qstr_set |= set([pin.name])
+                    for af in pin.afs:
+                        af_qstr_set |= set([af.name])
+            print('// Board pins', file=qstr_file)
+            for qstr in sorted(pin_qstr_set):
+                print('Q({})'.format(qstr), file=qstr_file)
+            print('\n// Pin AFs', file=qstr_file)
+            for qstr in sorted(af_qstr_set):
+                print('Q({})'.format(qstr), file=qstr_file)
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="make-pins.py",
+        usage="%(prog)s [options] [command]",
+        description="Generate board specific pin file"
+    )
+    parser.add_argument(
+        "-a", "--af",
+        dest="af_filename",
+        help="Specifies the alternate function file for the chip",
+        default="cc3200_af.csv"
+    )
+    parser.add_argument(
+        "-b", "--board",
+        dest="board_filename",
+        help="Specifies the board file",
+    )
+    parser.add_argument(
+        "-p", "--prefix",
+        dest="prefix_filename",
+        help="Specifies beginning portion of generated pins file",
+        default="cc3200_prefix.c"
+    )
+    parser.add_argument(
+        "-q", "--qstr",
+        dest="qstr_filename",
+        help="Specifies name of generated qstr header file",
+        default="build/pins_qstr.h"
+    )
+    parser.add_argument(
+        "-r", "--hdr",
+        dest="hdr_filename",
+        help="Specifies name of generated pin header file",
+        default="build/pins.h"
+    )
+    args = parser.parse_args(sys.argv[1:])
+
+    pins = Pins()
+
+    print('// This file was automatically generated by make-pins.py')
+    print('//')
+    if args.af_filename:
+        print('// --af {:s}'.format(args.af_filename))
+        pins.parse_af_file(args.af_filename, 0, 1, 3)
+
+    if args.board_filename:
+        print('// --board {:s}'.format(args.board_filename))
+        pins.parse_board_file(args.board_filename, 1)
+
+    if args.prefix_filename:
+        print('// --prefix {:s}'.format(args.prefix_filename))
+        print('')
+        with open(args.prefix_filename, 'r') as prefix_file:
+            print(prefix_file.read())
+    pins.print()
+    pins.print_qstr(args.qstr_filename)
+    pins.print_header(args.hdr_filename)
+
+
+if __name__ == "__main__":
+    main()
--- a/ports/cc3200/bootmgr/bootgen.sh
+++ b/ports/cc3200/bootmgr/bootgen.sh
--- a/ports/cc3200/bootmgr/bootloader.mk
+++ b/ports/cc3200/bootmgr/bootloader.mk
@ -4,13 +4,13 @@ BOOT_INC  = -Ibootmgr
 BOOT_INC += -Ibootmgr/sl
 BOOT_INC += -Ihal
 BOOT_INC += -Ihal/inc
-BOOT_INC += -I$(TOP)/drivers/cc3100/inc
+BOOT_INC += -I../drivers/cc3100/inc
 BOOT_INC += -Imisc
 BOOT_INC += -Imods
 BOOT_INC += -Isimplelink
 BOOT_INC += -Isimplelink/oslib
 BOOT_INC += -Iutil
-BOOT_INC += -I$(TOP)
+BOOT_INC += -I..
 BOOT_INC += -I.
 BOOT_INC += -I$(BUILD)

@ -98,7 +98,7 @@ $(BUILD)/misc/%.o: CFLAGS += -Os
 $(BUILD)/simplelink/%.o: CFLAGS += -Os
 $(BUILD)/drivers/cc3100/%.o: CFLAGS += -Os
 $(BUILD)/py/%.o: CFLAGS += -Os
-$(BUILD)/ports/stm32/%.o: CFLAGS += -Os
+$(BUILD)/stmhal/%.o: CFLAGS += -Os
 else
 $(error Invalid BTYPE specified)
 endif
--- a/ports/cc3200/bootmgr/bootmgr.h
+++ b/ports/cc3200/bootmgr/bootmgr.h
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
--- a/ports/cc3200/bootmgr/bootmgr.lds
+++ b/ports/cc3200/bootmgr/bootmgr.lds
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
--- a/ports/cc3200/bootmgr/flc.h
+++ b/ports/cc3200/bootmgr/flc.h
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
--- a/cc3200/bootmgr/main.c
+++ b/cc3200/bootmgr/main.c
@ -0,0 +1,419 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * 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.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+#include "py/mpconfig.h"
+#include "hw_ints.h"
+#include "hw_types.h"
+#include "hw_gpio.h"
+#include "hw_memmap.h"
+#include "hw_gprcm.h"
+#include "hw_common_reg.h"
+#include "pin.h"
+#include "gpio.h"
+#include "rom_map.h"
+#include "prcm.h"
+#include "simplelink.h"
+#include "interrupt.h"
+#include "gpio.h"
+#include "flc.h"
+#include "bootmgr.h"
+#include "shamd5.h"
+#include "cryptohash.h"
+#include "utils.h"
+#include "cc3200_hal.h"
+#include "debug.h"
+#include "mperror.h"
+#include "antenna.h"
+
+
+//*****************************************************************************
+// Local Constants
+//*****************************************************************************
+#define SL_STOP_TIMEOUT                     35
+#define BOOTMGR_HASH_ALGO                   SHAMD5_ALGO_MD5
+#define BOOTMGR_HASH_SIZE                   32
+#define BOOTMGR_BUFF_SIZE                   512
+
+#define BOOTMGR_WAIT_SAFE_MODE_0_MS         500
+
+#define BOOTMGR_WAIT_SAFE_MODE_1_MS         3000
+#define BOOTMGR_WAIT_SAFE_MODE_1_BLINK_MS   500
+
+#define BOOTMGR_WAIT_SAFE_MODE_2_MS         3000
+#define BOOTMGR_WAIT_SAFE_MODE_2_BLINK_MS   250
+
+#define BOOTMGR_WAIT_SAFE_MODE_3_MS         1500
+#define BOOTMGR_WAIT_SAFE_MODE_3_BLINK_MS   100
+
+//*****************************************************************************
+// Exported functions declarations
+//*****************************************************************************
+extern void bootmgr_run_app (_u32 base);
+
+//*****************************************************************************
+// Local functions declarations
+//*****************************************************************************
+static void bootmgr_board_init (void);
+static bool bootmgr_verify (_u8 *image);
+static void bootmgr_load_and_execute (_u8 *image);
+static bool wait_while_blinking (uint32_t wait_time, uint32_t period, bool force_wait);
+static bool safe_boot_request_start (uint32_t wait_time);
+static void wait_for_safe_boot (sBootInfo_t *psBootInfo);
+static void bootmgr_image_loader (sBootInfo_t *psBootInfo);
+
+//*****************************************************************************
+// Private data
+//*****************************************************************************
+static _u8 bootmgr_file_buf[BOOTMGR_BUFF_SIZE];
+static _u8 bootmgr_hash_buf[BOOTMGR_HASH_SIZE + 1];
+
+//*****************************************************************************
+// Vector Table
+//*****************************************************************************
+extern void (* const g_pfnVectors[])(void);
+
+//*****************************************************************************
+// WLAN Event handler callback hookup function
+//*****************************************************************************
+void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent)
+{
+
+}
+
+//*****************************************************************************
+// HTTP Server callback hookup function
+//*****************************************************************************
+void SimpleLinkHttpServerCallback(SlHttpServerEvent_t *pHttpEvent,
+                                  SlHttpServerResponse_t *pHttpResponse)
+{
+
+}
+
+//*****************************************************************************
+// Net APP Event callback hookup function
+//*****************************************************************************
+void SimpleLinkNetAppEventHandler(SlNetAppEvent_t *pNetAppEvent)
+{
+
+}
+
+//*****************************************************************************
+// General Event callback hookup function
+//*****************************************************************************
+void SimpleLinkGeneralEventHandler(SlDeviceEvent_t *pDevEvent)
+{
+
+}
+
+//*****************************************************************************
+// Socket Event callback hookup function
+//*****************************************************************************
+void SimpleLinkSockEventHandler(SlSockEvent_t *pSock)
+{
+
+}
+
+//*****************************************************************************
+//! Board Initialization & Configuration
+//*****************************************************************************
+static void bootmgr_board_init(void) {
+    // set the vector table base
+    MAP_IntVTableBaseSet((unsigned long)&g_pfnVectors[0]);
+
+    // enable processor interrupts
+    MAP_IntMasterEnable();
+    MAP_IntEnable(FAULT_SYSTICK);
+
+    // mandatory MCU initialization
+    PRCMCC3200MCUInit();
+
+    // clear all the special bits, since we can't trust their content after reset
+    // except for the WDT reset one!!
+    PRCMClearSpecialBit(PRCM_SAFE_BOOT_BIT);
+    PRCMClearSpecialBit(PRCM_FIRST_BOOT_BIT);
+
+    // check the reset after clearing the special bits
+    mperror_bootloader_check_reset_cause();
+
+#if MICROPY_HW_ANTENNA_DIVERSITY
+    // configure the antenna selection pins
+    antenna_init0();
+#endif
+
+    // enable the data hashing engine
+    CRYPTOHASH_Init();
+
+    // init the system led and the system switch
+    mperror_init0();
+}
+
+//*****************************************************************************
+//! Verifies the integrity of the new application binary
+//*****************************************************************************
+static bool bootmgr_verify (_u8 *image) {
+    SlFsFileInfo_t FsFileInfo;
+    _u32 reqlen, offset = 0;
+    _i32 fHandle;
+
+    // open the file for reading
+    if (0 == sl_FsOpen(image, FS_MODE_OPEN_READ, NULL, &fHandle)) {
+        // get the file size
+        sl_FsGetInfo(image, 0, &FsFileInfo);
+
+        if (FsFileInfo.FileLen > BOOTMGR_HASH_SIZE) {
+            FsFileInfo.FileLen -= BOOTMGR_HASH_SIZE;
+            CRYPTOHASH_SHAMD5Start(BOOTMGR_HASH_ALGO, FsFileInfo.FileLen);
+            do {
+                if ((FsFileInfo.FileLen - offset) > BOOTMGR_BUFF_SIZE) {
+                    reqlen = BOOTMGR_BUFF_SIZE;
+                }
+                else {
+                    reqlen = FsFileInfo.FileLen - offset;
+                }
+
+                offset += sl_FsRead(fHandle, offset, bootmgr_file_buf, reqlen);
+                CRYPTOHASH_SHAMD5Update(bootmgr_file_buf, reqlen);
+            } while (offset < FsFileInfo.FileLen);
+
+            CRYPTOHASH_SHAMD5Read (bootmgr_file_buf);
+
+            // convert the resulting hash to hex
+            for (_u32 i = 0; i < (BOOTMGR_HASH_SIZE / 2); i++) {
+                snprintf ((char *)&bootmgr_hash_buf[(i * 2)], 3, "%02x", bootmgr_file_buf[i]);
+            }
+
+            // read the hash from the file and close it
+            sl_FsRead(fHandle, offset, bootmgr_file_buf, BOOTMGR_HASH_SIZE);
+            sl_FsClose (fHandle, NULL, NULL, 0);
+            bootmgr_file_buf[BOOTMGR_HASH_SIZE] = '\0';
+            // compare both hashes
+            if (!strcmp((const char *)bootmgr_hash_buf, (const char *)bootmgr_file_buf)) {
+                // it's a match
+                return true;
+            }
+        }
+        // close the file
+        sl_FsClose(fHandle, NULL, NULL, 0);
+    }
+    return false;
+}
+
+//*****************************************************************************
+//! Loads the application from sFlash and executes
+//*****************************************************************************
+static void bootmgr_load_and_execute (_u8 *image) {
+    SlFsFileInfo_t pFsFileInfo;
+    _i32 fhandle;
+    // open the application binary
+    if (!sl_FsOpen(image, FS_MODE_OPEN_READ, NULL, &fhandle)) {
+        // get the file size
+        if (!sl_FsGetInfo(image, 0, &pFsFileInfo)) {
+            // read the application into SRAM
+            if (pFsFileInfo.FileLen == sl_FsRead(fhandle, 0, (unsigned char *)APP_IMG_SRAM_OFFSET, pFsFileInfo.FileLen)) {
+                // close the file
+                sl_FsClose(fhandle, 0, 0, 0);
+                // stop the network services
+                sl_Stop(SL_STOP_TIMEOUT);
+                // execute the application
+                bootmgr_run_app(APP_IMG_SRAM_OFFSET);
+            }
+        }
+    }
+}
+
+//*****************************************************************************
+//! Wait while the safe mode pin is being held high and blink the system led
+//! with the specified period
+//*****************************************************************************
+static bool wait_while_blinking (uint32_t wait_time, uint32_t period, bool force_wait) {
+    _u32 count;
+    for (count = 0; (force_wait || MAP_GPIOPinRead(MICROPY_SAFE_BOOT_PORT, MICROPY_SAFE_BOOT_PORT_PIN)) &&
+         ((period * count) < wait_time); count++) {
+        // toogle the led
+        MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, ~MAP_GPIOPinRead(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN));
+        UtilsDelay(UTILS_DELAY_US_TO_COUNT(period * 1000));
+    }
+    return MAP_GPIOPinRead(MICROPY_SAFE_BOOT_PORT, MICROPY_SAFE_BOOT_PORT_PIN) ? true : false;
+}
+
+static bool safe_boot_request_start (uint32_t wait_time) {
+    if (MAP_GPIOPinRead(MICROPY_SAFE_BOOT_PORT, MICROPY_SAFE_BOOT_PORT_PIN)) {
+        UtilsDelay(UTILS_DELAY_US_TO_COUNT(wait_time * 1000));
+    }
+    return MAP_GPIOPinRead(MICROPY_SAFE_BOOT_PORT, MICROPY_SAFE_BOOT_PORT_PIN) ? true : false;
+}
+
+//*****************************************************************************
+//! Check for the safe mode pin
+//*****************************************************************************
+static void wait_for_safe_boot (sBootInfo_t *psBootInfo) {
+    if (safe_boot_request_start(BOOTMGR_WAIT_SAFE_MODE_0_MS)) {
+        if (wait_while_blinking(BOOTMGR_WAIT_SAFE_MODE_1_MS, BOOTMGR_WAIT_SAFE_MODE_1_BLINK_MS, false)) {
+            // go back one step in time
+            psBootInfo->ActiveImg = psBootInfo->PrevImg;
+            if (wait_while_blinking(BOOTMGR_WAIT_SAFE_MODE_2_MS, BOOTMGR_WAIT_SAFE_MODE_2_BLINK_MS, false)) {
+                // go back directly to the factory image
+                psBootInfo->ActiveImg = IMG_ACT_FACTORY;
+                wait_while_blinking(BOOTMGR_WAIT_SAFE_MODE_3_MS, BOOTMGR_WAIT_SAFE_MODE_3_BLINK_MS, true);
+            }
+        }
+        // turn off the system led
+        MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, 0);
+        // request a safe boot to the application
+        PRCMSetSpecialBit(PRCM_SAFE_BOOT_BIT);
+    }
+    // deinit the safe boot pin
+    mperror_deinit_sfe_pin();
+}
+
+//*****************************************************************************
+//! Load the proper image based on the information from the boot info
+//! and launch it.
+//*****************************************************************************
+static void bootmgr_image_loader(sBootInfo_t *psBootInfo) {
+    _i32 fhandle;
+    _u8 *image;
+
+    // search for the active image
+    switch (psBootInfo->ActiveImg) {
+    case IMG_ACT_UPDATE1:
+        image = (unsigned char *)IMG_UPDATE1;
+        break;
+    case IMG_ACT_UPDATE2:
+        image = (unsigned char *)IMG_UPDATE2;
+        break;
+    default:
+        image = (unsigned char *)IMG_FACTORY;
+        break;
+    }
+
+    // do we have a new image that needs to be verified?
+    if ((psBootInfo->ActiveImg != IMG_ACT_FACTORY) && (psBootInfo->Status == IMG_STATUS_CHECK)) {
+        if (!bootmgr_verify(image)) {
+            // verification failed, delete the broken file
+            sl_FsDel(image, 0);
+            // switch to the previous image
+            psBootInfo->ActiveImg = psBootInfo->PrevImg;
+            psBootInfo->PrevImg = IMG_ACT_FACTORY;
+        }
+        // in any case, change the status to "READY"
+        psBootInfo->Status = IMG_STATUS_READY;
+        // write the new boot info
+        if (!sl_FsOpen((unsigned char *)IMG_BOOT_INFO, FS_MODE_OPEN_WRITE, NULL, &fhandle)) {
+            sl_FsWrite(fhandle, 0, (unsigned char *)psBootInfo, sizeof(sBootInfo_t));
+            // close the file
+            sl_FsClose(fhandle, 0, 0, 0);
+        }
+    }
+
+    // this one might modify the boot info hence it MUST be called after
+    // bootmgr_verify! (so that the changes are not saved to flash)
+    wait_for_safe_boot(psBootInfo);
+
+    // select the active image again, since it might have changed
+    switch (psBootInfo->ActiveImg) {
+    case IMG_ACT_UPDATE1:
+        image = (unsigned char *)IMG_UPDATE1;
+        break;
+    case IMG_ACT_UPDATE2:
+        image = (unsigned char *)IMG_UPDATE2;
+        break;
+    default:
+        image = (unsigned char *)IMG_FACTORY;
+        break;
+    }
+    bootmgr_load_and_execute(image);
+}
+
+//*****************************************************************************
+//! Main function
+//*****************************************************************************
+int main (void) {
+    sBootInfo_t sBootInfo = { .ActiveImg = IMG_ACT_FACTORY, .Status = IMG_STATUS_READY, .PrevImg = IMG_ACT_FACTORY };
+    bool bootapp = false;
+    _i32 fhandle;
+
+    // board setup
+    bootmgr_board_init();
+
+    // start simplelink since we need it to access the sflash
+    sl_Start(0, 0, 0);
+
+    // if a boot info file is found, load it, else, create a new one with the default boot info
+    if (!sl_FsOpen((unsigned char *)IMG_BOOT_INFO, FS_MODE_OPEN_READ, NULL, &fhandle)) {
+        if (sizeof(sBootInfo_t) == sl_FsRead(fhandle, 0, (unsigned char *)&sBootInfo, sizeof(sBootInfo_t))) {
+            bootapp = true;
+        }
+        sl_FsClose(fhandle, 0, 0, 0);
+    }
+    // boot info file not present, it means that this is the first boot after being programmed
+    if (!bootapp) {
+        // create a new boot info file
+        _u32 BootInfoCreateFlag  = _FS_FILE_OPEN_FLAG_COMMIT | _FS_FILE_PUBLIC_WRITE | _FS_FILE_PUBLIC_READ;
+        if (!sl_FsOpen ((unsigned char *)IMG_BOOT_INFO, FS_MODE_OPEN_CREATE((2 * sizeof(sBootInfo_t)),
+                        BootInfoCreateFlag), NULL, &fhandle)) {
+            // write the default boot info.
+            if (sizeof(sBootInfo_t) == sl_FsWrite(fhandle, 0, (unsigned char *)&sBootInfo, sizeof(sBootInfo_t))) {
+                bootapp = true;
+            }
+            sl_FsClose(fhandle, 0, 0, 0);
+        }
+        // signal the first boot to the application
+        PRCMSetSpecialBit(PRCM_FIRST_BOOT_BIT);
+    }
+
+    if (bootapp) {
+        // load and execute the image based on the boot info
+        bootmgr_image_loader(&sBootInfo);
+    }
+
+    // stop simplelink
+    sl_Stop(SL_STOP_TIMEOUT);
+
+    // if we've reached this point, then it means that a fatal error has occurred and the
+    // application could not be loaded, so, loop forever and signal the crash to the user
+    while (true) {
+        // keep the bld on
+        MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, MICROPY_SYS_LED_PORT_PIN);
+        __asm volatile(" dsb \n"
+                       " isb \n"
+                       " wfi \n");
+    }
+}
+
+//*****************************************************************************
+//! The following stub function is needed to link mp_vprintf
+//*****************************************************************************
+#include "py/qstr.h"
+
+const byte *qstr_data(qstr q, size_t *len) {
+    *len = 0;
+    return NULL;
+}
--- a/ports/cc3200/bootmgr/relocator/relocator.bin
+++ b/ports/cc3200/bootmgr/relocator/relocator.bin
--- a/ports/cc3200/bootmgr/runapp.s
+++ b/ports/cc3200/bootmgr/runapp.s
--- a/ports/cc3200/bootmgr/sl/user.h
+++ b/ports/cc3200/bootmgr/sl/user.h
--- a/ports/cc3200/fatfs/src/drivers/sd_diskio.c
+++ b/ports/cc3200/fatfs/src/drivers/sd_diskio.c
--- a/ports/cc3200/fatfs/src/drivers/sd_diskio.h
+++ b/ports/cc3200/fatfs/src/drivers/sd_diskio.h
--- a/ports/cc3200/fatfs/src/drivers/sflash_diskio.c
+++ b/ports/cc3200/fatfs/src/drivers/sflash_diskio.c
--- a/ports/cc3200/fatfs/src/drivers/sflash_diskio.h
+++ b/ports/cc3200/fatfs/src/drivers/sflash_diskio.h
--- a/ports/cc3200/fatfs/src/drivers/stdcmd.h
+++ b/ports/cc3200/fatfs/src/drivers/stdcmd.h
--- a/cc3200/fatfs_port.c
+++ b/cc3200/fatfs_port.c
@ -0,0 +1,74 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2017 Damien P. George
+ * Parts of this file are (C)ChaN, 2014, from FatFs option/syscall.c
+ *
+ * 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.
+ */
+
+#include "py/runtime.h"
+#include "lib/oofatfs/ff.h"
+#include "lib/timeutils/timeutils.h"
+#include "mods/pybrtc.h"
+
+#if _FS_REENTRANT
+// Create a Synchronization Object
+// This function is called in f_mount() function to create a new
+// synchronization object, such as semaphore and mutex.
+// A return of 0 indicates failure, and then f_mount() fails with FR_INT_ERR.
+int ff_cre_syncobj(FATFS *fatfs, _SYNC_t *sobj) {
+    vSemaphoreCreateBinary((*sobj));
+    return (int)(*sobj != NULL);
+}
+
+// Delete a Synchronization Object
+// This function is called in f_mount() function to delete a synchronization
+// object that created with ff_cre_syncobj function.
+// A return of 0 indicates failure, and then f_mount() fails with FR_INT_ERR.
+int ff_del_syncobj(_SYNC_t sobj) {
+    vSemaphoreDelete(sobj);
+    return 1;
+}
+
+// Request Grant to Access the Volume
+// This function is called on entering file functions to lock the volume.
+// When a 0 is returned, the file function fails with FR_TIMEOUT.
+int ff_req_grant(_SYNC_t sobj) {
+    return (int)(xSemaphoreTake(sobj, _FS_TIMEOUT) == pdTRUE);
+}
+
+// Release Grant to Access the Volume
+// This function is called on leaving file functions to unlock the volume.
+void ff_rel_grant(_SYNC_t sobj) {
+    xSemaphoreGive(sobj);
+}
+
+#endif
+
+DWORD get_fattime(void) {
+    timeutils_struct_time_t tm;
+    timeutils_seconds_since_2000_to_struct_time(pyb_rtc_get_seconds(), &tm);
+
+    return ((tm.tm_year - 1980) << 25) | ((tm.tm_mon) << 21)  |
+            ((tm.tm_mday) << 16)       | ((tm.tm_hour) << 11) |
+            ((tm.tm_min) << 5)         | (tm.tm_sec >> 1);
+}
--- a/ports/cc3200/ftp/ftp.c
+++ b/ports/cc3200/ftp/ftp.c
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
@ -27,7 +27,8 @@
 #include <stdint.h>
 #include <stdio.h>

-#include "py/runtime.h"
+#include "py/mpstate.h"
+#include "py/obj.h"
 #include "lib/timeutils/timeutils.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs.h"
@ -684,7 +685,7 @@ static void ftp_process_cmd (void) {
    if (E_FTP_RESULT_OK == (result = ftp_recv_non_blocking(ftp_data.c_sd, ftp_cmd_buffer, FTP_MAX_PARAM_SIZE + FTP_CMD_SIZE_MAX, &len))) {
        // bufptr is moved as commands are being popped
        ftp_cmd_index_t cmd = ftp_pop_command(&bufptr);
-        if (!ftp_data.loggin.passvalid && (cmd != E_FTP_CMD_USER && cmd != E_FTP_CMD_PASS && cmd != E_FTP_CMD_QUIT && cmd != E_FTP_CMD_FEAT)) {
+        if (!ftp_data.loggin.passvalid && (cmd != E_FTP_CMD_USER && cmd != E_FTP_CMD_PASS && cmd != E_FTP_CMD_QUIT)) {
            ftp_send_reply(332, NULL);
            return;
        }
@ -718,8 +719,7 @@ static void ftp_process_cmd (void) {
            break;
        case E_FTP_CMD_PWD:
        case E_FTP_CMD_XPWD:
-            snprintf((char *)ftp_data.dBuffer, FTP_BUFFER_SIZE, "\"%s\"", ftp_path);
-            ftp_send_reply(257, (char *)ftp_data.dBuffer);
+            ftp_send_reply(257, ftp_path);
            break;
        case E_FTP_CMD_SIZE:
            {
--- a/ports/cc3200/ftp/ftp.h
+++ b/ports/cc3200/ftp/ftp.h
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
--- a/ports/cc3200/ftp/updater.c
+++ b/ports/cc3200/ftp/updater.c
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
--- a/ports/cc3200/ftp/updater.h
+++ b/ports/cc3200/ftp/updater.h
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
--- a/ports/cc3200/hal/adc.c
+++ b/ports/cc3200/hal/adc.c
--- a/ports/cc3200/hal/adc.h
+++ b/ports/cc3200/hal/adc.h
--- a/ports/cc3200/hal/aes.c
+++ b/ports/cc3200/hal/aes.c
--- a/ports/cc3200/hal/aes.h
+++ b/ports/cc3200/hal/aes.h
--- a/ports/cc3200/hal/cc3200_asm.h
+++ b/ports/cc3200/hal/cc3200_asm.h
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
--- a/ports/cc3200/hal/cc3200_hal.c
+++ b/ports/cc3200/hal/cc3200_hal.c
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
@ -33,6 +33,7 @@
 #include <string.h>


+#include "py/mpstate.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "py/objstr.h"
@ -45,6 +46,7 @@
 #include "systick.h"
 #include "prcm.h"
 #include "pin.h"
+#include "mpexception.h"
 #include "telnet.h"
 #include "pybuart.h"
 #include "utils.h"
@ -141,13 +143,17 @@ void mp_hal_delay_ms(mp_uint_t delay) {
    }
 }

+void mp_hal_set_interrupt_char (int c) {
+    mpexception_set_interrupt_char (c);
+}
+
 void mp_hal_stdout_tx_str(const char *str) {
    mp_hal_stdout_tx_strn(str, strlen(str));
 }

 void mp_hal_stdout_tx_strn(const char *str, size_t len) {
    if (MP_STATE_PORT(os_term_dup_obj)) {
-        if (mp_obj_is_type(MP_STATE_PORT(os_term_dup_obj)->stream_o, &pyb_uart_type)) {
+        if (MP_OBJ_IS_TYPE(MP_STATE_PORT(os_term_dup_obj)->stream_o, &pyb_uart_type)) {
            uart_tx_strn(MP_STATE_PORT(os_term_dup_obj)->stream_o, str, len);
        } else {
            MP_STATE_PORT(os_term_dup_obj)->write[2] = mp_obj_new_str_of_type(&mp_type_str, (const byte *)str, len);
@ -183,7 +189,7 @@ int mp_hal_stdin_rx_chr(void) {
        if (telnet_rx_any()) {
            return telnet_rx_char();
        } else if (MP_STATE_PORT(os_term_dup_obj)) { // then the stdio_dup
-            if (mp_obj_is_type(MP_STATE_PORT(os_term_dup_obj)->stream_o, &pyb_uart_type)) {
+            if (MP_OBJ_IS_TYPE(MP_STATE_PORT(os_term_dup_obj)->stream_o, &pyb_uart_type)) {
                if (uart_rx_any(MP_STATE_PORT(os_term_dup_obj)->stream_o)) {
                    return uart_rx_char(MP_STATE_PORT(os_term_dup_obj)->stream_o);
                }
--- a/ports/cc3200/hal/cc3200_hal.h
+++ b/ports/cc3200/hal/cc3200_hal.h
@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the Micro Python project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
@ -64,6 +64,5 @@ extern void HAL_SystemDeInit (void);
 extern void HAL_IncrementTick(void);
 extern void mp_hal_set_interrupt_char (int c);

-#define mp_hal_stdio_poll(poll_flags) (0) // not implemented
 #define mp_hal_delay_us(usec) UtilsDelay(UTILS_DELAY_US_TO_COUNT(usec))
 #define mp_hal_ticks_cpu() (SysTickPeriodGet() - SysTickValueGet())
--- a/ports/cc3200/hal/cpu.c
+++ b/ports/cc3200/hal/cpu.c
--- a/ports/cc3200/hal/cpu.h
+++ b/ports/cc3200/hal/cpu.h
--- a/ports/cc3200/hal/crc.c
+++ b/ports/cc3200/hal/crc.c
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Paul Sokolovsky	e66f722a6b	build-android.sh: Android build script, using NDK standalone toolchain.	2017-07-22 18:01:31 +03:00
Paul Sokolovsky	73303cd1a0	Add support for MIPS big-endian, using OpenWRT SDK.	2017-07-22 18:01:31 +03:00
Paul Sokolovsky	c50f291050	run-tests.mipsel: MIPS test runner using QEMU.	2017-07-22 18:01:31 +03:00
Paul Sokolovsky	a995079cdb	micropython.mipsel: Runner script for MIPS build, using QEMU.	2017-07-22 18:01:31 +03:00
Paul Sokolovsky	68dd5f0e22	build-mipsel.sh: Build script for MIPS using OpenWRT SDK.	2017-07-22 18:01:30 +03:00