adafruit · dhalbert · Nov 25, 2021 · Aug 4, 2021 · Nov 24, 2021 · Nov 24, 2021
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,6 +20,7 @@ jobs:
       boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
       boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
       boards-espressif: ${{ steps.set-matrix.outputs.boards-espressif }}
+      boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
     steps:
     - name: Dump GitHub context
       env:
@@ -28,19 +29,17 @@ jobs:
     - uses: actions/[email protected]
       with:
         submodules: false
-        fetch-depth: 0
-    - name: Populate selected submodules
-      run: git submodule update --init extmod/ lib/ tools/
-    - name: Fetch tags
-      run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
-    - name: CircuitPython version
-      run: |
-        git describe --dirty --tags
-        echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
+        fetch-depth: 1
     - name: Set up Python 3.8
       uses: actions/setup-python@v1
       with:
         python-version: 3.8
+    - name: Get CP deps
+      run: python tools/ci_fetch_deps.py test ${{ github.ref }}
+    - name: CircuitPython version
+      run: |
+        git describe --dirty --tags || git log --parents HEAD~4..
+        echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -136,19 +135,17 @@ jobs:
     - uses: actions/[email protected]
       with:
         submodules: false
-        fetch-depth: 0
-    - name: Populate selected submodules
-      run: git submodule update --init extmod/ lib/ tools/
-    - name: Fetch tags
-      run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
-    - name: CircuitPython version
-      run: |
-        git describe --dirty --tags
-        echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
+        fetch-depth: 1
     - name: Set up Python 3.8
       uses: actions/setup-python@v1
       with:
         python-version: 3.8
+    - name: Get CP deps
+      run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.ref }}
+    - name: CircuitPython version
+      run: |
+        git describe --dirty --tags
+        echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
     - name: Install dependencies
       run: |
         brew install gettext
@@ -198,11 +195,9 @@ jobs:
     - uses: actions/[email protected]
       with:
         submodules: false
-        fetch-depth: 0
-    - name: Populate selected submodules
-      run: git submodule update --init extmod/
-    - name: Fetch tags
-      run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
+        fetch-depth: 1
+    - name: Get CP deps
+      run: python tools/ci_fetch_deps.py docs ${{ github.ref }}
     - name: CircuitPython version
       run: |
         git describe --dirty --tags
@@ -271,10 +266,10 @@ jobs:
         python-version: 3.8
     - uses: actions/[email protected]
       with:
-        submodules: true
-        fetch-depth: 0
-    - name: Fetch tags
-      run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
+        submodules: false
+        fetch-depth: 1
+    - name: Get CP deps
+      run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.ref }}
     - name: Install dependencies
       run: |
         sudo apt-get install -y gettext
@@ -323,10 +318,10 @@ jobs:
         python-version: 3.8
     - uses: actions/[email protected]
       with:
-        submodules: true
-        fetch-depth: 0
-    - name: Fetch tags
-      run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
+        submodules: false
+        fetch-depth: 1
+    - name: Get CP deps
+      run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.ref }}
     - name: Install dependencies
       run: |
         sudo apt-get install -y gettext
@@ -375,10 +370,10 @@ jobs:
         python-version: 3.8
     - uses: actions/[email protected]
       with:
-        submodules: true
-        fetch-depth: 0
-    - name: Fetch tags
-      run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
+        submodules: false
+        fetch-depth: 1
+    - name: Get CP deps
+      run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.ref }}
     - name: CircuitPython version
       run: git describe --dirty --tags
     - uses: actions/cache@v2
@@ -446,3 +441,67 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+
+  build-aarch:
+    runs-on: ubuntu-20.04
+    needs: test
+    strategy:
+      fail-fast: false
+      matrix:
+        board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
+    if: ${{ needs.test.outputs.boards-aarch != '[]' }}
+    steps:
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+    - uses: actions/[email protected]
+      with:
+        submodules: false
+        fetch-depth: 1
+    - name: Get CP deps
+      run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.ref }}
+    - name: Install dependencies
+      run: |
+        sudo apt-get install -y gettext mtools
+        pip install -r requirements-ci.txt -r requirements-dev.txt
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
+        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
+    - name: Install mkfs.fat
+      run: |
+        wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
+        tar -xaf dosfstools-4.2.tar.gz
+        cd dosfstools-4.2
+        ./configure
+        make -j 2
+        cd src
+        echo >>$GITHUB_PATH $(pwd)
+    - name: Versions
+      run: |
+        gcc --version
+        aarch64-none-elf-gcc --version
+        arm-none-eabi-gcc --version
+        python3 --version
+        mkfs.fat --version || true
+    - name: mpy-cross
+      run: make -C mpy-cross -j2
+    - name: Setup build failure matcher
+      run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
+    - name: build
+      run: python3 -u build_release_files.py
+      working-directory: tools
+      env:
+        BOARDS: ${{ matrix.board }}
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ matrix.board }}
+        path: bin/${{ matrix.board }}
+    - name: Upload to S3
+      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+      env:
+        AWS_PAGER: ''
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
@@ -18,20 +18,21 @@ jobs:
       run: echo "$GITHUB_CONTEXT"
     - uses: actions/[email protected]
       with:
