nanopi-r6c: u-boot: bump to 2025.01 final, with working UMS and SD -> NVMe -> eMMC boot order #7682
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
… NVMe -> eMMC boot order - also LEDs, networking, more supported compression methods... - copypasta reigns supreme. refactor is coming, just not today - also hack the u-boot dtsi for consistent-with-Linux-mainline-DT mmc/sd numbering
github-actions
bot
added
size/medium
Comment on lines
+52
to
+60
| function pre_config_uboot_target__r6c_patch_uboot_dtsi_for_ums() { | ||
| display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file | ||
| cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi | ||
| &u2phy0 { status = "okay"; }; | ||
| &u2phy0_otg { status = "okay"; }; | ||
| &usbdp_phy0 { status = "okay"; }; | ||
| &usb_host0_xhci { dr_mode = "peripheral"; maximum-speed = "high-speed"; status = "okay"; }; | ||
| EOD | ||
| } |
There was a problem hiding this comment.
Doesn't this disable host mode for one of the USB ports?
There was a problem hiding this comment.
Yes, it's exactly the point.
There was a problem hiding this comment.
Alright, I'll trust that this makes sense for most people's setups 👍
|
|
||
| declare -g BOOTBRANCH="tag:v2025.01" | ||
| declare -g BOOTPATCHDIR="v2025.01" | ||
| declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory |
There was a problem hiding this comment.
Is setting a custom BOOTDIR needed specifically or just copy-paste stuff?
There was a problem hiding this comment.
bit of both; recently I changed the overall u-boot building code to clean the dir completely before building a target; before that, you would risk using one of the previous build that ran on the same BOOTDIR.
ColorfulRhino
approved these changes
Jan 13, 2025
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.
nanopi-r6c: u-boot: bump to 2025.01 final, with working UMS and SD -> NVMe -> eMMC boot order
EXT=uefi-edk2-rk3588