Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove out of tree patches #78

Merged
merged 6 commits into from
Jul 4, 2024

Conversation

AhmedIsmail02
Copy link
Contributor

Description

This PR main goal is to:

  • Remove out of tree patches that are not needed anymore.
  • Refactor patches to be pushed upstream (if applicable).

Test Steps

Checklist:

  • I have tested my changes. No regression in existing tests.
  • I have modified and/or added unit-tests to cover the code changes in this Pull Request.

Related Issue

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

The provisioning message change patch can't be pushed
upstream as it is mainly done to adapt to our CI pass
criteria. The intention is to remove of the out of
tree patches, thus custom pass_output.log files have been
created for each platform as the serial statements on
the terminal are platform specific and should have different
pass_output.log files to define the pass/success criteria for
each platform.

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>
This patch can be removed and substituted by using
target_compile_definitions() CMake function to
define `MBEDTLS_ALLOW_PRIVATE_ACCESS` for pkcs11
integration tests source files (core_pkcs11_test.c and
dev_mode_key_provisioning.c) as they both need to define
this macro as part of their source files to be able to
access mbedtls private fields.

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>
This commit include the following changes:

* Update MLEK library to latest release v24.05

* EthosU configurable arch patch is removed as
the issue of the constant NPU ID `u55` has been
fixed as part of v24.05 release.

* Use case resources patch is modified as the user
configurable use case resource file part of the patch
was added to v24.05 release where the remaining part
(user defined downloaded resources path) is to be available
in v24.08 release.

* tensorflow patch removed as the version of tensorflow
dependency the new MLEK v24.05 use doesn't need this
patch.

* activation_buf_dram placement in .bss.NoInit region patch
is removed to follow what MLEK library do regarding placement
of the activation buffers in the respective linker files for
each platform. This requires modification of all FRI
supported platforms' linker files.

* SetupMlEmbeddedEvaluationKitLibraries.cmake is modified to
adapt to v24.05 release changes.

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>
This patch is modified so it can be pushed upstream
The idea is to check if the `MQTT_KEEP_ALIVE_INTERVAL_SECONDS`
macro is defined by the user. Where if it is not defined,
a default value (5) would be used, this way the user can choose
the default value or different one that is to be provided using
CMake or command line. In our case, target_compile_definitions()
CMake function is used to overwrite the value of the macro for
mqtt integration tests.

This is done to avoid maintaining a patch which is project specific.

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>
Do not define __PASTE-macro for Arm compiler patch is
modified as the issue that the patch is trying to solve
was already introduced before for Keil Compiler so, the
condition is just modified to add Arm Compiler too.

This is done to be able to push this patch upstream.

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>
This commit contains two main changes:

* Update to latest commit on `freertos-pkcs11-psa`
master branch.

* Remove build-Update-mbedtls-version patch as it is
available upstream as part of the latest commit.

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>
@AhmedIsmail02 AhmedIsmail02 requested a review from a team as a code owner July 3, 2024 15:20
@urutva urutva merged commit 29bc544 into FreeRTOS:main Jul 4, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants