aarch64 support: efi stub and devicetree selection #722
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zdykstra
force-pushed
the
podunk-platform-support
branch
8 times, most recently
from
4b60c5c to
0ec4a20
Compare
|
Go go gadget force push |
zdykstra
force-pushed
the
podunk-platform-support
branch
from
0ec4a20 to
b64815c
Compare
generate-zbm now understands the EFI.DeviceTree key. This key can
contain one of three possible values:
1) /absolute/path/%{kernel}/to/device-tree-file.dtb
2) /absolute/path/to/device-tree-file.dtb
3) partial/path/device-tree-file.dtb
If found, %{kernel} is replaced with the kernel version being built in
to the EFI asset. Partial paths are appended to /boot/dtbs/dtb-$kernel/,
a well-known path for device tree files used by Void Linux.
Inside ZFSBootMenu, the org.zfsbootmenu:devicetree property is read. The
value of this property are handled in the same order/priority as
EFI.DeviceTree. %{kernel} is replaced with the kernel version that kexec
is loading / executing.
zdykstra
force-pushed
the
podunk-platform-support
branch
from
b64815c to
cccb2b0
Compare
ahesford
approved these changes
Feb 9, 2025
Comment on lines
+797
to
+807
| if ( has_value $dtb_try && -f $dtb_try ) { | ||
| $uki_offset = addBundleSection( \@cmd, ".dtb", $dtb_try, $uki_offset, $uki_alignment ); | ||
| } else { | ||
| if ( has_value $dtb_try ) { | ||
| printf "EFI.DeviceTree key set to '%s', file not found at '%s'\n", $config{EFI}{DeviceTree}, $dtb_try; | ||
| exit 1; | ||
| } else { | ||
| printf "EFI.DeviceTree key set to '%s', file not found\n", $config{EFI}{DeviceTree}; | ||
| exit 1; | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| if ( has_value $dtb_try && -f $dtb_try ) { | |
| $uki_offset = addBundleSection( \@cmd, ".dtb", $dtb_try, $uki_offset, $uki_alignment ); | |
| } else { | |
| if ( has_value $dtb_try ) { | |
| printf "EFI.DeviceTree key set to '%s', file not found at '%s'\n", $config{EFI}{DeviceTree}, $dtb_try; | |
| exit 1; | |
| } else { | |
| printf "EFI.DeviceTree key set to '%s', file not found\n", $config{EFI}{DeviceTree}; | |
| exit 1; | |
| } | |
| } | |
| if ( has_value $dtb_try) { | |
| if ( -f $dtb_try ) { | |
| $uki_offset = addBundleSection( \@cmd, ".dtb", $dtb_try, $uki_offset, $uki_alignment ); | |
| } else { | |
| printf "EFI.DeviceTree key set to '%s', file not found at '%s'\n", $config{EFI}{DeviceTree}, $dtb_try; | |
| exit 1; | |
| } | |
| } else { | |
| printf "EFI.DeviceTree key set to '%s', but no DeviceTree file could be found\n", $config{EFI}{DeviceTree}; | |
| exit 1; | |
| } |
| if [ -n "${dtb_prop}" ] && [ "${dtb_prop}" != '-' ] ; then | ||
| zdebug "devicetree property set to '${dtb_prop}'" | ||
|
|
||
| # this is cursed |
There was a problem hiding this comment.
This isn't really cursed, it's how we map kernels to initramfs images as well.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
generate-zbm now understands the
EFI.DeviceTreekey. This key can contain one of three possible values:If found, %{kernel} is replaced with the kernel version being built in to the EFI asset. Partial paths are appended to
/boot/dtbs/dtb-$kernel/, a well-known path for device tree files used by Void Linux.Inside ZFSBootMenu, the
org.zfsbootmenu:devicetreeproperty is read. The values of this property are handled in the same order/priority asEFI.DeviceTree.Documentation will be written and appended to this PR once the overall design of this support is accepted.