Fix check_compliance.

.github/workflows/bluetooth.yaml

@@ -42,14 +42,17 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
+          path: ./zephyr
 
       - name: west setup
+        working-directory: ./zephyr
         run: |
           west init -l . || true
           west config --global update.narrow true
           west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
 
       - name: Run Bluetooth Tests with BSIM
+        working-directory: ./zephyr
         run: |
           export ZEPHYR_BASE=${PWD}
           WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim_bt/compile.sh
@@ -61,7 +64,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: Bluetooth Test Results
-          path: ./bsim_bt_out/bsim_results.xml
+          path: ./zephyr/bsim_bt_out/bsim_results.xml
 
   bluetooth-test-results:
     name: "Publish Bluetooth Test Results"

.github/workflows/clang.yaml

@@ -11,7 +11,7 @@ jobs:
         with:
           access_token: ${{ github.token }}
   clang-build:
-    runs-on: zephyr_runner
+    runs-on: ubuntu-latest
     needs: clang-build-prep
     container:
       image: zephyrprojectrtos/ci:v0.21.0
@@ -21,12 +21,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ["native_posix"]
+        subset: [1, 2, 3, 4, 5]
     env:
       ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.2
       CLANG_ROOT_DIR: /usr/lib/llvm-12
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
+      MATRIX_SIZE: 5
     outputs:
       report_needed: ${{ steps.twister.outputs.report_needed }}
     steps:
@@ -39,8 +40,10 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
+          path: ./zephyr
 
       - name: Environment Setup
+        working-directory: ./zephyr
         run: |
           pip3 install GitPython
           echo "$HOME/.local/bin" >> $GITHUB_PATH
@@ -59,13 +62,15 @@ jobs:
           west update --path-cache /github/cache/zephyrproject 2>&1 1> west.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west2.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
 
       - name: Check Environment
+        working-directory: ./zephyr
         run: |
           cmake --version
           ${CLANG_ROOT_DIR}/bin/clang --version
           gcc --version
           ls -la
 
       - name: Prepare ccache timestamp/data
+        working-directory: ./zephyr
         id: ccache_cache_timestamp
         shell: cmake -P {0}
         run: |
@@ -77,47 +82,58 @@ jobs:
         id: cache-ccache
         uses: nashif/action-s3-cache@master
         with:
-          key: ${{ steps.ccache_cache_timestamp.outputs.repo }}-${{ github.ref_name }}-clang-${{ matrix.platform }}-ccache
+          key: ${{ steps.ccache_cache_timestamp.outputs.repo }}-${{ github.ref_name }}-clang-${{ matrix.subset }}-ccache
           path: /github/home/.ccache
           aws-s3-bucket: ccache.zephyrproject.org
           aws-access-key-id: ${{ secrets.CCACHE_S3_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.CCACHE_S3_SECRET_ACCESS_KEY }}
           aws-region: us-east-2
 
       - name: ccache stats initial
+        working-directory: ./zephyr
         run: |
           test -d github/home/.ccache && rm -rf /github/home/.ccache && mv github/home/.ccache /github/home/.ccache
           ccache -M 10G -s
 
-      - name: Run Tests with Twister
-        id: twister
+      - name: Build test plan with Twister
+        working-directory: ./zephyr
+        id: twister_test_plan
         run: |
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=llvm
 
           # check if we need to run a full twister or not based on files changed
-          python3 ./scripts/ci/test_plan.py --platform ${{ matrix.platform }} -c origin/${BASE_REF}..
+          python3 ./scripts/ci/test_plan.py -p native_posix -c origin/${BASE_REF}..
+
+
+      - name: Run Tests with Twister
+        working-directory: ./zephyr
+        id: twister
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          export ZEPHYR_TOOLCHAIN_VARIANT=llvm
 
           # We can limit scope to just what has changed
           if [ -s testplan.csv ]; then
             echo "::set-output name=report_needed::1";
             # Full twister but with options based on changes
-            ./scripts/twister --inline-logs -M -N -v --load-tests testplan.csv --retry-failed 2
+            ./scripts/twister --inline-logs -M -N -v --load-tests testplan.csv --retry-failed 2 --subset ${{matrix.subset}}/${MATRIX_SIZE}
           else
             # if nothing is run, skip reporting step
             echo "::set-output name=report_needed::0";
           fi
 
       - name: ccache stats post
+        working-directory: ./zephyr
         run: |
           ccache -s
 
       - name: Upload Unit Test Results
         if: always() && steps.twister.outputs.report_needed != 0
         uses: actions/upload-artifact@v2
         with:
-          name: Unit Test Results (Subset ${{ matrix.platform }})
-          path: twister-out/twister.xml
+          name: Unit Test Results (Subset ${{ matrix.subset }})
+          path: zephyr/twister-out/twister.xml
 
   clang-build-results:
     name: "Publish Unit Tests Results"

.github/workflows/compliance.yml

@@ -12,7 +12,9 @@ jobs:
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
+        path: ./zephyr
     - name: Run Maintainers Script
+      working-directory: ./zephyr
       id: maintainer
       env:
         BASE_REF: ${{ github.base_ref }}
@@ -32,6 +34,7 @@ jobs:
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
+        path: ./zephyr
 
     - name: cache-pip
       uses: actions/cache@v1
@@ -47,19 +50,23 @@ jobs:
         pip3 install west
 
     - name: west setup
+      working-directory: ./zephyr
       env:
         BASE_REF: ${{ github.base_ref }}
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "Your Name"
         git remote -v
+        # Sauce tag checks before rebasing
+        git log --oneline --first-parent origin/${BASE_REF}..HEAD | grep -E -v "\[nrf (mergeup|fromtree|fromlist|noup)\][ ]" && { echo 'Sauce tag missing or invalid, format is "[nrf <sauce-tag>] <shortlog>"'; exit 1; }
         git rebase origin/${BASE_REF}
         # debug
         git log  --pretty=oneline | head -n 10
         west init -l . || true
         west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
 
     - name: Run Compliance Tests
+      working-directory: ./zephyr
       continue-on-error: true
       id: compliance
       env:
@@ -69,22 +76,23 @@ jobs:
         # debug
         ls -la
         git log  --pretty=oneline | head -n 10
-        ./scripts/ci/check_compliance.py -m Codeowners -m Devicetree -m Gitlint -m Identity -m Nits -m pylint -m checkpatch -m Kconfig -c origin/${BASE_REF}..
+        ./scripts/ci/check_compliance.py -m Codeowners -m Devicetree -m Gitlint -m Identity -m Nits -m pylint -m checkpatch -m KconfigBasic -c origin/${BASE_REF}..
 
     - name: upload-results
       uses: actions/upload-artifact@master
       continue-on-error: True
       with:
         name: compliance.xml
-        path: compliance.xml
+        path: zephyr/compliance.xml
 
     - name: check-warns
+      working-directory: ./zephyr
       run: |
         if [[ ! -s "compliance.xml" ]]; then
           exit 1;
         fi
 
-        for file in Nits.txt checkpatch.txt Identity.txt Gitlint.txt pylint.txt Devicetree.txt Kconfig.txt Codeowners.txt; do
+        for file in Nits.txt checkpatch.txt Identity.txt Gitlint.txt pylint.txt Devicetree.txt KconfigBasic.txt Codeowners.txt; do
           if [[ -s $file ]]; then
             errors=$(cat $file)
             errors="${errors//'%'/'%25'}"

.github/workflows/doc-build.yml

@@ -44,8 +44,11 @@ jobs:
     steps:
     - name: checkout
       uses: actions/checkout@v2
+      with:
+        path: ./zephyr
 
     - name: install-pkgs
+      working-directory: ./zephyr
       run: |
         sudo apt-get install -y ninja-build graphviz libclang1-9 libclang-cpp9
         wget -q https://www.doxygen.nl/files/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz
@@ -56,20 +59,22 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ~/.cache/pip
-        key: pip-${{ hashFiles('scripts/requirements-doc.txt') }}
+        key: pip-${{ hashFiles('zephyr/scripts/requirements-doc.txt') }}
 
     - name: install-pip
       run: |
         sudo pip3 install -U setuptools wheel pip
-        pip3 install -r scripts/requirements-doc.txt
+        pip3 install -r zephyr/scripts/requirements-doc.txt
         pip3 install west==${WEST_VERSION}
         pip3 install cmake==${CMAKE_VERSION}
 
     - name: west setup
+      working-directory: ./zephyr
       run: |
         west init -l .
 
     - name: build-docs
+      working-directory: ./zephyr
       run: |
         if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
           DOC_TAG="release"
@@ -86,14 +91,15 @@ jobs:
         DOC_TAG=${DOC_TAG} SPHINXOPTS="-q -W -t publish" make -C doc ${DOC_TARGET}
 
     - name: compress-docs
+      working-directory: ./zephyr
       run: |
         tar cfJ html-output.tar.xz --directory=doc/_build html
 
     - name: upload-build
       uses: actions/upload-artifact@master
       with:
         name: html-output
-        path: html-output.tar.xz
+        path: zephyr/html-output.tar.xz
 
   doc-build-pdf:
     name: "Documentation Build (PDF)"
@@ -107,6 +113,8 @@ jobs:
     steps:
     - name: checkout
       uses: actions/checkout@v2
+      with:
+        path: ./zephyr
 
     - name: install-pkgs
       run: |
@@ -117,20 +125,22 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ~/.cache/pip
-        key: pip-${{ hashFiles('scripts/requirements-doc.txt') }}
+        key: pip-${{ hashFiles('zephyr/scripts/requirements-doc.txt') }}
 
     - name: install-pip
       run: |
         pip3 install -U setuptools wheel pip
-        pip3 install -r scripts/requirements-doc.txt
+        pip3 install -r zephyr/scripts/requirements-doc.txt
         pip3 install west==${WEST_VERSION}
         pip3 install cmake==${CMAKE_VERSION}
 
     - name: west setup
+      working-directory: ./zephyr
       run: |
         west init -l .
 
     - name: build-docs
+      working-directory: ./zephyr
       run: |
         if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
           DOC_TAG="release"
@@ -144,4 +154,4 @@ jobs:
       uses: actions/upload-artifact@master
       with:
         name: pdf-output
-        path: doc/_build/latex/zephyr.pdf
+        path: zephyr/doc/_build/latex/zephyr.pdf

.github/workflows/twister_tests.yml

@@ -28,6 +28,8 @@ jobs:
     steps:
     - name: checkout
       uses: actions/checkout@v2
+      with:
+        path: ./zephyr
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
@@ -44,6 +46,7 @@ jobs:
       run: |
         pip3 install pytest colorama pyyaml ply mock
     - name: Run pytest
+      working-directory: ./zephyr
       env:
         ZEPHYR_BASE: ./
         ZEPHYR_TOOLCHAIN_VARIANT: zephyr

.gitlint

@@ -13,7 +13,7 @@ debug = false
 extra-path=scripts/gitlint
 
 [title-max-length-no-revert]
-line-length=75
+line-length=120
 
 [body-min-line-count]
 min-line-count=1
@@ -39,7 +39,7 @@ words=wip
 
 [max-line-length-with-exceptions]
 # B1 = body-max-line-length
-line-length=75
+line-length=120
 
 [body-min-length]
 min-length=3

Jenkinsfile

@@ -0,0 +1,5 @@
+@Library("CI_LIB") _
+
+def pipeline = new ncs.sdk_zephyr.Main()
+
+pipeline.run(JOB_NAME)

Kconfig.zephyr

@@ -120,9 +120,7 @@ config FLASH_LOAD_SIZE
 endif # HAS_FLASH_LOAD_OFFSET
 
 config ROM_START_OFFSET
-	hex
-	prompt "ROM start offset" if !BOOTLOADER_MCUBOOT
-	default 0x200 if BOOTLOADER_MCUBOOT
+	hex "ROM start offset"
 	default 0
 	help
 	  If the application is built for chain-loading by a bootloader this

arch/Kconfig

@@ -843,9 +843,13 @@ config SRAM_REGION_PERMISSIONS
 
 menu "Floating Point Options"
 
+config IS_SPM
+	bool
+
 config FPU
 	bool "Enable floating point unit (FPU)"
 	depends on CPU_HAS_FPU
+	depends on !IS_SPM
 	help
 	  This option enables the hardware Floating Point Unit (FPU), in order to
 	  support using the floating point registers and instructions.