Skip to content

nanopi-m6: drop vendor uboot #8939

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.

Sign up for GitHub

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

Merged
igorpecovnik merged 1 commit into from
Nov 16, 2025
Merged

nanopi-m6: drop vendor uboot #8939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 7 additions & 25 deletions config/boards/nanopi-m6.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,6 @@ BOOT_SPI_RKSPI_LOADER="yes"

DEFAULT_OVERLAYS="nanopi-m6-display-dsi1-yx35" # Enable YX35 LCD

function post_family_config__nanopi_m6_support_spi_boot() {
if [[ $BRANCH == "current" || $BRANCH == "edge" ]]; then
return
fi

UBOOT_TARGET_MAP="nanopi-m6-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb
nanopi-m6-spi-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;rkspi_loader.img"
}

function post_family_tweaks__nanopim6_naming_udev_audios() {
display_alert "$BOARD" "Renaming NanoPi M6 HDMI audio" "info"

Expand All @@ -45,10 +36,6 @@ function post_family_tweaks__nanopim6_naming_udev_network_interfaces() {
}

function pre_config_uboot_target__nanopi_m6_patch_uboot_bootconfig_hack_for_spi() {
if [[ $BRANCH == "vendor" ]]; then
return
fi

display_alert "u-boot for ${BOARD}" "u-boot: hack bootconfig for spi image" "info"

if [[ $target_make == *"nanopi-m6-spi-rk3588s_defconfig"* ]]; then
Expand All @@ -61,10 +48,6 @@ function pre_config_uboot_target__nanopi_m6_patch_uboot_bootconfig_hack_for_spi(
}

function post_config_uboot_target__nanopi_m6_keep_spi_bootconfig() {
if [[ $BRANCH == "vendor" ]]; then
return
fi

display_alert "u-boot for ${BOARD}" "u-boot: hack bootconfig for spi image" "info"

if [[ $BOOTCONFIG == "nanopi-m6-spi-rk3588s_defconfig" ]]; then
Expand All @@ -73,10 +56,6 @@ function post_config_uboot_target__nanopi_m6_keep_spi_bootconfig() {
}

function pre_package_uboot_image__nanopi_m6_copy_spiconfig_to_package() {
if [[ $BRANCH == "vendor" ]]; then
return
fi

if [[ -f "${uboottempdir}/.config.spi" ]]; then
run_host_command_logged cp ${uboottempdir}/.config.spi "$uboottempdir/usr/lib/u-boot/nanopi-m6-spi-rk3588s_defconfig"
run_host_command_logged rm ${uboottempdir}/.config.spi
Expand All @@ -85,10 +64,6 @@ function pre_package_uboot_image__nanopi_m6_copy_spiconfig_to_package() {


function post_family_config__nanopi_m6_use_mainline_uboot() {
if [[ $BRANCH == "vendor" ]]; then
return
fi

display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"

declare -g BOOTCONFIG="nanopi-m6-rk3588s_defconfig"
Expand All @@ -102,3 +77,10 @@ function post_family_config__nanopi_m6_use_mainline_uboot() {
BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} $BOOTCONFIG;;u-boot-rockchip.bin"
unset uboot_custom_postprocess # disable stuff from rockchip64_common; we're using binman here which does all the work already
}

function pre_config_uboot_target__nanopi_m6_patch_rockchip_common_boot_order() {
declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "pxe" "dhcp" "spi") # for future make-this-generic delight
display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
regular_git diff -u include/configs/rockchip-common.h || true
}
225 changes: 0 additions & 225 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopi-m6-rk3588s_defconfig
View file
Open in desktop

This file was deleted.

Loading