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.

Sign up for GitHub

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

Jump to bottom

Add Cortex-M33 support, fix patches #5

Merged
merged 4 commits into from
Jan 18, 2022
Merged

Add Cortex-M33 support, fix patches #5

merged 4 commits into from
Jan 18, 2022

Conversation

chris-durand
Copy link
Contributor

@chris-durand chris-durand commented Jan 2, 2022 •
edited
Loading

This adds the files for Cortex-M33 support. Furthermore, the updater fails now if patches do not apply (#4). Some have been failing for some time and nobody noticed.

  • Add CM33 port
  • Make updater fail if patches do not apply
  • Fix patches

@chris-durand
Copy link
Contributor Author

The update is now aborted with failing patches:

Apply patches...
Checking patch FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h...
error: while searching for:
    #define ipconfigNETWORK_MTU    1500
#endif

#ifndef ipconfigTCP_MSS
    #define ipconfigTCP_MSS    ( ipconfigNETWORK_MTU - ( ipSIZE_OF_IPv4_HEADER + ipSIZE_OF_TCP_HEADER ) )
#endif

error: patch failed: FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h:395
error: FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h: patch does not apply
Applying patch 'patches/tcp_config.patch' failed!

@chris-durand chris-durand mentioned this pull request Jan 2, 2022
Merged
14 tasks
@chris-durand
Copy link
Contributor Author

I have triggered the updater job to run on this branch and it fails now as it should.

chris-durand and others added 3 commits January 17, 2022 22:06
@chris-durand
Copy link
Contributor Author

Freertos is working with STM32L5 / CM33 and this branch (see modm-io/modm#800)

salkinium
salkinium approved these changes Jan 18, 2022
View reviewed changes
Copy link
Contributor

@salkinium salkinium left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I will merge this together with the modm PR.

@salkinium salkinium merged commit c665706 into master Jan 18, 2022
@salkinium salkinium deleted the feature/cm33 branch January 18, 2022 11:18
@salkinium salkinium mentioned this pull request Jan 18, 2022
Closed
@salkinium salkinium linked an issue Jan 18, 2022 that may be closed by this pull request
Patches fail to apply but pipeline suceeds #4
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@salkinium salkinium salkinium approved these changes

@rleh rleh Awaiting requested review from rleh

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Patches fail to apply but pipeline suceeds
2 participants
@chris-durand @salkinium