From bd242072c17839285109eb0f98d185d08811ec7c Mon Sep 17 00:00:00 2001 From: Ivan Podogov Date: Thu, 26 Oct 2023 16:07:15 +0100 Subject: [PATCH] Update Rock CM5 I/O board config (#5866) --- config/boards/rock-5-cmio.csc | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/config/boards/rock-5-cmio.csc b/config/boards/rock-5-cmio.csc index d64770a0f3..6b4a6fe2af 100644 --- a/config/boards/rock-5-cmio.csc +++ b/config/boards/rock-5-cmio.csc @@ -2,18 +2,25 @@ BOARD_NAME="Radxa CM5" BOARDFAMILY="rockchip-rk3588" BOARD_MAINTAINER="" -BOOTCONFIG="orangepi_5_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate +BOOTCONFIG="radxa-cm5-io-rk3588s_defconfig" BOOT_SOC="rk3588" KERNEL_TARGET="legacy" FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3588s-radxa-cm5-io.dtb" BOOT_SCENARIO="spl-blobs" +BOOT_SUPPORT_SPI="yes" +BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" +SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes -# HACK HACK HACK, using the opi5 uboot for now -function post_family_config__cm5_use_orangepi5_uboot() { - BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git' - BOOTBRANCH='branch:v2017.09-rk3588' - BOOTPATCHDIR="legacy" +function post_family_tweaks__rock5cmio_naming_audios() { + display_alert "$BOARD" "Renaming Rock CM5 audios" "info" + + mkdir -p $SDCARD/etc/udev/rules.d/ + echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules + echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules + echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8316-sound", ENV{SOUND_DESCRIPTION}="ES8316 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules + + return 0 }