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

Kirkstone rpi-eeprom #1238

Open
wants to merge 3 commits into
base: kirkstone
Choose a base branch
from

Conversation

djr-spectrummfg
Copy link

This is a simple backport of the changes from #1131 to the kirkstone branch.

allanembedded and others added 3 commits October 24, 2023 16:36
To better support rpi-eeprom without depending on userland it was
decided to build nvmem-rmem support into the kernel for Raspberry Pi 4
machines.

Signed-off-by: Allan Xavier <[email protected]>
This recipe will allow yocto images to support configuring and updating
the bootloader on Raspberry Pi 4 boards. So far this recipe just
includes the commands and firmware with no automation for updates.

Note that this depends on nvmem-rmem support either built into the
kernel or as a module. If that is not part of the kernel the scripts
will error out suggesting that the vcgencmd command from the userland
package is missing. Whilst using vcgencmd from the userland package does
work, it would lead to a conflict with the mesa backend for graphics, so
using the kernel interface is recommended.

Co-authored-by: Maciej Pijanowski <[email protected]>
Signed-off-by: Allan Xavier <[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.

You included a vim commit - probably by mistake.

@@ -0,0 +1 @@
RPROVIDES:${PN} += " xxd"
Copy link

@holagvk holagvk Nov 24, 2023

Choose a reason for hiding this comment

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

I think instead of using vim to provide xxd, we can use xxd from busybox?

  1. busybox_%.bbappend:
FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
SRC_URI += "file:https://enable-xxd.cfg"
RPROVIDES:${PN} += " xxd"
  1. Add enable-xxd.cfg
    CONFIG_XXD=y

CC/ @agherzan for feedback

Copy link
Author

Choose a reason for hiding this comment

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

Using vim is what the master branch does, so the RPROVIDES="xxd" change was backported from that. I wasn't aware busybox provided an implementation of xxd either.

Copy link
Owner

Choose a reason for hiding this comment

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

Sure, but this is just not right in the BSP without any additional guards, explanations etc.

Copy link
Collaborator

Choose a reason for hiding this comment

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

we already use update-alternatives to provide appropriate xxd. If we do not include vim-xxd in image then it will nicely fallback to busybox to provide it. We perhaps do not require anything to do here.

Copy link
Author

Choose a reason for hiding this comment

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

I don't know what to tell you other than if you remove that it doesn't build.

Copy link

@holagvk holagvk Dec 18, 2023

Choose a reason for hiding this comment

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

I confirmed as well - Without vim or busbybox explicitly providing xxd, rpi-eeprom doesn't build on kirkstone

Copy link
Owner

Choose a reason for hiding this comment

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

How does this work in the source of the backport? We really need a way to first understand the problem. All we have is a commit that says Add RPROVIDES="xxd" to vim so that rpi-eeprom can be built on kirkstone branch. We need an explanation (not to mention the commit message format (https://meta-raspberrypi.readthedocs.io/en/latest/contributing.html),

@djr-spectrummfg
Copy link
Author

You included a vim commit - probably by mistake.

This is not a mistake. It is required for it to work and this is a backport from master.

@@ -0,0 +1 @@
RPROVIDES:${PN} += " xxd"
Copy link
Owner

Choose a reason for hiding this comment

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

Sure, but this is just not right in the BSP without any additional guards, explanations etc.

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.

None yet

5 participants