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

bcm2711: Use FS UUID and write config.txt and cmdline.txt earlier #6503

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

matthijskooijman
Copy link
Collaborator

Description

This PR makes two changes for the bcm2711 family:

  1. Use FS UUID for mounting the root filesystem instead of the FS label, bringing this family in line with most other boards.
  2. Write config.txt and cmdline.txt earlier, allowing it to be modified from customize-image-host.sh or customize-image.sh.

These two changes are conceptually independent, but touch the same area of code, so I put them in a single PR instead of splitting them.

Documentation summary for feature / change

No documentation needed.

How Has This Been Tested?

  • Built for rpi4b, with customizations to cmdline.txt and config.txt in customize-image-host.sh. Tested on rpi3b+ board.
  • I do not have a rpi5 to test with, but I expect no issues there.

Checklist:

Please delete options that are not relevant.

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings

This brings this family in line with most others that are u-boot based
and already use UUIDs and makes booting more reliable.
This allows userpatches customize-image-host.sh and customize-image.sh
to customize the contents of these files.

These files are now installed in the pre_install_distribution_specific
hook, which is the latest hook that runs before customize-image-host.sh.

The root= commandline option is still written (appended) in the
pre_umount_final_image hook as before, because the filesystem UUID is
not known when cmdline.txt is first written.
@github-actions github-actions bot added size/small PR with less then 50 lines Hardware Hardware related like kernel, U-Boot, ... labels Apr 19, 2024
@matthijskooijman matthijskooijman changed the title Rpi root fsuuid config cmdline earlier bcm2711: Use FS UUID and write config.txt and cmdline.txt earlier Apr 19, 2024
@igorpecovnik
Copy link
Member

Tested on rpi3b+ board

Would this have affect on armbian-install ... like installing to USB?

@igorpecovnik igorpecovnik added 02 Milestone: First quarter release Needs review Seeking for review labels May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
02 Milestone: First quarter release Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review size/small PR with less then 50 lines
Development

Successfully merging this pull request may close these issues.

2 participants