Merge pull request #78 from nvlsianpu/fixes/for_zephyr_3.1.0-rc2 (e58ea98a) · Commits · Wenxi XU / Mcuboot

boot/bootutil/zephyr/CMakeLists.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -42,4 +42,14 @@ endif()

		zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
		target_link_libraries(MCUBOOT_BOOTUTIL INTERFACE zephyr_interface)

		if(CONFIG_BOOT_USE_TINYCRYPT)
		target_include_directories(MCUBOOT_BOOTUTIL INTERFACE
		../../../ext/tinycrypt/lib/include
		)
		endif()

		if(CONFIG_BOOT_USE_MBEDTLS)
		zephyr_link_libraries(mbedTLS)
		endif()
		endif()

+8 −8

Original line number	Diff line number	Diff line
		@@ -482,6 +482,14 @@ config MCUBOOT_LOG_THREAD_STACK_SIZE
		help
		Set the internal stack size for MCUBoot log processing thread.

		config MCUBOOT_INDICATION_LED
		bool "Turns on LED indication when device is in DFU"
		default n
		help
		Device device activates the LED while in bootloader mode.
		bootloader-led0 alias must be set in the device's .dts
		definitions for this to work.

		menuconfig MCUBOOT_SERIAL
		bool "MCUboot serial recovery"
		default n
		@@ -527,14 +535,6 @@ config MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD
		Note that 0 is default upload target when no explicit
		selection is done.

		config MCUBOOT_INDICATION_LED
		bool "Turns on LED indication when device is in DFU"
		default n
		help
		Device device activates the LED while in bootloader mode.
		bootloader-led0 alias must be set in the device's .dts
		definitions for this to work.

		config BOOT_MAX_LINE_INPUT_LEN
		int "Maximum command line length"
		default 512

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ CONFIG_MULTITHREADING=y

		# USB
		CONFIG_USB_DEVICE_STACK=y
		CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
		CONFIG_USB_DEVICE_PRODUCT="MCUBOOT"
		CONFIG_USB_COMPOSITE_DEVICE=n
		CONFIG_USB_MASS_STORAGE=n

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
		CONFIG_MULTITHREADING=y

		# USB
		CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
		CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
		CONFIG_USB_DEVICE_PRODUCT="Bootloader Thingy:53"
		CONFIG_USB_DEVICE_VID=0x1915

+1 −1

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ static void do_boot(struct boot_rsp *rsp)
		#if CONFIG_MCUBOOT_CLEANUP_ARM_CORE
		cleanup_arm_nvic(); /* cleanup NVIC registers */

		#ifdef CONFIG_CPU_CORTEX_M7
		#ifdef CONFIG_CPU_CORTEX_M_HAS_CACHE
		/* Disable instruction cache and data cache before chain-load the application */
		SCB_DisableDCache();
		SCB_DisableICache();