Update sample.yaml

.github/workflows/backport.yml

@@ -1,6 +1,6 @@
 name: Backport
 on:
-  pull_request_target:
+  pull_request:
     types:
       - closed
       - labeled
@@ -12,8 +12,11 @@ jobs:
     runs-on: ubuntu-18.04
     name: Backport
     steps:
-      - name: Backport
-        uses: zephyrproject-rtos/action-backport@v1.1.1-1
+      - name: Backport Bot
+        uses: Gaurav0/backport@v1.0.24
         with:
+          bot_username: NordicBuilder
+          bot_token: 151a9b45052f9ee8be5a59963d31ad7b92c3ecb5
+          bot_token_key: 67bb1f1f998d546859786a4088917c65415c0ebd
           github_token: ${{ secrets.ZB_GITHUB_TOKEN }}
           issue_labels: backport

.github/workflows/clang.yaml

@@ -1,6 +1,6 @@
 name: Build with Clang/LLVM
 
-on: pull_request_target
+on: pull_request
 
 jobs:
   clang-build-cancel:
@@ -38,6 +38,16 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
+
+      - name: Set repo directory
+        run: |
+          # fix for the directory name (nrfconnect repo specific)
+          current_dir=${PWD##*/}
+          if [ ${current_dir} != "zephyr" ]
+          then
+             echo "curr dir ${current_dir} was not equal to zephyr"
+             mv ../${current_dir} ../zephyr
+          fi
 
       - name: west setup
         run: |

.github/workflows/compliance.yml

@@ -37,6 +37,8 @@ jobs:
         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|fromlist|toup|noup|temphack|fromtree)\]" && { echo 'Sauce tag missing'; exit 1; }
         git rebase origin/${BASE_REF}
         # debug
         git log  --pretty=oneline | head -n 10
@@ -53,7 +55,7 @@ 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

CMakeLists.txt

@@ -1295,6 +1295,10 @@ set(logical_target_for_zephyr_elf ${logical_target_for_zephyr_elf} PARENT_SCOPE)
 # 2. it can be defined in Kconfig
 set_target_properties(${logical_target_for_zephyr_elf} PROPERTIES OUTPUT_NAME ${KERNEL_NAME})
 
+if (ZEPHYR_NRF_MODULE_DIR)
+  include(${ZEPHYR_NRF_MODULE_DIR}/cmake/s1.cmake)
+endif()
+
 set(post_build_commands "")
 set(post_build_byproducts "")
 

CODEOWNERS

@@ -13,8 +13,7 @@
 # Do not use wildcard on all source yet
 # *                                        @galak @nashif
 
-/.github/				  @nashif
-/.github/workflows/                       @galak @nashif
+/.github/                                 @thst-nordic
 /.buildkite/				  @galak
 /MAINTAINERS.yml                          @ioannisg @MaureenHelm
 /arch/arc/                                @abrodkin @ruuddw @evgeniy-paltsev
@@ -492,6 +491,7 @@
 /include/toolchain.h                      @dcpleung @andyross @nashif
 /include/toolchain/                       @dcpleung @nashif @andyross
 /include/zephyr.h                         @dcpleung @nashif @andyross
+/Jenkinsfile                              @thst-nordic
 /kernel/                                  @dcpleung @nashif @andyross
 /lib/util/                                @carlescufi @jakub-uC
 /lib/util/fnmatch/                        @carlescufi @jakub-uC

Jenkinsfile

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

Kconfig.zephyr

@@ -110,9 +110,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

boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig

@@ -12,7 +12,10 @@ config BOARD
 # force building with TF-M as the Secure Execution Environment.
 
 config BUILD_WITH_TFM
-	default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS
+	# Temporarily disable building Non-Secure images with TF-M support by
+	# default.
+	# default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS
+	default n
 
 if BUILD_WITH_TFM
 

boards/arm/nrf9160dk_nrf9160/Kconfig.defconfig

@@ -8,12 +8,6 @@ if BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160NS
 config BOARD
 	default "nrf9160dk_nrf9160"
 
-# By default, if we build for a Non-Secure version of the board,
-# force building with TF-M as the Secure Execution Environment.
-
-config BUILD_WITH_TFM
-	default y if BOARD_NRF9160DK_NRF9160NS
-
 if BUILD_WITH_TFM
 
 # By default, if we build with TF-M, instruct build system to

boards/arm/thingy53_nrf5340/board.c

@@ -39,8 +39,10 @@ LOG_MODULE_REGISTER(thingy53_board_init);
  * introduced in the board start up file. Below asserts ensure correct initialization order:
  * on board regulators, board init (this), sensors init.
  */
+#if !defined(CONFIG_TRUSTED_EXECUTION_SECURE)
 BUILD_ASSERT(CONFIG_THINGY53_INIT_PRIORITY > CONFIG_REGULATOR_FIXED_INIT_PRIORITY,
 	"CONFIG_THINGY53_INIT_PRIORITY must be higher than CONFIG_REGULATOR_FIXED_INIT_PRIORITY");
