mirror of
https://github.com/liquidraver/ZephCore.git
synced 2026-10-24 09:12:58 +00:00
update zephyr
This commit is contained in:
1 parent
249a446877
commit
c9013d85d4
12 files changed
+266
-171
No files matched your search
@@ -1,19 +1,18 @@
|
||||
diff --git a/zephyr/port/include/boot/mcuboot_config/mcuboot_config.h b/zephyr/port/include/boot/mcuboot_config/mcuboot_config.h
|
||||
index 472ebbc5ab..9cec9f7e12 100644
|
||||
index 07aab9d15b..1338dedfdf 100644
|
||||
--- a/zephyr/port/include/boot/mcuboot_config/mcuboot_config.h
|
||||
+++ b/zephyr/port/include/boot/mcuboot_config/mcuboot_config.h
|
||||
@@ -2,6 +2,10 @@
|
||||
@@ -2,6 +2,9 @@
|
||||
* Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
+ *
|
||||
+ * ZephCore patch: Added #ifndef guards for MCUBOOT_MAX_IMG_SECTORS,
|
||||
+ * fixed mbedTLS detection (also check CONFIG_BOOT_USE_MBEDTLS), and
|
||||
+ * made MCUBOOT_VALIDATE_PRIMARY_SLOT conditional on Kconfig.
|
||||
+ * ZephCore patch: fixed mbedTLS detection (also check CONFIG_BOOT_USE_MBEDTLS),
|
||||
+ * and made MCUBOOT_VALIDATE_PRIMARY_SLOT conditional on Kconfig.
|
||||
*/
|
||||
|
||||
#ifndef __MCUBOOT_CONFIG_H__
|
||||
@@ -76,8 +80,8 @@
|
||||
@@ -76,8 +79,8 @@
|
||||
* available.
|
||||
*/
|
||||
|
||||
@@ -24,7 +23,7 @@ index 472ebbc5ab..9cec9f7e12 100644
|
||||
#define MCUBOOT_USE_MBED_TLS
|
||||
#else
|
||||
/* MCUboot requires the definition of a crypto lib,
|
||||
@@ -90,7 +94,11 @@
|
||||
@@ -90,7 +93,11 @@
|
||||
* even if no upgrade was performed. This is recommended if the boot
|
||||
* time penalty is acceptable.
|
||||
*/
|
||||
@@ -36,16 +35,3 @@ index 472ebbc5ab..9cec9f7e12 100644
|
||||
|
||||
#ifdef CONFIG_ESP_DOWNGRADE_PREVENTION
|
||||
#define MCUBOOT_DOWNGRADE_PREVENTION 1
|
||||
@@ -114,7 +122,12 @@
|
||||
|
||||
/* Default maximum number of flash sectors per image slot; change
|
||||
* as desirable. */
|
||||
+/* ZephCore patch: allow override via -D or MIN_SECTOR_COUNT from AUTO mode */
|
||||
+#if defined(MIN_SECTOR_COUNT)
|
||||
+#define MCUBOOT_MAX_IMG_SECTORS MIN_SECTOR_COUNT
|
||||
+#elif !defined(MCUBOOT_MAX_IMG_SECTORS)
|
||||
#define MCUBOOT_MAX_IMG_SECTORS 512
|
||||
+#endif
|
||||
|
||||
/* Default number of separately updateable images; change in case of
|
||||
* multiple images. */
|
||||
Reference in new issue
Block a user