mbedtls: remove unused configuration header files #78641
Conversation
valeriosetti
force-pushed
the
remove-unused-headers
branch
3 times, most recently
from
ae350ba to
b1ab664
Compare
|
This pull request has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this pull request will automatically be closed in 14 days. Note, that you can always re-open a closed pull request at any time. |
valeriosetti
force-pushed
the
remove-unused-headers
branch
3 times, most recently
from
390b173 to
c82fd28
Compare
valeriosetti
force-pushed
the
remove-unused-headers
branch
from
c82fd28 to
6635aac
Compare
These headers are basically a copy of those found in the official Mbed TLS repo in the "configs" folder. However these are unmaintaned (i.e. not updated when Mbed TLS is bumped to a new version) and also unused in Zephyr. Therefore there's no benefit in keeping them around. Signed-off-by: Valerio Setti <[email protected]>
Since there's now a single Kconfig and header file for Mbed TLS it makes more sense to name them: - Kconfig.mbedtls (instead of Kconfig.tls-generic) - config-mbedtls.h (instead config-tls-generic.h) Signed-off-by: Valerio Setti <[email protected]>
valeriosetti
force-pushed
the
remove-unused-headers
branch
from
6635aac to
20bfe17
Compare
|
Since it was a bit hard to get reviews on this, I strongly reduced the scope of the PR. Now it just removes unused files and renames what's left for Mbed TLS. |
This PR should be merged in sync with zephyrproject-rtos/zephyr#78641. Signed-off-by: Valerio Setti <[email protected]>
|
The following west manifest projects have changed revision in this Pull Request:
Additional metadata changed:
⛔ DNM label due to: 1 project with PR revision and 1 project with metadata changes Note: This message is automatically posted and updated by the Manifest GitHub Action. |
zephyrbot
added
manifest-mcuboot
DNM (manifest)
valeriosetti
changed the title
west.yml
Outdated
| @@ -303,7 +303,7 @@ manifest: | |||
| groups: | |||
| - crypto | |||
| - name: mcuboot | |||
| revision: 346f7374ff4467e40b5594658f8ac67a5e9813c9 | |||
| revision: pull/124/head | |||
There was a problem hiding this comment.
This has been closed, shouldn't this PR reference the mcutools/mcuboot PR?
There was a problem hiding this comment.
Yes, the reference to zephyrproject-rtos/mcuboot#124 is surely not correct now, but I don´t know if I can directly point to mcu-tools/mcuboot#2222. While creating PR 2222 I noticed that the main branch of https://github.com/mcu-tools/mcuboot is a bit newer than https://github.com/zephyrproject-rtos/mcuboot, so I guess that the process is:
- review & merge zephyr: fix Mbed TLS configuration header file selection mcu-tools/mcuboot#2222
- create a PR in https://github.com/zephyrproject-rtos/mcuboot which cherry-picks my fix
- update this PR with the PR in https://github.com/zephyrproject-rtos/mcuboot
Am I wrong?
There was a problem hiding this comment.
* create a PR in https://github.com/zephyrproject-rtos/mcuboot which cherry-picks my fix
No.
Am I wrong?
Yes ;)
We sync mcuboot to have exactly the same history as upstream, so that is only done via full main branch syncs.
Like here:
#85671
This is needed to include changes from mcu-tools/mcuboot#2222 Signed-off-by: Valerio Setti <[email protected]>
valeriosetti
force-pushed
the
remove-unused-headers
branch
from
cb588ff to
284e9d8
Compare
Remove all unused configuration header files. These were likely copied from Mbed TLS in the past, but not updated afterwards. At the same time they are not used in the Zephyr's scope, so it's useless to keep them around.
Do a bit of renaming:
config-tls-generic.h->config-mbedtls.hKconfig.tls-generic->Kconfig.mbedtls