+#endif /* !CONFIG_TRUSTED_EXECUTION_SECURE */
 #if defined(CONFIG_SENSOR)
 BUILD_ASSERT(CONFIG_THINGY53_INIT_PRIORITY < CONFIG_SENSOR_INIT_PRIORITY,
 	"CONFIG_THINGY53_INIT_PRIORITY must be less than CONFIG_SENSOR_INIT_PRIORITY");

cmake/app/boilerplate.cmake

@@ -664,6 +664,10 @@ set_property(TARGET app PROPERTY ARCHIVE_OUTPUT_DIRECTORY app)
 
 add_subdirectory(${ZEPHYR_BASE} ${__build_dir})
 
+if(ZEPHYR_NRF_MODULE_DIR)
+  include(${ZEPHYR_NRF_MODULE_DIR}/cmake/partition_manager.cmake)
+endif()
+
 # Link 'app' with the Zephyr interface libraries.
 #
 # NB: This must be done in boilerplate.cmake because 'app' can only be

doc/CMakeLists.txt

@@ -283,6 +283,14 @@ set(SPHINX_BUILD_HTML_COMMAND
   ZEPHYR_BASE=${ZEPHYR_BASE}
   ZEPHYR_BUILD=${CMAKE_CURRENT_BINARY_DIR}
   DOXYGEN_EXECUTABLE=${DOXYGEN_EXECUTABLE}
+
+  # nRF-specific hack to pass these through to nrf/doc/zephyr/conf.py (the
+  # Sphinx configuration file). We use it for Intersphinx. See
+  # nrf/doc/CMakeLists.txt.
+  ZEPHYR_OUTPUT=${SPHINX_OUTPUT_DIR}
+  ZEPHYR_RST_SRC=${RST_OUT}/doc
+  KCONFIG_OUTPUT=${KCONFIG_OUTPUT}
+
   ${SPHINXBUILD} -W -N -t ${DOC_TAG} -b html ${ALLSPHINXOPTS} ${RST_OUT}/doc ${SPHINX_OUTPUT_DIR_HTML})
 
 # The sphinx-html target is provided as a convenience for incremental
@@ -380,7 +388,10 @@ endif()
 #
 # Dependencies and final targets
 #
-add_dependencies(html content kconfig devicetree)
+
+# nRF-specific: No 'kconfig' dependency here, because we use a shared Kconfig
+# documentation set instead
+add_dependencies(html content devicetree)
 
 add_custom_target(
   htmldocs

doc/README.rst

@@ -64,6 +64,8 @@ described in :ref:`getting_started`. Then install additional tools
 that are only required to generate the documentation,
 as described below:
 
+.. doc_processors_installation_start
+
 .. tabs::
 
    .. group-tab:: Linux
@@ -96,6 +98,8 @@ as described below:
 
    .. group-tab:: macOS
 
+      Use ``brew`` and ``tlmgr`` to install the tools:
+
       .. code-block:: console
 
          brew install doxygen mactex librsvg
@@ -104,7 +108,7 @@ as described below:
 
    .. group-tab:: Windows
 
-      Run in an Administrator ``cmd.exe`` prompt:
+      Open a ``cmd.exe`` window as **Administrator** and run the following command:
 
       .. code-block:: console
 
@@ -113,10 +117,12 @@ as described below:
       .. note::
          On Windows, the Sphinx executable ``sphinx-build.exe`` is placed in
          the ``Scripts`` folder of your Python installation path.
-         Dependending on how you have installed Python, you may need to
+         Dependending on how you have installed Python, you might need to
          add this folder to your ``PATH`` environment variable. Follow
          the instructions in `Windows Python Path`_ to add those if needed.
 
+.. doc_processors_installation_end
+
 Documentation presentation theme
 ********************************
 

doc/_extensions/zephyr/doxyrunner.py

@@ -238,24 +238,26 @@ def sync_doxygen(doxyfile: str, new: Path, prev: Path) -> None:
         prev: Previous Doxygen build output directory.
     """
 
-    html_output = get_doxygen_option(doxyfile, "HTML_OUTPUT")
-    if not html_output:
-        raise ValueError("No HTML_OUTPUT set in Doxyfile")
+    generate_html = get_doxygen_option(doxyfile, "GENERATE_HTML")
+    if generate_html == "YES":
+        html_output = get_doxygen_option(doxyfile, "HTML_OUTPUT")
+        if not html_output:
+            raise ValueError("No HTML_OUTPUT set in Doxyfile")
+
+        new_htmldir = new / html_output[0]
+        prev_htmldir = prev / html_output[0]
+
+        if prev_htmldir.exists():
+            shutil.rmtree(prev_htmldir)
+        new_htmldir.rename(prev_htmldir)
 
     xml_output = get_doxygen_option(doxyfile, "XML_OUTPUT")
     if not xml_output:
         raise ValueError("No XML_OUTPUT set in Doxyfile")
 
-    new_htmldir = new / html_output[0]
-    prev_htmldir = prev / html_output[0]
-
     new_xmldir = new / xml_output[0]
     prev_xmldir = prev / xml_output[0]
 
-    if prev_htmldir.exists():
-        shutil.rmtree(prev_htmldir)
-    new_htmldir.rename(prev_htmldir)
-
     if prev_xmldir.exists():
         dcmp = filecmp.dircmp(new_xmldir, prev_xmldir)
 

doc/_scripts/gen_kconfig_rest.py

@@ -16,13 +16,30 @@
 from operator import attrgetter
 import os
 import pathlib
+import re
 import sys
 import textwrap
 
 import kconfiglib
 
 import gen_helpers
 
+NO_MAX_WIDTH = """
+
+.. raw:: html
+
+    <!--
+    FIXME: do not limit page width until content uses another representation
+    format other than tables
+    -->
+    <style>.wy-nav-content { max-width: none; !important }</style>
+
+"""
+
+def escape_inline_rst(text):
+    # Escape reStructuredText inline markup characters
+    return re.sub(r"(\*|_|`)", r"\\\1", text)
+
 def rst_link(sc):
     # Returns an RST link (string) for the symbol/choice 'sc', or the normal
     # Kconfig expression format (e.g. just the name) for 'sc' if it can't be
@@ -318,6 +335,7 @@ def write_main_index_page():
                          index_header(title="All Configuration Options",
                                       link="configuration_options_all",
                                       desc_path=None) +
+                         NO_MAX_WIDTH +
                          sym_table_rst("Configuration Options",
                                        kconf.unique_defined_syms))
 
@@ -332,6 +350,7 @@ def write_main_index_page():
 """ + "\n".join("   index-" + suffix for _, suffix, _, _, in modules)
 
     if not separate_all_index:
+        rst += NO_MAX_WIDTH
         # Put index of all symbols in index.rst
         rst += sym_table_rst("All configuration options",
                              kconf.unique_defined_syms)
@@ -359,6 +378,7 @@ def write_module_index_pages():
                            link="configuration_options_" + suffix,
                            desc_path=desc_path)
 
