Revise I2C HAL gating logic in tpm_to_infineon #347
Merged
Conversation
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
dgarske
requested changes
Apr 30, 2024
hal/tpm_io_infineon.c
Outdated
| @@ -43,6 +43,7 @@ | |||
| defined(WOLFTPM_SWTPM) || \ | |||
| defined(WOLFTPM_WINAPI) ) | |||
|
|
|||
| #if defined(CY_USING_HAL) | |||
There was a problem hiding this comment.
It needs to be #if defined(WOLFTPM_INFINEON_TRICORE) || defined(CY_USING_HAL)
There was a problem hiding this comment.
good catch. updated.
gojimmypi
force-pushed
the
PR-infineon-CY_USING_HAL
branch
from
4c2bbc7
to
83a92e1
Compare
gojimmypi
changed the title
dgarske
requested changes
Apr 30, 2024
hal/tpm_io_infineon.c
Outdated
| @@ -51,7 +52,6 @@ | |||
| #define TPM2_I2C_ADDR 0x2e | |||
| #endif | |||
|
|
|||
| #if defined(CY_USING_HAL) | |||
There was a problem hiding this comment.
Please don't remove this code or the code below at 149-152. Thank you
There was a problem hiding this comment.
I had to read that a few times to understand what's going on.
Does that mean no I2C available / implemented on Infineon Tricore?
hal/tpm_io_infineon.c
Outdated
| @@ -211,6 +207,8 @@ | |||
| #error Infineon I2C support on this platform not supported yet | |||
| #endif /* CY_USING_HAL or WOLFTPM_INFINEON_TRICORE */ | |||
| #endif /* SPI or I2C */ | |||
| #endif /* CY_USING_HAL */ | |||
There was a problem hiding this comment.
Please update comment | WOLFTPM_INFINEON_TRICORE.
There was a problem hiding this comment.
Ah, good catch. Updated.
gojimmypi
force-pushed
the
PR-infineon-CY_USING_HAL
branch
from
83a92e1
to
e4ff305
Compare
gojimmypi
force-pushed
the
PR-infineon-CY_USING_HAL
branch
from
3448ab0
to
ec35cef
Compare
gojimmypi
added a commit
to gojimmypi/wolfTPM
that referenced
this pull request
Apr 30, 2024
dgarske
approved these changes
Apr 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR updates the gating logic in the
hal/tpm_io_infineon.cto be more consistent with other target platforms.For example, note how the
tpm_io_microchip.cis wrapped withWOLFTPM_MICROCHIP_HARMONY, disabling the entire file otherwise:Without this modification, enabling
WOLFTPM_INCLUDE_IO_FILEandWOLFTPM_I2Ccauses a compile-time error as the only gate isWOLFTPM_I2C. In my case, I'm using the Espressf I2C library, not the cyhal here:Here's the content of my wolfTPM
options.h:Testing
I have not tested this, as I don't have the target library that is being changed.