Skip to content

Commit 45e7554

Browse files
committed
orangepi5: also copy the sata bootconfig to compiled package
1 parent ee9e512 commit 45e7554

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

config/boards/orangepi5.conf

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,28 @@ function pre_config_uboot_target__orangepi5_patch_uboot_bootconfig_hack_for_sata
101101
fi
102102
}
103103

104+
105+
function post_config_uboot_target__orangepi5_keep_sata_bootconfig() {
106+
if [[ $BRANCH == "vendor" ]]; then
107+
return
108+
fi
109+
110+
display_alert "u-boot for ${BOARD}" "u-boot: hack bootconfig for sata spi image" "info"
111+
112+
if [[ $BOOTCONFIG == "orangepi-5-sata-rk3588s_defconfig" ]]; then
113+
cp .config ${uboottempdir}/.config.sata
114+
fi
115+
}
116+
117+
function pre_package_uboot_image__orangepi5_copy_sataconfig_to_pacage() {
118+
if [[ $BRANCH == "vendor" ]]; then
119+
return
120+
fi
121+
122+
run_host_command_logged cp ${uboottempdir}/.config.sata "$uboottempdir/usr/lib/u-boot/orangepi-5-sata-rk3588s_defconfig"
123+
run_host_command_logged rm ${uboottempdir}/.config.sata
124+
}
125+
104126
function post_family_tweaks_bsp__orangepi5_copy_usb2_service() {
105127
if [[ $BRANCH == "edge" || $BRANCH == "current" ]]; then
106128
return

lib/functions/cli/utils-cli.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,9 @@ function parse_cmdline_params() {
2626
param_value=${arg##*=}
2727
param_value_desc="${param_value:-(empty)}"
2828
# Sanity check for the param name; it must be a valid bash variable name.
29-
if [[ "${param_name}" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
3029
ARMBIAN_PARSED_CMDLINE_PARAMS["${param_name}"]="${param_value}" # For current run.
3130
ARMBIAN_CLI_RELAUNCH_PARAMS["${param_name}"]="${param_value}" # For relaunch.
3231
display_alert "Command line: parsed parameter '$param_name' to" "${param_value_desc}" "debug"
33-
else
34-
exit_with_error "Invalid cmdline param '${param_name}=${param_value_desc}'"
35-
fi
3632
elif [[ "x${arg}x" != "xx" ]]; then # not a param, not empty, store it in the non-param array for later usage
3733
local non_param_value="${arg}"
3834
local non_param_value_desc="${non_param_value:-(empty)}"

lib/functions/compilation/uboot.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,9 @@ function compile_uboot() {
525525
EOF
526526

527527
# copy license files, config, etc.
528+
529+
echo "bruhmoment"
530+
ls -la .
528531
[[ -f .config && -n $BOOTCONFIG ]] && run_host_command_logged cp .config "$uboottempdir/usr/lib/u-boot/${BOOTCONFIG}" # legacy and @TODO should be removed as it has only the last target; we now have per-target configs and defconfigs
529532
[[ -f COPYING ]] && run_host_command_logged cp COPYING "$uboottempdir/usr/lib/u-boot/LICENSE"
530533
[[ -f Licenses/README ]] && run_host_command_logged cp Licenses/README "$uboottempdir/usr/lib/u-boot/LICENSE"

0 commit comments

Comments
 (0)