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

litex: remove minimal build option #2768

Merged
merged 5 commits into from
Apr 16, 2020
Merged

Conversation

xobs
Copy link
Collaborator

@xobs xobs commented Apr 14, 2020

This removes CIRCUITPY_MINIMAL_BUILD and adds config options to get circuitpython building on Fomu.

It also adds required functions such as mp_hal_delay_us and the os module, which are necessary for doing a non-minimal build.

Copy link
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

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

One nit pick. Looks good otherwise. Thanks!

ports/litex/common-hal/os/__init__.c Outdated Show resolved Hide resolved
@xobs xobs force-pushed the litex-full-build branch from a2f66e3 to cc00d10 Compare April 15, 2020 01:41
tannewt
tannewt previously approved these changes Apr 15, 2020
Copy link
Member

@tannewt tannewt 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! Thanks!

@tannewt
Copy link
Member

tannewt commented Apr 15, 2020

Looks like you need to merge in master. ulab changed but github's merge doesn't look smart enough to update the submodule. Not sure why it only broke fomu though.

xobs added 3 commits April 16, 2020 09:26
Add a mp_hal_delay_us, which is required by some of the modules,
that simply calls mp_hal_delay_ms / 1000.

Signed-off-by: Sean Cross <sean@xobs.io>
Signed-off-by: Sean Cross <sean@xobs.io>
Manually specify available modules and disable any modules
that are currently unsupported on the litex target.

Signed-off-by: Sean Cross <sean@xobs.io>
@xobs
Copy link
Collaborator Author

xobs commented Apr 16, 2020

I did a rebase onto master. Let's see if that fixes it.

Signed-off-by: Sean Cross <sean@xobs.io>
@xobs xobs force-pushed the litex-full-build branch from faa446a to 61f777c Compare April 16, 2020 02:05
@xobs
Copy link
Collaborator Author

xobs commented Apr 16, 2020

The issue was the micropython config was missing MICROPY_PY_REVERSE_SPECIAL_METHODS. This has now been added.

Copy link
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

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

Thanks!

@tannewt tannewt merged commit 669ac3f into adafruit:master Apr 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants