[nrf draft] twister: prototyping support for CMakePresets.json files.

.github/workflows/backport.yml

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

.github/workflows/compliance.yml

@@ -36,6 +36,7 @@ jobs:
         west update
 
     - name: Run Compliance Tests
+      continue-on-error: true
       id: compliance
       env:
         BASE_REF: ${{ github.base_ref }}
@@ -48,7 +49,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}.. || true
+        ./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
@@ -58,7 +59,14 @@ jobs:
         path: compliance.xml
 
     - name: check-warns
+      env:
+        BASE_REF: ${{ github.base_ref }}
       run: |
+        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; }
+        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
           if [[ -s $file ]]; then
             errors=$(cat $file)

CMakeLists.txt

@@ -465,6 +465,14 @@ endforeach()
 set(ZEPHYR_CURRENT_MODULE_DIR)
 set(ZEPHYR_CURRENT_CMAKE_DIR)
 
+# The OpenThread module creates a print-ot-config that uses an echo command
+# which fails on Windows, see more: https://github.com/openthread/openthread/pull/6175
+# This code disable the target from `ALL` but the target can still be manually
+# called by the user. All the target does is printing the current OpenThread configuration.
+if(TARGET print-ot-config)
+  set_property(TARGET print-ot-config PROPERTY EXCLUDE_FROM_ALL TRUE)
+endif()
+
 set(syscall_list_h   ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscall_list.h)
 set(syscalls_json    ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/syscalls.json)
 set(struct_tags_json ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/struct_tags.json)
@@ -1071,6 +1079,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

@@ -14,8 +14,7 @@
 # *                                        @galak @nashif
 
 /.known-issues/                           @nashif
-/.github/				  @nashif
-/.github/workflows/                       @galak @nashif
+/.github/                                 @thst-nordic
 /.buildkite/				  @galak
 /MAINTAINERS.yml                          @ioannisg @MaureenHelm
 /arch/arc/                                @abrodkin @ruuddw
@@ -451,6 +450,7 @@
 /include/toolchain.h                      @andrewboie @andyross @nashif
 /include/toolchain/                       @andrewboie @andyross
 /include/zephyr.h                         @andrewboie @andyross
+/Jenkinsfile                              @thst-nordic
 /kernel/                                  @andrewboie @andyross
 /lib/fnmatch/                             @carlescufi
 /lib/gui/                                 @vanwinkeljan

Jenkinsfile

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

Kconfig.zephyr

@@ -119,9 +119,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/lpcxpresso55s69/CMakeLists.txt

@@ -11,93 +11,6 @@ if(CONFIG_PINMUX_MCUX_LPC)
   zephyr_library_sources(pinmux.c)
 endif()
 
-if (CONFIG_BUILD_WITH_TFM)
-	# Set default image versions if not defined elsewhere
-	if (NOT DEFINED TFM_IMAGE_VERSION_S)
-		set(TFM_IMAGE_VERSION_S 0.0.0+0)
-	endif()
-
-	if (NOT DEFINED TFM_IMAGE_VERSION_NS)
-		set(TFM_IMAGE_VERSION_NS 0.0.0+0)
-	endif()
-
-	if (NOT CONFIG_TFM_BL2_FALSE)
-		set(PREPROCESSED_FILE_S "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_s.dir/signing_layout_s.o")
-		set(PREPROCESSED_FILE_NS "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_ns.dir/signing_layout_ns.o")
-		set(TFM_MCUBOOT_DIR "${ZEPHYR_TFM_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")
-	endif()
-
-	# Configure which format (full or hash) to include the public key in
-	# the image manifest
-	set(TFM_PUBLIC_KEY_FORMAT "full")
-
-	# Set srec_cat binary name
-	find_program(SREC_CAT srec_cat)
-	if(${SREC_CAT} STREQUAL SREC_CAT-NOTFOUND)
-		message(FATAL_ERROR "'srec_cat' not found. Please install it, or add it to $PATH.")
-	endif()
-
-	if (CONFIG_TFM_BL2_FALSE)
-		#merge tfm_s and zephyr_ns to a single image
-		#offset needs to be the same value as flash_layout.h in TFM
-		set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-			COMMAND ${SREC_CAT}
-			ARGS $<TARGET_PROPERTY:tfm,TFM_S_BIN_FILE> -Binary
-				${CMAKE_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME} -Binary
-				-offset ${CONFIG_FLASH_LOAD_OFFSET}
-				-o ${CMAKE_BINARY_DIR}/tfm_merged.bin -Binary
-		)
-	else()
-		#Create and sign for concatenated binary image, should align with the TF-M BL2
-		set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-
-			#Sign secure binary image with public key
-			COMMAND ${PYTHON_EXECUTABLE} ${TFM_MCUBOOT_DIR}/scripts/wrapper/wrapper.py
-				--layout ${PREPROCESSED_FILE_S}
-				-k ${CONFIG_TFM_KEY_FILE_S}
-				--public-key-format ${TFM_PUBLIC_KEY_FORMAT}
-				--align 1
-				-v ${TFM_IMAGE_VERSION_S}
-				--pad
-				--pad-header
-				${ADD_NS_IMAGE_MIN_VER}
-				-s auto
-				-H ${CONFIG_ROM_START_OFFSET}
-				$<TARGET_PROPERTY:tfm,TFM_S_BIN_FILE>
-				${CMAKE_BINARY_DIR}/tfm_s_signed.bin
-
-			#Sign non-secure binary image with public key
-			COMMAND ${PYTHON_EXECUTABLE} ${TFM_MCUBOOT_DIR}/scripts/wrapper/wrapper.py
-				--layout ${PREPROCESSED_FILE_NS}
-				-k ${CONFIG_TFM_KEY_FILE_NS}
-				--public-key-format ${TFM_PUBLIC_KEY_FORMAT}
-				--align 1
-				-v ${TFM_IMAGE_VERSION_NS}
-				-s auto
-				${ADD_S_IMAGE_MIN_VER}
-				-H ${CONFIG_ROM_START_OFFSET}
-				${CMAKE_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME}
-				${CMAKE_BINARY_DIR}/zephyr_ns_signed.bin
-
-			#Create concatenated binary image from the two independently signed binary file
-			COMMAND ${PYTHON_EXECUTABLE} ${TFM_MCUBOOT_DIR}/scripts/assemble.py
-				--layout ${PREPROCESSED_FILE_S}
-				-s ${CMAKE_BINARY_DIR}/tfm_s_signed.bin
-				-n ${CMAKE_BINARY_DIR}/zephyr_ns_signed.bin
-				-o ${CMAKE_BINARY_DIR}/tfm_sign.bin
-
-			#Copy mcuboot.bin
-			COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:tfm,BL2_BIN_FILE> ${CMAKE_BINARY_DIR}/mcuboot.bin
-
-			#Merge mcuboot.bin and tfm_sign.bin for flashing
-			COMMAND ${SREC_CAT}
-			ARGS ${CMAKE_BINARY_DIR}/mcuboot.bin -Binary
-				${CMAKE_BINARY_DIR}/tfm_sign.bin -Binary
-				-offset 0x8000 #slot0_partition
-				-o ${CMAKE_BINARY_DIR}/tfm_merged.bin -Binary
-		)
-	endif()
-endif()
 
 if (CONFIG_SECOND_CORE_MCUX)
 	# Set srec_cat binary name

boards/arm/mps2_an521/CMakeLists.txt

@@ -7,83 +7,3 @@
 zephyr_library()
 zephyr_library_sources(pinmux.c)
 zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
