-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #43 from PelionIoT/dev
release 2.3.0 dev-->master merge
- Loading branch information
Showing
19 changed files
with
309 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
recipes-connectivity/mbed-edge-core/files/0001-fix_psa_storage_location.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/config/psa_storage_user_config.h b/config/psa_storage_user_config.h | ||
| index 742f5d7..e5fc9b4 100644 | ||
| --- a/config/psa_storage_user_config.h | ||
| +++ b/config/psa_storage_user_config.h | ||
| @@ -32,6 +32,6 @@ | ||
| #undef PSA_STORAGE_FILE_C_STORAGE_PREFIX | ||
| #endif | ||
|
|
||
| -#define PSA_STORAGE_FILE_C_STORAGE_PREFIX "psa/" | ||
| +#define PSA_STORAGE_FILE_C_STORAGE_PREFIX "/userdata/mbed/mcc_config" | ||
|
|
||
| #endif /* PSA_STORAGE_USER_CONFIG_H */ | ||
|
|
32 changes: 32 additions & 0 deletions
32
...vity/mbed-edge-core/files/0001-parsec-se-driver-should-be-compiled-separately-in-Yo.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| From af5a526b949e2b0f9c6ccca3b5d0c81762ceec84 Mon Sep 17 00:00:00 2001 | ||
| From: Yash Goyal <[email protected]> | ||
| Date: Tue, 9 Mar 2021 17:46:24 -0800 | ||
| Subject: [PATCH] parsec-se-driver should be compiled separately in Yocto env | ||
|
|
||
| parsec-se-driver is a Rust based project and Yocto do not like calling | ||
| cargo from within cmake. Will add a separate recipe for parsec-se-driver | ||
| and call that as DEPENDS in mbed-edge-core. | ||
| --- | ||
| lib/CMakeLists.txt | 6 ------ | ||
| 1 file changed, 6 deletions(-) | ||
|
|
||
| diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt | ||
| index 5a622e4..f289c16 100644 | ||
| --- a/lib/CMakeLists.txt | ||
| +++ b/lib/CMakeLists.txt | ||
| @@ -53,12 +53,6 @@ if (PARSEC_TPM_SE_SUPPORT OR (FOTA_ENABLE AND NOT MBED_CLOUD_CLIENT_CURL_DYNAMIC | ||
|
|
||
| if (PARSEC_TPM_SE_SUPPORT) | ||
|
|
||
| - find_program(CARGO cargo) | ||
| - if (NOT CARGO) | ||
| - message(FATAL_ERROR "cargo not found!") | ||
| - endif () | ||
| - | ||
| - add_subdirectory("pal-platform/Middleware/parsec_se_driver") | ||
| add_subdirectory("pal-platform/Middleware/trusted_storage") | ||
|
|
||
| else () | ||
| -- | ||
| 2.17.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 0 additions & 24 deletions
24
...s-connectivity/mbed-edge-core/files/0004-Removed-the-redundant-cmake-command.manual_patch
This file was deleted.
Oops, something went wrong.
14 changes: 8 additions & 6 deletions
14
recipes-connectivity/mbed-edge-core/files/0005-fota.manual_patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,25 @@ | ||
| diff --git a/lib/mbed-cloud-client/fota/fota_config.h b/lib/mbed-cloud-client/fota/fota_config.h | ||
| index 3cd840a..8ae2673 100644 | ||
| index 8bd80d4..4f77e19 100644 | ||
| --- a/lib/mbed-cloud-client/fota/fota_config.h | ||
| +++ b/lib/mbed-cloud-client/fota/fota_config.h | ||
| @@ -55,15 +55,15 @@ | ||
| @@ -79,17 +79,17 @@ | ||
| #endif | ||
|
|
||
| #if !defined(MBED_CLOUD_CLIENT_FOTA_LINUX_HEADER_FILENAME) | ||
| -#define MBED_CLOUD_CLIENT_FOTA_LINUX_HEADER_FILENAME "fota_fw_metadata" | ||
| +#define MBED_CLOUD_CLIENT_FOTA_LINUX_HEADER_FILENAME "/userdata/fota_fw_metadata" | ||
| #endif | ||
|
|
||
|
|
||
| #define MBED_CLOUD_CLIENT_FOTA_LINUX_TEMP_HEADER_FILENAME MBED_CLOUD_CLIENT_FOTA_LINUX_HEADER_FILENAME ".tmp" | ||
|
|
||
| #if !defined(MBED_CLOUD_CLIENT_FOTA_LINUX_UPDATE_STORAGE_FILENAME) | ||
| -#define MBED_CLOUD_CLIENT_FOTA_LINUX_UPDATE_STORAGE_FILENAME "fota_candidate" | ||
| +#define MBED_CLOUD_CLIENT_FOTA_LINUX_UPDATE_STORAGE_FILENAME "/userdata/fota_candidate" | ||
| #endif | ||
|
|
||
| #if !defined(MBED_CLOUD_CLIENT_FOTA_LINUX_CANDIDATE_FILENAME) | ||
| -#define MBED_CLOUD_CLIENT_FOTA_LINUX_CANDIDATE_FILENAME "fota_raw_candidate" | ||
| +#define MBED_CLOUD_CLIENT_FOTA_LINUX_CANDIDATE_FILENAME "/userdata/fota_raw_candidate" | ||
| #endif | ||
|
|
||
| #endif // defined(TARGET_LIKE_LINUX) |
33 changes: 33 additions & 0 deletions
33
recipes-connectivity/mbed-edge-core/files/0008-ordered-reboot.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| diff --git a/lib/mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/Linux/RTOS/pal_plat_rtos.c b/lib/mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/Linux/RTOS/pal_plat_rtos.c | ||
| index 8c94312..4948f42 100644 | ||
| --- a/lib/mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/Linux/RTOS/pal_plat_rtos.c | ||
| +++ b/lib/mbed-cloud-client/mbed-client-pal/Source/Port/Reference-Impl/OS_Specific/Linux/RTOS/pal_plat_rtos.c | ||
| @@ -99,26 +99,8 @@ PAL_PRIVATE void palTimerThread(void const *args); | ||
| */ | ||
| void pal_plat_osReboot(void) | ||
| { | ||
| -//Simulator is currently for Linux only | ||
| -#if (PAL_SIMULATE_RTOS_REBOOT == 1) | ||
| - const char *argv[] = {"0" , 0}; | ||
| - char *const envp[] = { 0 }; | ||
| - argv[0] = program_invocation_name; | ||
| - | ||
| - PAL_LOG_INFO("pal_plat_osReboot -> simulated reboot with execve(%s).\r\n", argv[0]); | ||
| - | ||
| - if (-1 == execve(argv[0], (char **)argv , envp)) | ||
| - { | ||
| - PAL_LOG_ERR("child process execve failed [%s]\r\n", argv[0]); | ||
| - } | ||
| -#else | ||
| - PAL_LOG_INFO("Rebooting the system\r\n"); | ||
| - | ||
| - // Syncronize cached files to persistant storage. | ||
| - sync(); | ||
| - // Reboot the device | ||
| - reboot(RB_AUTOBOOT); | ||
| -#endif | ||
| + PAL_LOG_INFO("pal_plat_osReboot.\r\n"); | ||
| + system("reboot"); | ||
| } | ||
|
|
||
| /*! Initialize all data structures (semaphores, mutexs, memory pools, message queues) at system initialization. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
recipes-connectivity/mbed-edge-core/files/mbed_cloud_client_user_config.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * ---------------------------------------------------------------------------- | ||
| * Copyright 2018-2021 ARM Ltd. | ||
| * | ||
| * 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. | ||
| * ---------------------------------------------------------------------------- | ||
| */ | ||
|
|
||
| /* | ||
| * Minimal configuration for using mbed-cloud-client | ||
| */ | ||
|
|
||
| #ifndef MBED_CLOUD_CLIENT_USER_CONFIG_H | ||
| #define MBED_CLOUD_CLIENT_USER_CONFIG_H | ||
|
|
||
| #define MBED_CLOUD_CLIENT_SUPPORT_CLOUD | ||
| #define MBED_CLOUD_CLIENT_ENDPOINT_TYPE "MBED_GW" | ||
| #define MBED_CLOUD_CLIENT_TRANSPORT_MODE_TCP | ||
| #define MBED_CLOUD_CLIENT_LIFETIME 1800 | ||
|
|
||
| #define SN_COAP_MAX_BLOCKWISE_PAYLOAD_SIZE 1024 | ||
| #define SN_COAP_DUPLICATION_MAX_MSGS_COUNT 0 | ||
| #define SN_COAP_DISABLE_RESENDINGS 1 | ||
|
|
||
| /* set download buffer size in bytes (min. 1024 bytes) */ | ||
| #define MBED_CLOUD_CLIENT_UPDATE_BUFFER (2 * 1024 * 1024) | ||
|
|
||
| /* set the TCP KEEPALIVE values */ | ||
| #define MBED_CLIENT_TCP_KEEPALIVE_INTERVAL 60 | ||
| #define MBED_CLIENT_TCP_KEEPALIVE_TIME 60 | ||
|
|
||
| #endif /* MBED_CLIENT_USER_CONFIG_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.