+        rst += NO_MAX_WIDTH
         rst += sym_table_rst("Configuration Options",
                              module2syms[title])
 
@@ -379,7 +399,7 @@ def sym_table_rst(title, syms):
    :widths: auto
 
    * - Symbol name
-     - Help/prompt
+     - Prompt
 """
 
     for sym in sorted(syms, key=attrgetter("name")):
@@ -394,15 +414,9 @@ def sym_table_rst(title, syms):
 def sym_index_desc(sym):
     # Returns the description used for 'sym' on the index page
 
-    # Use the first help text, if available
-    for node in sym.nodes:
-        if node.help is not None:
-            return node.help.replace("\n", "\n       ")
-
-    # If there's no help, use the first prompt string
     for node in sym.nodes:
         if node.prompt:
-            return node.prompt[0]
+            return escape_inline_rst(node.prompt[0])
 
     # No help text or prompt
     return ""
@@ -532,7 +546,7 @@ def choice_header_rst(choice):
 def prompt_rst(sc):
     # Returns RST that lists the prompts of 'sc' (symbol or choice)
 
-    return "\n\n".join(f"*{node.prompt[0]}*"
+    return "\n\n".join(f"*{escape_inline_rst(node.prompt[0])}*"
                        for node in sc.nodes if node.prompt) \
            or "*(No prompt -- not directly user assignable.)*"
 
@@ -548,7 +562,8 @@ def help_rst(sc):
         if node.help is not None:
             rst += "Help\n" \
                    "====\n\n" \
-                   f"{node.help}\n\n"
+                   ".. code-block:: none\n\n" \
+                   f"{textwrap.indent(node.help, 4 * ' ')}\n\n"
 
     return rst
 
@@ -721,15 +736,13 @@ def menu_path(node):
     if len(sc.nodes) > 1: heading += "s"
     rst = f"{heading}\n{len(heading)*'='}\n\n"
 
-    rst += ".. highlight:: kconfig"
-
     for node in sc.nodes:
         rst += "\n\n" \
                f"At ``{strip_module_path(node.filename)}:{node.linenr}``\n\n" \
                f"{include_path(node)}" \
                f"Menu path: {menu_path(node)}\n\n" \
-               ".. parsed-literal::\n\n" \
-               f"{textwrap.indent(node.custom_str(rst_link), 4*' ')}"
+               ".. code-block:: kconfig\n\n" \
+               f"{textwrap.indent(str(node), 4*' ')}"
 
         # Not the last node?
         if node is not sc.nodes[-1]: