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

rpi-base: Added missing HiFiBerry #1284

Merged
merged 3 commits into from
Jun 4, 2024
Merged

Conversation

kluszon
Copy link
Contributor

@kluszon kluszon commented Feb 19, 2024

…Pro, DAC+ DSP, DAC+ HD, Digi Pro.

- What I did

Added missing support for HiFiBerry AMP100, AMP3, AMP4 Pro, DAC+ ADC Pro, DAC+ DSP, DAC+ HD, Digi Pro.

- How I did it

Add right lines to rpi-base.inc. Changes were tested and works fine with the branch.

Connected also with issue #1168

@agherzan
Copy link
Owner

Is this a backport from main? If not, why is this kirkstone-specific?

@kluszon
Copy link
Contributor Author

kluszon commented Feb 20, 2024

Is this a backport from main? If not, why is this kirkstone-specific?

It's not a backport, because on main branch you don't have it. I'm working on kirkstone branch and it's a reason. It could be applied to any branch with kernel 5.10 or newer. I didn't test it with older kernels, but some dtbo files can be not available there.

@agherzan
Copy link
Owner

In that case, I would like for this to be pushed against main first to avoid feature divergence on maintenance branches.

@kluszon
Copy link
Contributor Author

kluszon commented Feb 21, 2024

@agherzan Ok then pull request prepared #1287

@kluszon
Copy link
Contributor Author

kluszon commented Mar 5, 2024

@agherzan
Can you do a cherry-pick from 92a9b7a to the Kirkstone branch and close it?

@agherzan
Copy link
Owner

@kluszon Could you refresh this MR by recreating the branch with the cherry-pick of the commit you've prepared for master? This will kick the gears here and run the CI for kirkstone too.l

@kluszon
Copy link
Contributor Author

kluszon commented Mar 19, 2024

@kluszon Could you refresh this MR by recreating the branch with the cherry-pick of the commit you've prepared for master? This will kick the gears here and run the CI for kirkstone too.l

Done

Copy link
Owner

@agherzan agherzan 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.

Copy link
Owner

@agherzan agherzan 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 now! Thanks.

@agherzan
Copy link
Owner

agherzan commented Apr 8, 2024

@kluszon the builds fail with:

| make[1]: *** No rule to make target 'arch/arm/boot/dts/overlays/hifiberry-amp4pro.dtbo'. Stop.

@kluszon
Copy link
Contributor Author

kluszon commented Apr 9, 2024

@kluszon the builds fail with:

| make[1]: *** No rule to make target 'arch/arm/boot/dts/overlays/hifiberry-amp4pro.dtbo'. Stop.

Your kernel doesn't have the file. I compiled it locally without any problem. What should I do with it?

@agherzan
Copy link
Owner

I wish I had a kernel :)
Joke aside, you're probably building a different version, and not the default kirkstone one. You can see here https://github.com/agherzan/meta-raspberrypi/blob/master/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh how the CI builds the kernel.

@kluszon
Copy link
Contributor Author

kluszon commented May 8, 2024

I wish I had a kernel :) Joke aside, you're probably building a different version, and not the default kirkstone one. You can see here https://github.com/agherzan/meta-raspberrypi/blob/master/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh how the CI builds the kernel.

The only I can do is remove the problematic amp4pro.

Copy link
Owner

@agherzan agherzan left a comment

Choose a reason for hiding this comment

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

The only I can do is remove the problematic amp4pro.

That should work. Could you:

  1. rework the removal commit to match the contribution patch format - https://meta-raspberrypi.readthedocs.io/en/latest/contributing.html
  2. rebase on latest tip

Thanks.

@kluszon kluszon force-pushed the kirkstone branch 2 times, most recently from 51a75b9 to 0de10fb Compare June 4, 2024 06:05
pascalhuerst and others added 3 commits June 4, 2024 08:21
There is anoter hifiberry hat, for which there is currently
no overlay added to the build, so let's add it:

hifiberry-dacplusadcpro.dtbo

Signed-off-by: Pascal Huerst <[email protected]>
Added support for missing HiFiBerry AMP100, AMP3, AMP4 Pro, DAC+ ADC Pro, DAC+ DSP, DAC+ HD, Digi Pro.

Signed-off-by: Michał Kluska <[email protected]>
Removed hifiberry amp4pro.

Signed-off-by: Michał Kluska <[email protected]>
Copy link
Owner

@agherzan agherzan 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!

@agherzan agherzan enabled auto-merge (rebase) June 4, 2024 09:58
@agherzan agherzan merged commit d7544f3 into agherzan:kirkstone Jun 4, 2024
17 checks passed
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