.github/workflows/compliance.yml

@@ -53,6 +53,8 @@ jobs:
         git config --global user.email "you@example.com"
         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'; exit 1; }
         git rebase origin/${BASE_REF}
         # debug
         git log  --pretty=oneline | head -n 10
@@ -69,7 +71,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

.github/workflows/devicetree_checks.yml

@@ -22,6 +22,9 @@ jobs:
       matrix:
         python-version: [3.6, 3.7, 3.8]
         os: [ubuntu-latest, macos-latest, windows-latest]
+        exclude:
+          - os: macos-latest
+            python-version: 3.6
     steps:
     - name: checkout
       uses: actions/checkout@v2

.github/workflows/west_cmds.yml

@@ -23,6 +23,9 @@ jobs:
       matrix:
         python-version: [3.6, 3.7, 3.8]
         os: [ubuntu-latest, macos-latest, windows-latest]
+        exclude:
+          - os: macos-latest
+            python-version: 3.6
     steps:
     - name: checkout
       uses: actions/checkout@v2

.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=72
+line-length=120
 
 [body-min-length]
 min-length=3

CMakeLists.txt

@@ -1335,6 +1335,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 "")
 
@@ -1440,6 +1444,21 @@ if(CONFIG_BUILD_OUTPUT_BIN AND CONFIG_BUILD_OUTPUT_UF2)
   )
 endif()
 
+if(CONFIG_BUILD_OUTPUT_META)
+  list(APPEND
+    post_build_commands
+    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py
+            ${WEST_ARG}
+            ${ZEPHYR_MODULES_ARG}
+            ${ZEPHYR_EXTRA_MODULES_ARG}
+            --meta-out ${KERNEL_META_NAME}
+  )
+  list(APPEND
+    post_build_byproducts
+    ${KERNEL_META_NAME}
+  )
+endif()
+
 # Cleanup intermediate files
 if(CONFIG_CLEANUP_INTERMEDIATE_FILES)
     list(APPEND

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
@@ -506,7 +504,30 @@ config MAKEFILE_EXPORTS
 	  Generates a file with build information that can be read by
 	  third party Makefile-based build systems.
 
+config BUILD_OUTPUT_META
+	bool "Create a build meta file"
+	help
+	  Create a build meta file in the build directory containing lists of:
+	  - Zephyr: path and revision (if git repo)
+	  - Zephyr modules: name, path, and revision (if git repo)
+	  - West projects: path and revision
+	  File extension is .meta
+
 endmenu
+
+config EXPERIMENTAL
+	bool
+	help
+	  Symbol that must be selected by a feature if it is considered to be
+	  at an experimental implementation stage.
+
+config WARN_EXPERIMENTAL
+	bool
+	prompt "Warn on experimental usage"
+	help
+	  Print a warning when the Kconfig tree is parsed if any experimental
+	  features are enabled.
+
 endmenu
 
 

VERSION

@@ -2,4 +2,4 @@ VERSION_MAJOR = 2
 VERSION_MINOR = 7
 PATCHLEVEL = 0
 VERSION_TWEAK = 0
-EXTRAVERSION = rc3
+EXTRAVERSION =

arch/Kconfig

@@ -845,6 +845,7 @@ menu "Floating Point Options"
 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.

arch/arm/core/aarch32/mpu/arm_core_mpu.c

@@ -278,7 +278,7 @@ void z_arm_configure_dynamic_mpu_regions(struct k_thread *thread)
 
 		__ASSERT((uintptr_t)&z_priv_stacks_ram_start <= guard_start,
 		"Guard start: (0x%lx) below privilege stacks boundary: (%p)",
-		guard_start, &z_priv_stacks_ram_start);
+		guard_start, z_priv_stacks_ram_start);
 	} else
 #endif /* CONFIG_USERSPACE */
 	{

boards/Kconfig

@@ -14,6 +14,13 @@ config QEMU_TARGET
 	  Mark all QEMU targets with this variable for checking whether we are
 	  running in an emulated environment.
 
+config NET_DRIVERS
+	bool
+	default y if QEMU_TARGET && NETWORKING
+	help
+	  When building for a qemu target then NET_DRIVERS will be default
+	  enabled to allow for easy use of SLIP or PPP
+
 # Note: $BOARD_DIR might be a glob pattern
 
 choice

boards/arc/nsim/support/mdb_hs6x.args

@@ -10,7 +10,6 @@
 	-prop=nsim_isa_vec64=1
 	-dcache=65536,64,2,a
 	-dcache_feature=2
-	-dcache_uncached_region
 	-dcache_mem_cycles=2
 	-icache=65536,64,4,a
 	-icache_feature=2

boards/arc/nsim/support/mdb_hs6x_smp.args

@@ -10,7 +10,6 @@
 	-prop=nsim_isa_vec64=1
 	-dcache=65536,64,2,a
 	-dcache_feature=2
-	-dcache_uncached_region
 	-dcache_mem_cycles=2
 	-icache=65536,64,4,a
 	-icache_feature=2

boards/arm/arduino_nano_33_ble/Kconfig.board

@@ -13,7 +13,6 @@ config BOARD_ARDUINO_NANO_33_BLE_EN_USB_CONSOLE
 	select CONSOLE
 	select PRINTK
 	select UART_INTERRUPT_DRIVEN
-	select USB_UART_CONSOLE
 
 config BOARD_ARDUINO_NANO_33_BLE_INIT_SENSORS
 	bool "Initializes the internal I2C sensors on the board"

boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_defconfig

@@ -11,7 +11,6 @@ CONFIG_HW_STACK_PROTECTION=y
 # enable peripherals
 CONFIG_GPIO=y
 CONFIG_SERIAL=y
-CONFIG_CONSOLE=y
 
 # enable sam-ba bootloader on legacy mode
 CONFIG_BOOTLOADER_BOSSA=y

boards/arm/b_u585i_iot02a/doc/index.rst

@@ -255,9 +255,9 @@ Debugging
 STM32U5 support is not currently supported in openocd. As a temporary workaround,
 user can use `STMicroelectronics customized version of OpenOCD`_ to debug the
 the B_U585I_IOT02A Discovery kit.
-For this you need to fetch this repo and build openocd following the instructions
-provided in the README of the project. Then, build zephyr project indicating the
-openocd location in west build command.
+For this you need to fetch this repo, checkout branch "openocd-cubeide-r3" and
+build openocd following the instructions provided in the README of the project.
+Then, build zephyr project indicating the openocd location in west build command.
 
 Here is an example for the :ref:`blinky-sample` application.
 
@@ -269,24 +269,18 @@ Here is an example for the :ref:`blinky-sample` application.
 
 Then, indicate openocd as the chosen runner in flash and debug commands:
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
-   :board: b_u585i_iot02a
-   :gen-args: -r openocd
-   :goals: flash
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
-   :board: nucleo_u575zi_q
-   :gen-args: -r openocd
-   :goals: debug
+   .. code-block:: console
+
+      $ west flash -r openocd
+      $ west debug -r openocd
 
 
 .. _B U585I IOT02A Discovery kit website:
    https://www.st.com/en/evaluation-tools/b-u585i-iot02a.html
 
 .. _B U585I IOT02A board User Manual:
-   https://www.st.com/resource/en/user_manual/dm00698410.pdf
+   https://www.st.com/resource/en/user_manual/um2839-discovery-kit-for-iot-node-with-stm32u5-series-stmicroelectronics.pdf
 
 .. _STM32U585 on www.st.com:
    https://www.st.com/en/microcontrollers-microprocessors/stm32u575-585.html

boards/arm/bl654_usb/Kconfig.defconfig

@@ -25,9 +25,6 @@ config FLASH_LOAD_OFFSET
 
 if USB_DEVICE_STACK
 
-config USB_UART_CONSOLE
-	default y
-
 config UART_LINE_CTRL
 	default y
 

boards/arm/degu_evk/Kconfig.defconfig

@@ -13,9 +13,6 @@ if USB_DEVICE_STACK
 config USB_DEVICE_PRODUCT
 	default "Degu Evaluation Kit"
 
-config USB_UART_CONSOLE
-	default y
-
 config UART_INTERRUPT_DRIVEN
 	default y
 

boards/arm/lpcxpresso54114/lpcxpresso54114_m0_defconfig

@@ -7,7 +7,6 @@
 CONFIG_SOC_LPC54114_M0=y
 CONFIG_SOC_SERIES_LPC54XXX=y
 CONFIG_BOARD_LPCXPRESSO54114_M0=y
-CONFIG_CONSOLE=y
 CONFIG_USE_SEGGER_RTT=y
 CONFIG_SERIAL=n
 CONFIG_CORTEX_M_SYSTICK=y

boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840_defconfig

@@ -13,9 +13,6 @@ CONFIG_HW_STACK_PROTECTION=y
 # enable GPIO
 CONFIG_GPIO=y
 
-# enable console
-CONFIG_CONSOLE=y
-
 # additional board options
 CONFIG_GPIO_AS_PINRESET=y
 CONFIG_NFCT_PINS_AS_GPIOS=y

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_CPUAPP_NS
+	# Temporarily disable building Non-Secure images with TF-M support by
+	# default.
+	# default y if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	default n
 
 if BUILD_WITH_TFM
 

boards/arm/nrf9160dk_nrf9160/Kconfig.defconfig

@@ -8,12 +8,6 @@ if BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160_NS
 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_NRF9160_NS
-
 if BUILD_WITH_TFM
 
 # By default, if we build with TF-M, instruct build system to

boards/arm/nucleo_l073rz/Kconfig.defconfig

@@ -12,4 +12,10 @@ config SPI_STM32_INTERRUPT
 	default y
 	depends on SPI
 
+# FIXME: LSE not working as LPTIM clock source. Use LSI instead.
+choice STM32_LPTIM_CLOCK
+	default STM32_LPTIM_CLOCK_LSI
+	depends on STM32_LPTIM_TIMER
+endchoice
+
 endif # BOARD_NUCLEO_L073RZ

boards/arm/nucleo_u575zi_q/doc/nucleou575zi_q.rst

@@ -240,9 +240,9 @@ Debugging
 STM32U5 support is not currently supported in openocd. As a temporary workaround,
 user can use `STMicroelectronics customized version of OpenOCD`_ to debug the
 the Nucleo U575ZI Q.
-For this you need to fetch this repo and build openocd following the instructions
-provided in the README of the project. Then, build zephyr project indicating the
-openocd location in west build command.
+For this you need to fetch this repo, checkout branch "openocd-cubeide-r3" and
+build openocd following the instructions provided in the README of the project.
+Then, build zephyr project indicating the openocd location in west build command.
 
 Here is an example for the :ref:`blinky-sample` application.
 
@@ -254,17 +254,11 @@ Here is an example for the :ref:`blinky-sample` application.
 
 Then, indicate openocd as the chosen runner in flash and debug commands:
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
-   :board: nucleo_u575zi_q
-   :gen-args: -r openocd
-   :goals: flash
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
-   :board: nucleo_u575zi_q
-   :gen-args: -r openocd
-   :goals: debug
+   .. code-block:: console
+
+      $ west flash -r openocd
+      $ west debug -r openocd
 
 
 .. _STM32 Nucleo-144 board User Manual:

boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpunet_defconfig

@@ -12,6 +12,3 @@ CONFIG_HW_STACK_PROTECTION=y
 
 # Enable GPIO
 CONFIG_GPIO=y
-
-# Enable console
-CONFIG_CONSOLE=y