orangepi5: overhaul uboot config #8124
Conversation
efectn
requested review from
SuperKali,
TheSnowfield,
Tonymac32,
amazingfate and
catalinii
as code owners
WalkthroughThis change introduces Bluetooth HCI attach support for the Orange Pi 5 by enabling relevant parameters and extensions. It updates U-Boot handling to use the 2025.04 mainline branch, adds SATA SPI image support, and rewrites the SPI image flashing logic to allow interactive selection or automatic flashing in non-interactive environments. Several new functions manage SATA-specific boot configuration and package handling. Functions that previously skipped execution on the "edge" branch now also skip on the "current" branch. Legacy edge branch overrides are removed, and internal improvements are made to the SPI image flashing logic for clarity and robustness. Possibly related PRs
Suggested labels
Suggested reviewers
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
github-actions
bot
added
05
efectn
changed the title
github-actions
bot
added
Needs review
efectn
force-pushed
the
opi5-mainline-uboot-update
branch
from
4f090e8 to
ad35423
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (2)
config/boards/orangepi5.conf (2)
46-52: Prefer robust array capture over string parsing
FILES=$(find …)followed bywhile read … <<< "$FILES"works, but:
- filenames containing spaces or newlines can still break the loop;
- reading through a here-string iterates only once if
$FILEScontains NULs (unlikely, but still).A safer, purely array-based approach:
-FILES=$(find "$1" -maxdepth 1 -type f -name "u-boot-rockchip-spi*.bin") +readarray -t FILES < <(find "$1" -maxdepth 1 -type f -name 'u-boot-rockchip-spi*.bin' -print0 | tr '\0' '\n')and then iterate over
"${FILES[@]}".
47-50: Usereturninstead ofexitinside sourced functions
write_uboot_platform_mtdis sourced by the Armbian build framework.
Callingexit 1propagates all the way up and aborts the entire build, even in cases where the caller might want to handle the error.
Replacing withreturn 1keeps the failure local while still signalling an error.- echo "No SPI image found." - exit 1 + echo "No SPI image found." + return 1 … - echo "No SPI image chosen." - exit 1 + echo "No SPI image chosen." + return 1Also applies to: 81-83
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
⛔ Files ignored due to path filters (1)
patch/u-boot/v2025.04/board_orangepi5/0001-add-sata-dts-and-defconfig-for-OPi5.patchis excluded by!patch/**
📒 Files selected for processing (1)
config/boards/orangepi5.conf(6 hunks)
🔇 Additional comments (5)
config/boards/orangepi5.conf (5)
19-21: Bluetooth extension correctly enabledThe
bluetooth-hciattachextension is enabled with appropriateBLUETOOTH_HCIATTACH_PARAMS; no issues spotted.
33-38: Verify multilineUBOOT_TARGET_MAPformatting
UBOOT_TARGET_MAPis declared as a single-quoted string spanning two physical lines.
Some downstream helpers treat newlines as delimiters; others treat the value verbatim.
Please double-check that the newline embedded here is really expected by the parser; if not, replace the literal line-break with a single space (or explicit\n) to avoid subtle split/IFS problems.
63-66: Single-image fast-path looks goodFast-flashing when only one SPI image is present avoids an unnecessary dialog and is implemented correctly.
94-100: Confirm BOOTCONFIG override order
pre_config_uboot_target__orangepi5_patch_uboot_bootconfig_hack_for_sata()rewritesBOOTCONFIG, butpost_family_config__orangepi5_use_mainline_uboot()(executed earlier) sets the same variable unconditionally.
Becausepre_config_*hooks run later, this is probably fine; nevertheless, please verify that:
- the final value of
BOOTCONFIGmatches the selectedtarget_make;- subsequent scripts (e.g.
post_uboot_*) don’t rely on the old value.A quick echo in the build logs would suffice for validation.
104-105: Branch gating widened – double-check vendor-only expectationsThese functions now skip for both
edgeandcurrent, leaving onlyvendorbuilds to receive USB2/audio/SATA tweaks.
Ensure this is intentional; otherwise,currentimages may lose USB2 initialisation, udev audio naming, and SATA SPI generation unexpectedly.Also applies to: 117-118, 130-131, 145-146, 156-157
efectn
force-pushed
the
opi5-mainline-uboot-update
branch
from
ad35423 to
f765512
Compare
github-actions
bot
removed
the
Ready to merge
There was a problem hiding this comment.
Actionable comments posted: 0
♻️ Duplicate comments (1)
config/boards/orangepi5.conf (1)
45-84:⚠️ Potential issueFix array-index arithmetic – current form causes a syntax error
bashdoes not accept parentheses inside the sub-script arithmetic context.
${MENU_ITEMS[($CHOICE*3)-2]}raises:bash: MENU_ITEMS[(1*3)-2]: syntax error: operand expectedThis is a runtime blocker because the function exits before flashing.
Apply this fix:
- flashcp -v -p "$1/${MENU_ITEMS[($CHOICE*3)-2]}" /dev/mtd0 + idx=$((CHOICE*3-2)) + flashcp -v -p "$1/${MENU_ITEMS[$idx]}" /dev/mtd0The rest of the SPI image selection logic is well implemented, providing a user-friendly way to choose between multiple images or automatically selecting the only available image.
🧹 Nitpick comments (1)
config/boards/orangepi5.conf (1)
87-101: New SATA boot configuration function works but has inconsistent indentationThe new function correctly patches the U-Boot configuration for SATA support based on the target configuration. However, there's inconsistent indentation in the implementation.
Apply this fix to maintain consistent indentation:
if [[ $target_make == *"orangepi-5-sata-rk3588s_defconfig"* ]]; then - BOOTCONFIG="orangepi-5-sata-rk3588s_defconfig" + BOOTCONFIG="orangepi-5-sata-rk3588s_defconfig" target_make=${target_make/orangepi-5-sata-rk3588s_defconfig/} else - BOOTCONFIG="orangepi-5-rk3588s_defconfig" + BOOTCONFIG="orangepi-5-rk3588s_defconfig" target_make=${target_make/orangepi-5-rk3588s_defconfig/} fi
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
⛔ Files ignored due to path filters (1)
patch/u-boot/v2025.04/board_orangepi5/0001-add-sata-dts-and-defconfig-for-OPi5.patchis excluded by!patch/**
📒 Files selected for processing (1)
config/boards/orangepi5.conf(6 hunks)
🔇 Additional comments (4)
config/boards/orangepi5.conf (4)
19-20: LGTM: Bluetooth configuration is properly addedThe Bluetooth HCI attach parameters are properly configured for the BCM43xx chipset with the appropriate UART port and baud rate. Enabling the bluetooth-hciattach extension is correctly done.
23-38: Improved U-Boot configuration for better branch handlingThe function rename from branch-specific to generic naming allows unified handling for both current and edge branches. The U-Boot version update to 2025.04 is a good improvement. The UBOOT_TARGET_MAP now properly includes SATA SPI images.
104-105: Branch handling now unified for edge and current branchesFunctions now correctly skip execution for both "edge" and "current" branches instead of just "edge", reducing redundancy and aligning with the PR objective to use the same U-Boot for both builds.
Also applies to: 117-118, 130-131, 145-146, 156-157
62-66: LGTM: Efficient handling of single SPI image caseThe code correctly detects when only one SPI image is available and intelligently bypasses the dialog, directly flashing the image. This is a good user experience improvement.
|
@efectn why are armbian creating a special |
Actually we use both for rk3588 boards despite the fact binman is not used by main rockchip64 files. For legacy uboot, i am not sure whether binman is supported. However, we use binman for mainline by overriding uboot procedure like https://github.com/armbian/build/blob/main/config/boards/orangepi5.conf#L33 In fact, i am not sure why another boards having mainline uboot still use |
Please tell me how do you connect a SATA drive to this orangepi5 device? |
I use mSata. |
Please don't think I'm being rude. |
"Hook-based custom u-boot setup for binman", from before we had I will ! one day find it in me to refactor all those boards into an
I can only speculate: rkspi_loader was for wrapping the u-boot and idbloader into a gpt with labels the way vendor u-boot wanted it to be. I think when mainline was introduced (pre-binman) they kept the name to reuse the gpt-making/idb-writing function. When binman came around (via hooks) I used binman's nomenclature, but again only in specific boards, not rockchip64_common. |
The Opi5 board provides M key m2 connector which is connected to combphy of RK3588. By activating pcie connected to combphy, you enable pcie pins to use pcie2. On the other hand, you can do the same for sata devices without using external pcie msata adapter as m2 connecter can also be used for m2 sata devices. |
|
Ready? |
Will add some conditions to check whether the terminal is interactive, then it should be ready to merge. |
efectn
force-pushed
the
opi5-mainline-uboot-update
branch
from
f765512 to
45e7554
Compare
efectn
requested review from
NicoD-SBC,
rpardini,
a team and
igorpecovnik
as code owners
efectn
force-pushed
the
opi5-mainline-uboot-update
branch
from
45e7554 to
8f0af6f
Compare
github-actions
bot
removed
the
Ready to merge
There was a problem hiding this comment.
Caution
Inline review comments failed to post. This is likely due to GitHub's limits when posting large numbers of comments. If you are seeing this consistently it is likely a permissions issue. Please check "Moderation" -> "Code review limits" under your organization settings.
Actionable comments posted: 4
♻️ Duplicate comments (1)
config/boards/orangepi5.conf (1)
79-80: Array indexing fix implemented correctly.The array indexing issue from the past review has been properly addressed by calculating the index in a separate variable before using it. This matches the fix applied in the common include file.
🛑 Comments failed to post (4)
config/boards/orangepi5.conf (3)
36-37: 💡 Verification agent
🧩 Analysis chain
Verify SATA defconfig availability.
The UBOOT_TARGET_MAP references
$BOOTCONFIG_SATA(orangepi-5-sata-rk3588s_defconfig). Based on past review comments, this defconfig may not exist in the expected location.
🏁 Script executed:
#!/bin/bash # Description: Check for SATA defconfig availability in U-Boot source echo "Searching for orangepi-5-sata-rk3588s_defconfig in U-Boot configs..." fd "orangepi-5-sata-rk3588s_defconfig" || echo "SATA defconfig not found" echo "Checking for similar Orange Pi 5 configs..." fd "orangepi.*5.*defconfig" | head -10Length of output: 323
Missing SATA defconfig:
orangepi-5-sata-rk3588s_defconfigThe UBOOT_TARGET_MAP in
config/boards/orangepi5.conflines 36–37 references$BOOTCONFIG_SATA(orangepi-5-sata-rk3588s_defconfig), but no matching defconfig was found in the U-Bootconfigs/directory. Please either:
- Add
orangepi-5-sata-rk3588s_defconfigto the U-Bootconfigs/tree, or- Update/replace
$BOOTCONFIG_SATAto point at an existing defconfig (e.g.orangepi-5-rk3588s_defconfig), or- Remove the SATA entry if it isn’t supported for this board.
• Location: config/boards/orangepi5.conf (lines 36–37)
• Issue: Missing defconfig file for SATA build target🤖 Prompt for AI Agents
In config/boards/orangepi5.conf at lines 36-37, the UBOOT_TARGET_MAP references $BOOTCONFIG_SATA which points to orangepi-5-sata-rk3588s_defconfig, but this defconfig file does not exist in the U-Boot configs directory. To fix this, either add the missing orangepi-5-sata-rk3588s_defconfig file to the U-Boot configs tree, or update $BOOTCONFIG_SATA to reference an existing defconfig like orangepi-5-rk3588s_defconfig, or remove the SATA entry from UBOOT_TARGET_MAP if SATA support is not intended for this board.
122-123: 🛠️ Refactor suggestion
Potential issue with SATA config file handling.
The function assumes
${uboottempdir}/.config.sataexists, but if the SATA config wasn't saved in the previous hook, this will fail. Also, the removal of the temporary file should be conditional.- run_host_command_logged cp ${uboottempdir}/.config.sata "$uboottempdir/usr/lib/u-boot/orangepi-5-sata-rk3588s_defconfig" - run_host_command_logged rm ${uboottempdir}/.config.sata + if [[ -f ${uboottempdir}/.config.sata ]]; then + run_host_command_logged cp ${uboottempdir}/.config.sata "$uboottempdir/usr/lib/u-boot/orangepi-5-sata-rk3588s_defconfig" + run_host_command_logged rm ${uboottempdir}/.config.sata + else + display_alert "Warning: SATA config not found, skipping copy" "" "warn" + fi📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.if [[ -f ${uboottempdir}/.config.sata ]]; then run_host_command_logged cp ${uboottempdir}/.config.sata "$uboottempdir/usr/lib/u-boot/orangepi-5-sata-rk3588s_defconfig" run_host_command_logged rm ${uboottempdir}/.config.sata else display_alert "Warning: SATA config not found, skipping copy" "" "warn" fi🤖 Prompt for AI Agents
In config/boards/orangepi5.conf around lines 122 to 123, the code assumes the file ${uboottempdir}/.config.sata exists before copying and removing it, which can cause errors if the file is missing. Modify the script to first check if the file exists before attempting to copy and remove it, ensuring the removal command only runs conditionally when the file is present.
88-102: 🛠️ Refactor suggestion
Review SATA bootconfig manipulation logic.
The function manipulates
target_makeby removing defconfig strings and setsBOOTCONFIGbased on the presence of SATA defconfig intarget_make. However, this approach seems fragile and could lead to incorrect behavior if the string replacement fails.Consider a more robust approach:
- if [[ $target_make == *"orangepi-5-sata-rk3588s_defconfig"* ]]; then - BOOTCONFIG="orangepi-5-sata-rk3588s_defconfig" - target_make=${target_make/orangepi-5-sata-rk3588s_defconfig/} - else - BOOTCONFIG="orangepi-5-rk3588s_defconfig" - target_make=${target_make/orangepi-5-rk3588s_defconfig/} - fi + if [[ $target_make == *"orangepi-5-sata-rk3588s_defconfig"* ]]; then + BOOTCONFIG="orangepi-5-sata-rk3588s_defconfig" + target_make="${target_make//orangepi-5-sata-rk3588s_defconfig/}" + elif [[ $target_make == *"orangepi-5-rk3588s_defconfig"* ]]; then + BOOTCONFIG="orangepi-5-rk3588s_defconfig" + target_make="${target_make//orangepi-5-rk3588s_defconfig/}" + else + display_alert "Warning: Unknown defconfig in target_make" "$target_make" "warn" + fi📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.function pre_config_uboot_target__orangepi5_patch_uboot_bootconfig_hack_for_sata() { if [[ $BRANCH == "vendor" ]]; then return fi display_alert "u-boot for ${BOARD}" "u-boot: hack bootconfig for sata spi image" "info" if [[ $target_make == *"orangepi-5-sata-rk3588s_defconfig"* ]]; then BOOTCONFIG="orangepi-5-sata-rk3588s_defconfig" target_make="${target_make//orangepi-5-sata-rk3588s_defconfig/}" elif [[ $target_make == *"orangepi-5-rk3588s_defconfig"* ]]; then BOOTCONFIG="orangepi-5-rk3588s_defconfig" target_make="${target_make//orangepi-5-rk3588s_defconfig/}" else display_alert "Warning: Unknown defconfig in target_make" "$target_make" "warn" fi }🤖 Prompt for AI Agents
In config/boards/orangepi5.conf around lines 88 to 102, the current function modifies target_make by removing defconfig substrings and sets BOOTCONFIG based on a string match, which is fragile and error-prone. Refactor the logic to first check explicitly if target_make contains the SATA defconfig substring, set BOOTCONFIG accordingly, and then remove the matched defconfig substring from target_make in a safer, more explicit manner to avoid accidental replacements or failures.lib/functions/compilation/uboot.sh (1)
529-530:
⚠️ Potential issueRemove temporary debugging statements.
These debug lines appear to be temporary debugging aids that should not be committed to the codebase. They add no value and clutter the output.
- echo "bruhmoment" - ls -la .📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.🤖 Prompt for AI Agents
In lib/functions/compilation/uboot.sh at lines 529 to 530, remove the temporary debugging statements "echo 'bruhmoment'" and "ls -la ." as they are unnecessary and clutter the output.
There was a problem hiding this comment.
Actionable comments posted: 2
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
config/boards/orangepi5.conf(6 hunks)
🔇 Additional comments (6)
config/boards/orangepi5.conf (6)
19-20: LGTM! Bluetooth support addition looks good.The Bluetooth HCI attach parameters and extension enablement are properly configured for the Orange Pi 5's BCM43xx Bluetooth module.
23-27: Good refactoring of branch handling.The function rename from
post_family_config_branch_current__orangepi5_use_mainline_uboottopost_family_config__orangepi5_use_mainline_ubootand the change to skip on "vendor" branch instead of running only on "current" makes the logic clearer and more maintainable.
36-37: LGTM! SATA SPI image support properly added.The U-Boot target map correctly includes both standard and SATA variants, with appropriate binaries for each configuration.
45-85: Excellent improvement to SPI image flashing logic.The rewritten function properly handles multiple SPI images with interactive selection and good non-interactive fallback behavior. The array indexing issue from the previous review has been correctly addressed.
The improvements include:
- Dynamic discovery of SPI images
- Interactive menu when multiple options exist
- Automatic selection for single images or non-interactive terminals
- Proper error handling for missing images
- Fixed array indexing syntax
127-127: Good consolidation of branch conditions.The change from skipping only on "edge" to skipping on both "edge" and "current" branches properly consolidates the behavior and aligns with the mainline U-Boot approach used for both branches.
Also applies to: 140-140, 153-153, 168-168, 179-179
33-34:❓ Verification inconclusive
Verify U-Boot 2025.04 compatibility and availability.
The update from v2025.01 to v2025.04 should be verified to ensure this version exists and is stable for the Orange Pi 5.
🏁 Script executed:
#!/bin/bash # Description: Verify U-Boot 2025.04 tag exists and check for any known issues echo "Checking if U-Boot v2025.04 tag exists..." git ls-remote --tags https://github.com/u-boot/u-boot.git | grep "v2025.04" echo "Checking recent U-Boot releases..." git ls-remote --tags https://github.com/u-boot/u-boot.git | grep "v2025" | tail -10Length of output: 1764
Confirm Up-Boot v2025.04 Tag and Orange Pi 5 Support
- Verified that the
v2025.04tag exists upstream (git ls-remote --tags … | grep v2025.04).- Please ensure your patch directory for
v2025.04is present (e.g.config/patches/v2025.04/).- Test building U-Boot v2025.04 for Orange Pi 5 to confirm support and catch any regressions before merging.
| function pre_config_uboot_target__orangepi5_patch_uboot_bootconfig_hack_for_sata() { | ||
| if [[ $BRANCH == "vendor" ]]; then | ||
| return | ||
| fi | ||
|
|
||
| display_alert "u-boot for ${BOARD}" "u-boot: hack bootconfig for sata spi image" "info" | ||
|
|
||
| declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS9 bcm43xx 1500000" # For the bluetooth-hciattach extension | ||
| enable_extension "bluetooth-hciattach" # Enable the bluetooth-hciattach extension | ||
| if [[ $target_make == *"orangepi-5-sata-rk3588s_defconfig"* ]]; then | ||
| BOOTCONFIG="orangepi-5-sata-rk3588s_defconfig" | ||
| target_make=${target_make/orangepi-5-sata-rk3588s_defconfig/} | ||
| else | ||
| BOOTCONFIG="orangepi-5-rk3588s_defconfig" | ||
| target_make=${target_make/orangepi-5-rk3588s_defconfig/} | ||
| fi | ||
| } |
There was a problem hiding this comment.
💡 Verification agent
🧩 Analysis chain
Verify SATA defconfig file existence and path handling.
The SATA configuration handling logic looks reasonable, but based on the past review comment, there may be an issue with the orangepi-5-sata-rk3588s_defconfig file not existing in the expected location.
🏁 Script executed:
#!/bin/bash
# Description: Check for SATA defconfig files in U-Boot source and package locations
echo "Searching for SATA defconfig files..."
fd -t f "orangepi-5-sata.*defconfig" .
echo "Checking if SATA defconfig exists in common U-Boot defconfig locations..."
fd -t f "*sata*defconfig" . | head -20
echo "Looking for Orange Pi 5 related defconfigs..."
fd -t f "*orangepi*5*defconfig" .Length of output: 1056
🏁 Script executed:
#!/bin/bash
# Re-run fd with glob patterns to locate defconfig files
echo "Searching for the specific SATA defconfig for Orange Pi 5..."
fd -t f --glob "orangepi-5-sata*defconfig" .
echo "Searching for any defconfig files containing 'sata'..."
fd -t f --glob "*sata*defconfig" .
echo "Searching for all Orange Pi 5 defconfig files..."
fd -t f --glob "*orangepi*5*defconfig" .Length of output: 489
Missing SATA defconfig: add or correct path
Our search didn’t find any orangepi-5-sata-rk3588s_defconfig (or any *sata*defconfig / *orangepi*5*defconfig) in the repo, so the patch logic will fail at runtime:
- File:
config/boards/orangepi5.conf(lines 88-102)
Referencesorangepi-5-sata-rk3588s_defconfigbut no such file exists.
Please ensure the SATA defconfig is present (e.g. add orangepi-5-sata-rk3588s_defconfig to your U-Boot defconfigs directory) or update the script to use the correct defconfig name/path.
🤖 Prompt for AI Agents
In config/boards/orangepi5.conf around lines 88 to 102, the script references
the defconfig file "orangepi-5-sata-rk3588s_defconfig" which does not exist in
the repository, causing runtime failures. To fix this, either add the missing
"orangepi-5-sata-rk3588s_defconfig" file to the U-Boot defconfigs directory or
update the script to reference the correct existing SATA defconfig file name or
path that matches the repository contents.
| function pre_package_uboot_image__orangepi5_copy_sataconfig_to_pacage() { | ||
| if [[ $BRANCH == "vendor" ]]; then | ||
| return | ||
| fi | ||
|
|
||
| run_host_command_logged cp ${uboottempdir}/.config.sata "$uboottempdir/usr/lib/u-boot/orangepi-5-sata-rk3588s_defconfig" | ||
| run_host_command_logged rm ${uboottempdir}/.config.sata | ||
| } |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Potential issue with SATA config file handling.
The function assumes .config.sata exists when copying it to the package, but there's no check to ensure the file was actually created. This could cause the build to fail if the SATA configuration step didn't execute properly.
Add a check before copying the SATA config:
function pre_package_uboot_image__orangepi5_copy_sataconfig_to_pacage() {
if [[ $BRANCH == "vendor" ]]; then
return
fi
+ # Only copy SATA config if it exists
+ if [[ ! -f "${uboottempdir}/.config.sata" ]]; then
+ display_alert "u-boot for ${BOARD}" "No SATA config found, skipping copy" "info"
+ return
+ fi
+
run_host_command_logged cp ${uboottempdir}/.config.sata "$uboottempdir/usr/lib/u-boot/orangepi-5-sata-rk3588s_defconfig"
run_host_command_logged rm ${uboottempdir}/.config.sata
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| function pre_package_uboot_image__orangepi5_copy_sataconfig_to_pacage() { | |
| if [[ $BRANCH == "vendor" ]]; then | |
| return | |
| fi | |
| run_host_command_logged cp ${uboottempdir}/.config.sata "$uboottempdir/usr/lib/u-boot/orangepi-5-sata-rk3588s_defconfig" | |
| run_host_command_logged rm ${uboottempdir}/.config.sata | |
| } | |
| function pre_package_uboot_image__orangepi5_copy_sataconfig_to_pacage() { | |
| if [[ $BRANCH == "vendor" ]]; then | |
| return | |
| fi | |
| # Only copy SATA config if it exists | |
| if [[ ! -f "${uboottempdir}/.config.sata" ]]; then | |
| display_alert "u-boot for ${BOARD}" "No SATA config found, skipping copy" "info" | |
| return | |
| fi | |
| run_host_command_logged cp ${uboottempdir}/.config.sata "$uboottempdir/usr/lib/u-boot/orangepi-5-sata-rk3588s_defconfig" | |
| run_host_command_logged rm ${uboottempdir}/.config.sata | |
| } |
🤖 Prompt for AI Agents
In config/boards/orangepi5.conf around lines 117 to 124, the function
pre_package_uboot_image__orangepi5_copy_sataconfig_to_pacage assumes the file
.config.sata exists without verifying its presence, which may cause build
failures. Add a conditional check to verify that ${uboottempdir}/.config.sata
exists before attempting to copy it. If the file does not exist, skip the copy
and removal steps to prevent errors during the build process.
|
Status? |
Description
GitHub issue reference:
Jira reference number [AR-9999]
Documentation summary for feature / change
Please delete this section if entry to main documentation is not needed.
If documentation entry is predicted, please provide key elements for further implementation into main documentation and set label to "Needs Documentation". You are welcome to open a PR to documentation or you can leave following information for technical writer:
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
Checklist:
Please delete options that are not relevant.