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

Simplify zephyr MACHINE and map processor arm64 -> aarch64 #208

Merged
merged 2 commits into from
May 6, 2022

Conversation

quic-egmc
Copy link
Contributor

Replace the architecture-specific machine directories with a common
C function for polling which calls to arch_cpu_idle.

Add a special case to map Zephyr arm64 to libmetal aarch64 in defining
PROJECT_PROCESSOR variable.

Set the MACHINE variable based CONFIG_ARCH instead of testing
individual arch config flags.

Copy link
Contributor

@edmooring edmooring left a comment

Choose a reason for hiding this comment

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

Looks good to go.

@quic-egmc
Copy link
Contributor Author

Thanks - I'm still doing some testing under arm and arm64

Copy link
Contributor

@arnopo arnopo left a comment

Choose a reason for hiding this comment

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

LGTM, could you just rename pool.c to sys.c that's metal_generic_default_poll is define in sys.c for all platforms?
thanks

*
* SPDX-License-Identifier: BSD-3-Clause
*/

/*
* @file zephyr/riscv/sys.c
* @brief machine specific system primitives implementation.
* @file zephyr/poll.c
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you keep sys.c to harmonize the file naming with other platforms.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done. force-pushed changes to rename poll.c to sys.c and update CMakeLists.txt accordingly.

(I can't believe that in 2022 github still can't track changes across force-pushes - other tools like gitlab have been doing this for years)

Copy link
Contributor

Choose a reason for hiding this comment

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

The delta is visible by clicking on the compare button or the force_push ;-)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh, thanks! somehow I expected to see this under Files changed but it appears it's only visible in the PR "conversation". that's what I get for hanging out in gitlab for a while!

@arnopo
Copy link
Contributor

arnopo commented May 5, 2022

Thanks - I'm still doing some testing under arm and arm64

Please let me know when your tests are finished (maybe it is already finished).

Replace the architecture-specific machine directories with a common
C function for polling which calls to arch_cpu_idle.

Add a special case to map Zephyr arm64 to libmetal aarch64 in defining
PROJECT_PROCESSOR variable.

Set the MACHINE variable based CONFIG_ARCH instead of testing
individual arch config flags.

Signed-off-by: Eugene Cohen <[email protected]>
This adds CI build test for arm64 architecture.

Signed-off-by: Eugene Cohen <[email protected]>
Copy link
Contributor

@arnopo arnopo left a comment

Choose a reason for hiding this comment

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

LGTM

@arnopo arnopo merged commit 7926c87 into OpenAMP:main May 6, 2022
@arnopo arnopo added this to the Release V2022.10 milestone May 16, 2022
@arnopo arnopo mentioned this pull request Jun 2, 2022
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.

4 participants