Merge: synchronized up to https://github.com/mcu-tools/mcuboot/commit/ce50334 (3f49b5ab) · Commits · Wenxi XU / Mcuboot

.github/workflows/imgtool.yaml

+1 −0

+17 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2018-2020 Arm Limited
		* Copyright (c) 2018-2021 Arm Limited
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -24,6 +24,22 @@
		extern "C" {
		#endif

		/**
		* @brief Add a data item to the shared data area between bootloader and
		* runtime SW
		*
		* @param[in] major_type TLV major type, identify consumer
		* @param[in] minor_type TLV minor type, identify TLV type
		* @param[in] size length of added data
		* @param[in] data pointer to data
		*
		* @return 0 on success; nonzero on failure.
		*/
		int boot_add_data_to_shared_area(uint8_t major_type,
		uint16_t minor_type,
		size_t size,
		const uint8_t *data);

		/**
		* Add an image's all boot status information to the shared memory area
		* between the bootloader and runtime SW.

+7 −13

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2018-2020 Arm Limited
		* Copyright (c) 2018-2021 Arm Limited
		* Copyright (c) 2020 Linaro Limited
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		@@ -44,18 +44,8 @@
		*/
		static bool shared_memory_init_done;

		/**
		* @brief Add a data item to the shared data area between bootloader and
		* runtime SW
		*
		* @param[in] major_type TLV major type, identify consumer
		* @param[in] minor_type TLV minor type, identify TLV type
		* @param[in] size length of added data
		* @param[in] data pointer to data
		*
		* @return 0 on success; nonzero on failure.
		*/
		static int
		/* See in boot_record.h */
		int
		boot_add_data_to_shared_area(uint8_t major_type,
		uint16_t minor_type,
		size_t size,
		@@ -66,6 +56,10 @@ boot_add_data_to_shared_area(uint8_t major_type,
		uint16_t boot_data_size;
		uintptr_t tlv_end, offset;

		if (data == NULL) {
		return SHARED_MEMORY_GEN_ERROR;
		}

		boot_data = (struct shared_boot_data *)MCUBOOT_SHARED_DATA_BASE;

		/* Check whether first time to call this function. If does then initialise

+10 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,16 @@ for sha in $commits; do
		lines="$(git show -s --format=%B ${sha})"

		found_author=false
		# Don't enforce committer email on forks; this primarily avoids issues
		# running workflows on the zephyr fork, because rebases done in the GH UX
		# use the primary email of the committer, which might not match the one
		# used in git CLI.
		if [[ $GITHUB_REPOSITORY == mcu-tools/* ]]; then
		found_committer=false
		else
		found_committer=true
		fi

		IFS=$'\n'
		for line in ${lines}; do
		stripped=$(echo $line \| sed -e 's/^\s//' \| sed -e 's/\s$//')

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ set -e
		pushd .. &&\
		git clone https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git &&\
		pushd trusted-firmware-m &&\
		git checkout 8501b37db8e038ce39eb7f1039a514edea92c96e &&\
		git checkout 7ad5c5f23f4619add4aa6c88f4b25fc6fd84ec6e &&\
		popd

		if test -z "$FIH_LEVEL"; then