-
-if (CONFIG_BUILD_WITH_TFM)
-	# Set default image versions if not defined elsewhere
-	if (NOT DEFINED TFM_IMAGE_VERSION_S)
-		set(TFM_IMAGE_VERSION_S 0.0.0+0)
-	endif()
-
-	if (NOT DEFINED TFM_IMAGE_VERSION_NS)
-		set(TFM_IMAGE_VERSION_NS 0.0.0+0)
-	endif()
-
-	set(PREPROCESSED_FILE_S "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_s.dir/signing_layout_s.o")
-	set(PREPROCESSED_FILE_NS "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_ns.dir/signing_layout_ns.o")
-	set(TFM_MCUBOOT_DIR "${ZEPHYR_TFM_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")
-
-	# Configure which format (full or hash) to include the public key in
-	# the image manifest
-	set(TFM_PUBLIC_KEY_FORMAT "full")
-
-	# Set srec_cat binary name
-	find_program(SREC_CAT srec_cat)
-	if(${SREC_CAT} STREQUAL SREC_CAT-NOTFOUND)
-	    message(FATAL_ERROR "'srec_cat' not found. Please install it, or add it to $PATH.")
-	endif()
-
-	#Create and sign for concatenated binary image, should align with the TF-M BL2
-	set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-
-		#Sign secure binary image with public key
-		COMMAND ${PYTHON_EXECUTABLE} ${TFM_MCUBOOT_DIR}/scripts/wrapper/wrapper.py
-			 --layout ${PREPROCESSED_FILE_S}
-			 -k ${CONFIG_TFM_KEY_FILE_S}
-			 --public-key-format ${TFM_PUBLIC_KEY_FORMAT}
-			 --align 1
-			 -v ${TFM_IMAGE_VERSION_S}
-			 --pad
-			 --pad-header
-			 ${ADD_NS_IMAGE_MIN_VER}
-			 -s auto
-			 -H 0x400
-			 $<TARGET_PROPERTY:tfm,TFM_S_BIN_FILE>
-			 ${CMAKE_BINARY_DIR}/tfm_s_signed.bin
-
-		#Sign non-secure binary image with public key
-		COMMAND ${PYTHON_EXECUTABLE} ${TFM_MCUBOOT_DIR}/scripts/wrapper/wrapper.py
-			 --layout ${PREPROCESSED_FILE_NS}
-			 -k ${CONFIG_TFM_KEY_FILE_NS}
-			 --public-key-format ${TFM_PUBLIC_KEY_FORMAT}
-			 --align 1
-			 -v ${TFM_IMAGE_VERSION_NS}
-			 -s auto
-			 ${ADD_S_IMAGE_MIN_VER}
-			 -H 0x400
-			 ${CMAKE_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME}
-			 ${CMAKE_BINARY_DIR}/zephyr_ns_signed.bin
-
-		#Create concatenated binary image from the two independently signed binary file
-		COMMAND ${PYTHON_EXECUTABLE} ${TFM_MCUBOOT_DIR}/scripts/assemble.py
-		     --layout ${PREPROCESSED_FILE_S}
-			 -s ${CMAKE_BINARY_DIR}/tfm_s_signed.bin
-			 -n ${CMAKE_BINARY_DIR}/zephyr_ns_signed.bin
-			 -o ${CMAKE_BINARY_DIR}/tfm_sign.bin
-
-		#Copy mcuboot.bin
-		COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:tfm,BL2_BIN_FILE> ${CMAKE_BINARY_DIR}/mcuboot.bin
-
-		#Merge mcuboot.bin and tfm_sign.bin for QEMU
-		COMMAND ${SREC_CAT}
-		ARGS ${CMAKE_BINARY_DIR}/mcuboot.bin -Binary
-			${CMAKE_BINARY_DIR}/tfm_sign.bin -Binary
-			-offset 0x80000
-			-o ${CMAKE_BINARY_DIR}/tfm_qemu.bin -Binary
-
-		#Convert tfm_qemu.bin to .hex with an appropriate offset
-		COMMAND ${SREC_CAT}
-		ARGS ${CMAKE_BINARY_DIR}/tfm_qemu.bin -binary
-			-offset 0x10000000
-			-o ${CMAKE_BINARY_DIR}/tfm_qemu.hex -intel --line-length=44
-	)
-endif()

boards/arm/nrf5340dk_nrf5340/CMakeLists.txt