-        submodules: true
-        fetch-depth: 0
+        submodules: false
+        fetch-depth: 1
     - name: Set up Python 3.8
       uses: actions/setup-python@v1
       with:
         python-version: 3.8
+    - name: Get CP deps
+      run: python tools/ci_fetch_deps.py website ${{ github.ref }}
     - name: Install deps
       run: |
         pip install -r requirements-dev.txt
     - name: Versions
       run: |
         gcc --version
         python3 --version
-    - run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
     - name: CircuitPython version
       run: git describe --dirty --tags
     - name: Website

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
@@ -65,12 +65,12 @@ jobs:
         which python; python --version; python -c "import cascadetoml"
         which python3; python3 --version; python3 -c "import cascadetoml"
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.2.0
       with:
-        submodules: true
-        fetch-depth: 0
-
-    - run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
+        submodules: false
+        fetch-depth: 1
+    - name: Get CP deps
+      run: python tools/ci_fetch_deps.py windows ${{ github.ref }}
     - name: CircuitPython version
       run: |
         git describe --dirty --tags

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -12,7 +12,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2.2.0
     - uses: actions/setup-python@v1
     - name: Install deps
       run: |

diff --git a/.gitmodules b/.gitmodules
@@ -190,3 +190,11 @@
 [submodule "frozen/Adafruit_CircuitPython_APDS9960"]
 	path = frozen/Adafruit_CircuitPython_APDS9960
 	url = https://github.com/adafruit/Adafruit_CircuitPython_APDS9960
+[submodule "ports/broadcom/peripherals"]
+	path = ports/broadcom/peripherals
+	url = https://github.com/adafruit/broadcom-peripherals.git
+	branch = main-build
+[submodule "rpi-firmware"]
+	path = ports/broadcom/firmware
+	url = https://github.com/raspberrypi/rpi-firmware.git
+	branch = master
diff --git a/conf.py b/conf.py
@@ -186,6 +186,8 @@ def autoapi_prepare_jinja_env(jinja_env):
                     "ports/atmel-samd/peripherals",
                     "ports/atmel-samd/QTouch",
                     "ports/atmel-samd/tools",
+                    "ports/broadcom/firmware",
+                    "ports/broadcom/peripherals",
                     "ports/cxd56/mkspk",
                     "ports/cxd56/spresense-exported-sdk",
                     "ports/espressif/certificates",

diff --git a/devices/ble_hci/common-hal/_bleio/Adapter.c b/devices/ble_hci/common-hal/_bleio/Adapter.c
@@ -938,8 +938,8 @@ uint16_t bleio_adapter_max_attribute_handle(bleio_adapter_obj_t *adapter) {
 
 
 void bleio_adapter_gc_collect(bleio_adapter_obj_t *adapter) {
-    gc_collect_root((void **)adapter, sizeof(bleio_adapter_obj_t) / sizeof(size_t));
-    gc_collect_root((void **)bleio_connections, sizeof(bleio_connections) / sizeof(size_t));
+    gc_collect_root((void **)adapter, sizeof(bleio_adapter_obj_t) / (sizeof(size_t)));
+    gc_collect_root((void **)bleio_connections, sizeof(bleio_connections) / (sizeof(size_t)));
 }
 
 void bleio_adapter_reset(bleio_adapter_obj_t *adapter) {

diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
@@ -30,7 +30,7 @@
 
 from concurrent.futures import ThreadPoolExecutor
 
-SUPPORTED_PORTS = ['atmel-samd', 'cxd56', 'espressif', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm']
+SUPPORTED_PORTS = ['atmel-samd', 'broadcom', 'cxd56', 'espressif', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm']
 
 aliases_by_board = {
     "circuitplayground_express": [

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
@@ -440,7 +440,7 @@ STATIC const mp_obj_property_t fat_vfs_label_obj = {
     .base.type = &mp_type_property,
     .proxy = {(mp_obj_t)&fat_vfs_getlabel_obj,
               (mp_obj_t)&fat_vfs_setlabel_obj,
-              MP_ROM_NONE},
+              (mp_obj_t)MP_ROM_NONE},
 };
 #endif
 

diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c
@@ -1985,7 +1985,7 @@ static void gen_numname (
         if (c > '9') c += 7;
         ns[i--] = c;
         seq /= 16;
-    } while (seq);
+    } while (seq && i > 0);
     ns[i] = '~';
 
     /* Append the number to the SFN body */

diff --git a/lib/sdmmc/CMakeLists.txt b/lib/sdmmc/CMakeLists.txt
@@ -0,0 +1,9 @@
+idf_component_register(SRCS "sdmmc_cmd.c"
+                            "sdmmc_common.c"
+                            "sdmmc_init.c"
+                            "sdmmc_io.c"
+                            "sdmmc_mmc.c"
+                            "sdmmc_sd.c"
+                    INCLUDE_DIRS include
+                    REQUIRES driver
+                    PRIV_REQUIRES soc)
diff --git a/lib/sdmmc/component.mk b/lib/sdmmc/component.mk