From bb516a9954067388a5a3e8f7e491e7560dc0f1ed Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 8 Jan 2025 13:09:47 +0100 Subject: [PATCH] nanopi-r6s: u-boot: bump to 2025.01 final, with working UMS and SD -> 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 - this was previously a separate patch in 2024.10 --- config/boards/nanopi-r6s.conf | 77 +++++++++++++++++-- ...0001-adjust-wrong-mmc0-mmc1-ordering.patch | 28 ------- 2 files changed, 70 insertions(+), 35 deletions(-) delete mode 100644 patch/u-boot/v2024.10/board_nanopi-r6s/0001-adjust-wrong-mmc0-mmc1-ordering.patch diff --git a/config/boards/nanopi-r6s.conf b/config/boards/nanopi-r6s.conf index bd61ccf65371..c8fde5a4e305 100644 --- a/config/boards/nanopi-r6s.conf +++ b/config/boards/nanopi-r6s.conf @@ -40,17 +40,80 @@ function post_family_config__nanopi_r6s_use_mainline_uboot() { declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot - declare -g BOOTBRANCH="tag:v2024.10" - declare -g BOOTPATCHDIR="v2024.10" - # Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency - + declare -g BOOTBRANCH="tag:v2025.01" + declare -g BOOTPATCHDIR="v2025.01" + declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin" - - # Disable stuff from rockchip64_common; we're using binman here which does all the work already - unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd + unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already # Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go function write_uboot_platform() { dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none } } + +function pre_config_uboot_target__r6s_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-r6s-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 +} + +# The upstream DTs (kernel 6.13 / u-boot 2025.01) are in flux and different +# let's just patch to normalize the SD and eMMC order as in mainline Linux DT: https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi#L14-L15 +function pre_config_uboot_target__r6s_patch_uboot_dtsi_for_sd_emmc_order() { + display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for SD=mmc0 and eMMC=mmc1" "info" + cat <<- EOD >> arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi + / { aliases { mmc0 = &sdmmc; mmc1 = &sdhci; }; }; + EOD +} + +# "rockchip-common: boot SD card first, then NVMe, then mmc" +# include/configs/rockchip-common.h +# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi" +# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi" +# On R6S, mmc1 is the eMMC, mmc0 is the SD card slot +function pre_config_uboot_target__r6s_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 +} + +function post_config_uboot_target__extra_configs_for_r6s_mainline() { + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs" "info" + run_host_command_logged scripts/config --enable CONFIG_DM_PMIC_FAN53555 + run_host_command_logged scripts/config --enable CONFIG_CMD_MISC + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "info" + run_host_command_logged scripts/config --enable CMD_EFIDEBUG + run_host_command_logged scripts/config --enable CMD_NVEDIT_EFI + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable more compression support" "info" + run_host_command_logged scripts/config --enable CONFIG_LZO + run_host_command_logged scripts/config --enable CONFIG_BZIP2 + run_host_command_logged scripts/config --enable CONFIG_ZSTD + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable gpio LED support" "info" + run_host_command_logged scripts/config --enable CONFIG_LED + run_host_command_logged scripts/config --enable CONFIG_LED_GPIO + + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable networking cmds" "info" + run_host_command_logged scripts/config --enable CONFIG_CMD_NFS + run_host_command_logged scripts/config --enable CONFIG_CMD_WGET + run_host_command_logged scripts/config --enable CONFIG_CMD_DNS + run_host_command_logged scripts/config --enable CONFIG_PROT_TCP + run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK + + # UMS, RockUSB, gadget stuff + display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "info" + declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE") + for config in "${enable_configs[@]}"; do + run_host_command_logged scripts/config --enable "${config}" + done + # Auto-enabled by the above, force off... + run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT +} diff --git a/patch/u-boot/v2024.10/board_nanopi-r6s/0001-adjust-wrong-mmc0-mmc1-ordering.patch b/patch/u-boot/v2024.10/board_nanopi-r6s/0001-adjust-wrong-mmc0-mmc1-ordering.patch deleted file mode 100644 index 6b9e674c3c16..000000000000 --- a/patch/u-boot/v2024.10/board_nanopi-r6s/0001-adjust-wrong-mmc0-mmc1-ordering.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muhammed Efe Cetin -Date: Sat, 30 Nov 2024 02:09:36 +0300 -Subject: adjust wrong mmc0/mmc1 ordering - ---- - arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi b/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi -+++ b/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi -@@ -1,3 +1,10 @@ - // SPDX-License-Identifier: (GPL-2.0+ OR MIT) - - #include "rk3588s-u-boot.dtsi" -+ -+/ { -+ aliases { -+ mmc0 = &sdhci; -+ mmc1 = &sdmmc; -+ }; -+}; -\ No newline at end of file --- -Armbian -