@@ -7,104 +7,3 @@ if (((CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340PDK_NRF5340_
 zephyr_library()
 zephyr_library_sources(nrf5340_cpunet_reset.c)
 endif()
-
-if (CONFIG_BUILD_WITH_TFM)
-	# Set default image versions if not defined elsewhere
-	if (NOT DEFINED TFM_IMAGE_VERSION_S)
-		set(TFM_IMAGE_VERSION_S 0.0.0+0)
-	endif()
-
-	if (NOT DEFINED TFM_IMAGE_VERSION_NS)
-		set(TFM_IMAGE_VERSION_NS 0.0.0+0)
-	endif()
-
-	if (NOT CONFIG_TFM_BL2_FALSE)
-		set(PREPROCESSED_FILE_S "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_s.dir/signing_layout_s.o")
-		set(PREPROCESSED_FILE_NS "${CMAKE_BINARY_DIR}/tfm/bl2/ext/mcuboot/CMakeFiles/signing_layout_ns.dir/signing_layout_ns.o")
-		set(TFM_MCUBOOT_DIR "${ZEPHYR_TFM_MODULE_DIR}/trusted-firmware-m/bl2/ext/mcuboot")
-	endif()
-
-	# Configure which format (full or hash) to include the public key in
-	# the image manifest
-	if(NOT DEFINED TFM_PUBLIC_KEY_FORMAT)
-		set(TFM_PUBLIC_KEY_FORMAT "full")
-	endif()
-
-	if(CONFIG_BOARD_NRF5340PDK_NRF5340_CPUAPPNS)
-		set(TFM_INSTALL_DIR ${CMAKE_BINARY_DIR}/tfm/install/outputs/NORDIC_NRF/NRF5340PDK_NRF5340_CPUAPP)
-	elseif(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPPNS)
-		set(TFM_INSTALL_DIR ${CMAKE_BINARY_DIR}/tfm/install/outputs/NORDIC_NRF/NRF5340DK_NRF5340_CPUAPP)
-	endif()
-
-	# Set srec_cat binary name
-	find_program(SREC_CAT srec_cat)
-	if(${SREC_CAT} STREQUAL SREC_CAT-NOTFOUND)
-	    message(FATAL_ERROR "'srec_cat' not found. Please install it, or add it to $PATH.")
-	endif()
-
-	if (CONFIG_TFM_BL2_FALSE)
-		# Merge tfm_s and zephyr (NS) image to a single binary.
-		set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-			COMMAND ${SREC_CAT}
-			ARGS ${CMAKE_BINARY_DIR}/tfm/bin/tfm_s.bin -Binary
-				${CMAKE_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME} -Binary
-				-offset ${CONFIG_FLASH_LOAD_OFFSET}
-				-o ${CMAKE_BINARY_DIR}/tfm_merged.hex -intel
-
-			# Copy tfm_sign.hex to zephyr
-			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/tfm_merged.hex ${CMAKE_BINARY_DIR}/zephyr/${KERNEL_HEX_NAME}
-		)
-	else()
-		#Create and sign for concatenated binary image, should align with the TF-M BL2
-		set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-
-			#Sign secure binary image with public key
-			COMMAND ${PYTHON_EXECUTABLE} ${TFM_MCUBOOT_DIR}/scripts/wrapper/wrapper.py
-				--layout ${PREPROCESSED_FILE_S}
-				-k ${CONFIG_TFM_KEY_FILE_S}
-				--public-key-format ${TFM_PUBLIC_KEY_FORMAT}
-				--align 1
-				-v ${TFM_IMAGE_VERSION_S}
-				--pad
-				--pad-header
-				${ADD_NS_IMAGE_MIN_VER}
-				-s auto
-				-H 0x400
-				$<TARGET_PROPERTY:tfm,TFM_S_BIN_FILE>
-				${CMAKE_BINARY_DIR}/tfm_s_signed.bin
-
-			#Sign non-secure binary image with public key
-			COMMAND ${PYTHON_EXECUTABLE} ${TFM_MCUBOOT_DIR}/scripts/wrapper/wrapper.py
-				--layout ${PREPROCESSED_FILE_NS}
-				-k ${CONFIG_TFM_KEY_FILE_NS}
-				--public-key-format ${TFM_PUBLIC_KEY_FORMAT}
-				--align 1
-				-v ${TFM_IMAGE_VERSION_NS}
-				-s auto
-				${ADD_S_IMAGE_MIN_VER}
-				-H 0x400
-				${CMAKE_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME}
-				${CMAKE_BINARY_DIR}/zephyr_ns_signed.bin
-
-			#Create concatenated binary image from the two independently signed binary files
-			COMMAND ${PYTHON_EXECUTABLE} ${TFM_MCUBOOT_DIR}/scripts/assemble.py
-				--layout ${PREPROCESSED_FILE_S}
-				-s ${CMAKE_BINARY_DIR}/tfm_s_signed.bin
-				-n ${CMAKE_BINARY_DIR}/zephyr_ns_signed.bin
-				-o ${CMAKE_BINARY_DIR}/tfm_sign.bin
-
-			#Copy mcuboot.bin
-			COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:tfm,BL2_BIN_FILE> ${CMAKE_BINARY_DIR}/mcuboot.bin
-
-			# Generate an intel hex file from the signed output binary
-			COMMAND srec_cat ${CMAKE_BINARY_DIR}/tfm_sign.bin
-				-binary
-				-offset 0x10000
-				-o ${CMAKE_BINARY_DIR}/tfm_sign.hex
-				-intel
-
-			# Copy tfm_sign.hex to zephyr
-			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/tfm_sign.hex ${CMAKE_BINARY_DIR}/zephyr/${KERNEL_HEX_NAME}
-		)
-	endif()
-endif()