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

mcux-sdk-middleware-usb: remove duplicate files #317

Merged

Conversation

jsiverskog
Copy link
Contributor

these files just cause confusion.

jsiverskog added a commit to jsiverskog/zephyr that referenced this pull request Jan 11, 2024
this contains a minor repository cleanup.

see zephyrproject-rtos/hal_nxp#317 for more
information.

Signed-off-by: Jacob Siverskog <[email protected]>
@jsiverskog
Copy link
Contributor Author

corresponding zephyr pr: zephyrproject-rtos/zephyr#67490

@jsiverskog
Copy link
Contributor Author

@danieldegrasse : do you have time to review this? thanks

@danieldegrasse
Copy link
Collaborator

@mmahadevan108 could you take a look at this? It looks like these files are duplicates of https://github.com/zephyrproject-rtos/hal_nxp/blob/master/mcux/middleware/mcux-sdk-middleware-usb/device/usb_device.h.

@jsiverskog I appreciate the cleanup- could you make a corresponding PR to https://github.com/nxp-mcuxpresso/mcux-sdk? I would like to avoid carrying a patch removing these files if possible, since we import the MCUX SDK from that repository.

these files just cause confusion.

Signed-off-by: Jacob Siverskog <[email protected]>
@jsiverskog jsiverskog force-pushed the remove_duplicate_files branch from c65af74 to 257b810 Compare January 17, 2024 07:31
@jsiverskog
Copy link
Contributor Author

@danieldegrasse : absolutely: nxp-mcuxpresso/mcux-sdk#160

@danieldegrasse
Copy link
Collaborator

danieldegrasse commented Jan 17, 2024

@danieldegrasse : absolutely: nxp-mcuxpresso/mcux-sdk#160

Thanks- if we want to merge this now, we should add a note to the patchlist. Otherwise, we can wait for the PR to the SDK itself to merge, then this PR should not need any notes in the patchlist IMO

@jsiverskog
Copy link
Contributor Author

@danieldegrasse : upstream PR merged!

@mmahadevan108 mmahadevan108 merged commit 3aafbf4 into zephyrproject-rtos:master Jan 18, 2024
@jsiverskog
Copy link
Contributor Author

@danieldegrasse should i close zephyrproject-rtos/zephyr#67490 ? it's not important to get that one merged, we can wait for zephyrproject-rtos/zephyr#67483 instead

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