Infineon: Add cyw20829 platform, shared slot feature, json memory map, psoc6 xip
Based in 1.8.0 release of MCUBoot library
This commit adds CYW20829 Infineon platform support with following capabilities:
1. Overwrite and swap upgrade mode support
2. Multi-image with up to 4 images
3. Hardware security counter is supported for CYW20829 platform
Add XIP support for PSOC6 platform - place BOOT slot in external memory and execute it in place using SMIF in XIP mode
and some new features for Infineon devices.
1. Shared upgrade slot feature - use one shared area for upgrade slots of multiple images
2. Memory map defined using JSON file - define memory regions for bootloader and user app in conventional way using JSON file
diff --git a/boot/mbed/app_enc_keys.c b/boot/mbed/app_enc_keys.c
index cf4bd40..9bed4d8 100644
--- a/boot/mbed/app_enc_keys.c
+++ b/boot/mbed/app_enc_keys.c
@@ -30,8 +30,6 @@
#define HAVE_KEYS
extern const unsigned char ed25519_pub_key[];
extern unsigned int ed25519_pub_key_len;
-#else
-#error "No public key available for given signing algorithm."
#endif
/*
diff --git a/boot/mbed/include/flash_map_backend/flash_map_backend.h b/boot/mbed/include/flash_map_backend/flash_map_backend.h
index 8057baf..f2bad16 100644
--- a/boot/mbed/include/flash_map_backend/flash_map_backend.h
+++ b/boot/mbed/include/flash_map_backend/flash_map_backend.h
@@ -75,6 +75,26 @@
uint32_t fa_size;
};
+static inline uint8_t flash_area_get_id(const struct flash_area *fa)
+{
+ return fa->fa_id;
+}
+
+static inline uint8_t flash_area_get_device_id(const struct flash_area *fa)
+{
+ return fa->fa_device_id;
+}
+
+static inline uint32_t flash_area_get_off(const struct flash_area *fa)
+{
+ return fa->fa_off;
+}
+
+static inline uint32_t flash_area_get_size(const struct flash_area *fa)
+{
+ return fa->fa_size;
+}
+
/**
* @brief Structure describing a sector within a flash area.
*
@@ -94,6 +114,16 @@
uint32_t fs_size;
};
+static inline uint32_t flash_sector_get_off(const struct flash_sector *fs)
+{
+ return fs->fs_off;
+}
+
+static inline uint32_t flash_sector_get_size(const struct flash_sector *fs)
+{
+ return fs->fs_size;
+}
+
/*
* Start using flash area.
*/
diff --git a/boot/mbed/include/mcuboot_config/mcuboot_config.h b/boot/mbed/include/mcuboot_config/mcuboot_config.h
index 29dbf75..b57e8d6 100644
--- a/boot/mbed/include/mcuboot_config/mcuboot_config.h
+++ b/boot/mbed/include/mcuboot_config/mcuboot_config.h
@@ -18,6 +18,7 @@
#define SIGNATURE_TYPE_RSA 0
#define SIGNATURE_TYPE_EC256 1
#define SIGNATURE_TYPE_ED25519 2
+#define SIGNATURE_TYPE_NONE 3
/*
* Signature algorithm
@@ -59,6 +60,12 @@
#define MCUBOOT_IMAGE_NUMBER 1
/*
+ * Currently there is no configuration option, for this platform,
+ * that enables the system specific mcumgr commands in mcuboot
+ */
+#define MCUBOOT_PERUSER_MGMT_GROUP_ENABLED 0
+
+/*
* Encrypted Images
*/
#if defined(MCUBOOT_ENCRYPT_RSA) || defined(MCUBOOT_ENCRYPT_EC256) || defined(MCUBOOT_ENCRYPT_X25519)
@@ -78,5 +85,11 @@
do { \
} while (0)
+/*
+ * No direct idle call implemented
+ */
+#define MCUBOOT_CPU_IDLE() \
+ do { \
+ } while (0)
#endif /* __MCUBOOT_CONFIG_H__ */
diff --git a/boot/mbed/include/utils/DataShare.cpp b/boot/mbed/include/utils/DataShare.cpp
new file mode 100644
index 0000000..a7d012b
--- /dev/null
+++ b/boot/mbed/include/utils/DataShare.cpp
@@ -0,0 +1,97 @@
+/**
+ *
+ * Built with ARM Mbed-OS
+ *
+ * Copyright (c) 2019-2021 Embedded Planet, Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if MCUBOOT_DATA_SHARING && !MCUBOOT_BOOTLOADER_BUILD
+
+#include "DataShare.h"
+#include "boot_status.h"
+
+#include <cstring>
+
+#define PTR_TO_UINT8(x) ((volatile uint8_t *) x)
+#define PTR_TO_UINT16(x) ((volatile uint16_t *) x)
+#define PTR_TO_UINT32(x) ((volatile uint32_t *) x)
+
+#define SHARED_DATA_ENTRY_BASE MCUBOOT_SHARED_DATA_BASE+SHARED_DATA_HEADER_SIZE
+
+DataShare::DataShare(uint8_t *shared_base) : _shared_base(shared_base) {
+ volatile uint16_t *ptr = PTR_TO_UINT16(MCUBOOT_SHARED_DATA_BASE);
+
+ /* Validate magic word */
+ if(*ptr++ == SHARED_DATA_TLV_INFO_MAGIC) {
+ _is_valid = true;
+ }
+
+ _total_size = *ptr;
+
+}
+
+bool DataShare::is_valid() {
+ return _is_valid;
+}
+
+uint16_t DataShare::get_total_size() {
+ if(!is_valid()) {
+ return 0;
+ }
+
+ return _total_size;
+}
+
+int DataShare::get_next(uint16_t *type, mbed::Span<uint8_t> buf, uint16_t *actual_size) {
+
+ if(!is_valid()) {
+ return DATA_SHARE_ERROR_CORRUPT;
+ }
+
+ if(_current_offset >= (_total_size - SHARED_DATA_HEADER_SIZE)) {
+ return DATA_SHARE_ERROR_EOF;
+ }
+
+ uint16_t working_offset = _current_offset;
+
+ /* Get the type and the length */
+ *type = *PTR_TO_UINT16((SHARED_DATA_ENTRY_BASE + working_offset));
+ working_offset += sizeof(uint16_t);
+ *actual_size = *PTR_TO_UINT16((SHARED_DATA_ENTRY_BASE + working_offset));
+ working_offset += sizeof(uint16_t);
+
+ /* Check if the output buffer is large enough */
+ if((size_t)buf.size() < *actual_size) {
+ return DATA_SHARE_ERROR_OUT_OF_MEM;
+ }
+
+ /* Copy data of TLV entry */
+ memcpy(buf.data(), (const uint8_t*)PTR_TO_UINT8((SHARED_DATA_ENTRY_BASE + working_offset)), *actual_size);
+
+ working_offset += *actual_size;
+
+ /* Update state */
+ _current_offset = working_offset;
+
+ return DATA_SHARE_OK;
+
+}
+
+void DataShare::rewind() {
+ _current_offset = 0;
+}
+
+#endif /* MCUBOOT_DATA_SHARING && !MCUBOOT_BOOTLOADER_BUILD */
diff --git a/boot/mbed/include/utils/DataShare.h b/boot/mbed/include/utils/DataShare.h
new file mode 100644
index 0000000..fbb7e8e
--- /dev/null
+++ b/boot/mbed/include/utils/DataShare.h
@@ -0,0 +1,92 @@
+/**
+ *
+ * Built with ARM Mbed-OS
+ *
+ * Copyright (c) 2019-2021 Embedded Planet, Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef DATASHARE_H_
+#define DATASHARE_H_
+
+/**
+ * This is an utility intended to be used by the booted application rather
+ * than by the bootloader
+ */
+#if MCUBOOT_DATA_SHARING && !MCUBOOT_BOOTLOADER_BUILD
+
+#include <stdint.h>
+#include "platform/Span.h"
+
+/* Error codes */
+#define DATA_SHARE_OK 0
+#define DATA_SHARE_ERROR_EOF 1 /* No more TLV entries available */
+#define DATA_SHARE_ERROR_OUT_OF_MEM 2 /* The output buffer was not large enough to hold the contents of the TLV entry */
+#define DATA_SHARE_ERROR_CORRUPT 3 /* Data corruption has been detected */
+
+/**
+ * Class enabling iterator-style access to the TLV-encoded data shared
+ * by an mcuboot-based bootloader.
+ */
+class DataShare
+{
+public:
+
+ /**
+ * Initializes a DataShare iterator at the given base address
+ * @note the configured MCUBOOT_SHARED_DATA_BASE address is used by default
+ */
+ DataShare(uint8_t * shared_base = ((uint8_t *) MCUBOOT_SHARED_DATA_BASE));
+
+ /**
+ * Validates the magic number of the shared data section
+ * @return true if magic number is found, false otherwise
+ */
+ bool is_valid();
+
+ /**
+ * Gets the total size of the shared data region
+ * @return 0 if shared data region is not valid, otherwise the size of the shared data region
+ */
+ uint16_t get_total_size();
+
+ /**
+ * Attempts to get the next TLV entry in the shared data memory
+ * @param[put] type Type code of the data entry
+ * @param[out] out Output buffer span
+ * @param[out] actual_size Size of entry copied to output buffer in bytes
+ * @return err Zero if output buffer contents is valid (successful), non-zero on failure
+ */
+ int get_next(uint16_t *type, mbed::Span<uint8_t> buf, uint16_t *actual_size);
+
+ /**
+ * Resets the iterator-like pointer to the first TLV element in the shared
+ * data region
+ */
+ void rewind();
+
+protected:
+
+ uint8_t *_shared_base;
+ bool _is_valid = false;
+ uint16_t _total_size = 0;
+ uint16_t _current_offset = 0;
+
+};
+
+#endif /* MCUBOOT_DATA_SHARING && !MCUBOOT_BOOTLOADER_BUILD */
+
+#endif /* DATASHARE_H_ */
diff --git a/boot/mbed/mbed_lib.json b/boot/mbed/mbed_lib.json
index ef16f0c..ae8e288 100644
--- a/boot/mbed/mbed_lib.json
+++ b/boot/mbed/mbed_lib.json
@@ -25,12 +25,6 @@
"help": "Size of the scratch area, in bytes. If needed, please set on a per-target basis.",
"macro_name": "MCUBOOT_SCRATCH_SIZE"
},
- "header-size": {
- "help": "Header size, in bytes, prepended to the bootable application image. Should be one or multiple times the sector size.",
- "macro_name": "MCUBOOT_HEADER_SIZE",
- "required": true,
- "value": 4096
- },
"validate-primary-slot": {
"help": "Always check the signature of the image in the primary slot before booting, even if no upgrade was performed. This is recommended if the boot time penalty is acceptable.",
"macro_name": "MCUBOOT_VALIDATE_PRIMARY_SLOT",
@@ -41,7 +35,7 @@
"help": "The algorithm used for digital signing.",
"macro_name": "MCUBOOT_SIGNATURE_ALGORITHM",
"required": true,
- "accepted_values": ["SIGNATURE_TYPE_RSA", "SIGNATURE_TYPE_EC256", "SIGNATURE_TYPE_ED25519"],
+ "accepted_values": ["SIGNATURE_TYPE_RSA", "SIGNATURE_TYPE_EC256", "SIGNATURE_TYPE_ED25519", "SIGNATURE_TYPE_NONE"],
"value": "SIGNATURE_TYPE_RSA"
},
"rsa-signature-length": {
@@ -161,6 +155,16 @@
"macro_name": "MCUBOOT_DATA_SHARING",
"value": null
},
+ "share-data-base-address": {
+ "help": "Start of reserved RAM region for data shared between bootloader and application",
+ "macro_name": "MCUBOOT_SHARED_DATA_BASE",
+ "value": null
+ },
+ "share-data-size": {
+ "help": "Size of reserved RAM region for data shared between bootloader and application",
+ "macro_name": "MCUBOOT_SHARED_DATA_SIZE",
+ "value": null
+ },
"direct-xip": {
"help": "Enable ability to boot update candidates in-place.",
"macro_name": "MCUBOOT_DIRECT_XIP",