Infineon: Switch to 1.9.0 code base, add xmc7000 family support, refactor memory layer
diff --git a/boot/mynewt/README.md b/boot/mynewt/README.md
index ef924d5..e482d6d 100644
--- a/boot/mynewt/README.md
+++ b/boot/mynewt/README.md
@@ -1,6 +1,6 @@
-# mcuboot - apps/boot
+# MCUboot - apps/boot
-This sample app implements a boot loader for the Mynewt OS (apache.mynewt.org).
+This sample app implements a bootloader for the Mynewt OS (apache.mynewt.org).
This app requires the following Mynewt repositories:
* @mcuboot (this one)
* @apache-mynewt-core
diff --git a/boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h b/boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h
index 2f8f767..d83974b 100644
--- a/boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h
+++ b/boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h
@@ -40,9 +40,6 @@
#endif
#if MYNEWT_VAL(BOOTUTIL_SIGN_EC256)
#define MCUBOOT_SIGN_EC256 1
- #ifndef MCUBOOT_USE_TINYCRYPT
- #error "EC256 requires the use of tinycrypt."
- #endif
#endif
#if MYNEWT_VAL(BOOTUTIL_SIGN_RSA)
#define MCUBOOT_SIGN_RSA 1
diff --git a/boot/mynewt/src/main.c b/boot/mynewt/src/main.c
index c032626..0d8294d 100755
--- a/boot/mynewt/src/main.c
+++ b/boot/mynewt/src/main.c
@@ -51,6 +51,10 @@
void boot_custom_start(uintptr_t flash_base, struct boot_rsp *rsp);
#endif
+#if MYNEWT_VAL(BOOT_PREBOOT)
+void boot_preboot(void);
+#endif
+
#if defined(MCUBOOT_SERIAL)
#define BOOT_SERIAL_REPORT_DUR \
(MYNEWT_VAL(OS_CPUTIME_FREQ) / MYNEWT_VAL(BOOT_SERIAL_REPORT_FREQ))
@@ -239,6 +243,9 @@
flash_map_init();
#endif
+#if MYNEWT_VAL(BOOT_PREBOOT)
+ boot_preboot();
+#endif
FIH_CALL(boot_go, fih_rc, &rsp);
if (fih_not_eq(fih_rc, FIH_SUCCESS)) {
assert(fih_int_decode(fih_rc) == FIH_POSITIVE_VALUE);
diff --git a/boot/mynewt/syscfg.yml b/boot/mynewt/syscfg.yml
index d472c20..8334444 100644
--- a/boot/mynewt/syscfg.yml
+++ b/boot/mynewt/syscfg.yml
@@ -28,6 +28,9 @@
BOOT_CUSTOM_START:
description: 'Override hal_system_start with a custom start routine'
value: 0
+ BOOT_PREBOOT:
+ description: 'Call boot_preboot() function before booting application'
+ value:
syscfg.vals:
SYSINIT_CONSTRAIN_INIT: 0