Skip to content
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.

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

add rk3576 support to rk35xx and armsom sige5 #6554

Merged
merged 3 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions config/boards/armsom-sige5.csc
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Rockchip RK3576 SoC octa core 8-64GB SoC 2*GBe eMMC USB3 NvME WIFI
BOARD_NAME="ArmSoM Sige5"
BOARDFAMILY="rk35xx"
BOOTCONFIG="armsom-sige5-rk3576_defconfig"
KERNEL_TARGET="rk3576"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3576-armsom-sige5.dtb"
BOOT_SCENARIO="spl-blobs"
IMAGE_PARTITION_TABLE="gpt"
SRC_EXTLINUX="yes"
MODULES_BLACKLIST="panfrost"

function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"

declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
declare -g BOOTBRANCH="tag:rk3576"
declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
declare -g BOOTDIR="u-boot-${BOARD}"
declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
}

function post_family_tweaks__armsom-sige7_naming_audios() {
display_alert "$BOARD" "Renaming armsom-sige7 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
}
55 changes: 34 additions & 21 deletions config/kernel/linux-rk35xx-vendor.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.1.43 Kernel Configuration
# Linux/arm64 6.1.75 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -369,6 +369,7 @@ CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_ERRATUM_2966298=y
# CONFIG_CAVIUM_ERRATUM_22375 is not set
# CONFIG_CAVIUM_ERRATUM_23154 is not set
CONFIG_CAVIUM_ERRATUM_27456=y
Expand Down Expand Up @@ -1578,8 +1579,6 @@ CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_U32=m
# CONFIG_CLS_U32_PERF is not set
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_CGROUP=m
CONFIG_NET_CLS_BPF=m
Expand Down Expand Up @@ -2628,7 +2627,6 @@ CONFIG_DWMAC_GENERIC=y
CONFIG_DWMAC_ROCKCHIP=y
CONFIG_DWMAC_ROCKCHIP_TOOL=y
# CONFIG_DWMAC_INTEL_PLAT is not set
# CONFIG_DWMAC_LOONGSON is not set
# CONFIG_STMMAC_PCI is not set
# CONFIG_NET_VENDOR_SUN is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
Expand Down Expand Up @@ -2732,6 +2730,7 @@ CONFIG_CAN_M_CAN=m
# CONFIG_CAN_PEAK_PCIEFD is not set
# CONFIG_CAN_ROCKCHIP is not set
# CONFIG_CANFD_ROCKCHIP is not set
# CONFIG_CANFD_RK3576 is not set
CONFIG_CAN_SJA1000=m
CONFIG_CAN_EMS_PCI=m
# CONFIG_CAN_F81601 is not set
Expand Down Expand Up @@ -3127,7 +3126,7 @@ CONFIG_RTW89_8852BE=m
CONFIG_RTW89_8852CE=m
# CONFIG_RTW89_DEBUGMSG is not set
# CONFIG_RTW89_DEBUGFS is not set
# CONFIG_RTL8852BS is not set
CONFIG_RTL8852BS=m
CONFIG_WL_ROCKCHIP=y
CONFIG_WIFI_BUILD_MODULE=y
# CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP is not set
Expand Down Expand Up @@ -3334,6 +3333,7 @@ CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
CONFIG_TOUCHSCREEN_BU21013=m
CONFIG_TOUCHSCREEN_BU21029=m
CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
# CONFIG_TOUCHSCREEN_CHIPONE_9551R is not set
CONFIG_TOUCHSCREEN_CY8CTMA140=m
CONFIG_TOUCHSCREEN_CY8CTMG110=m
CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
Expand All @@ -3360,6 +3360,7 @@ CONFIG_TOUCHSCREEN_EGALAX=m
CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
CONFIG_TOUCHSCREEN_EXC3000=m
# CONFIG_TOUCHSCREEN_FTS is not set
# CONFIG_TOUCHSCREEN_FT5726 is not set
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GOODIX=m
CONFIG_TOUCHSCREEN_GSL3673=y
Expand Down Expand Up @@ -3390,6 +3391,7 @@ CONFIG_TOUCHSCREEN_IMAGIS=m
CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MK712=m
# CONFIG_TOUCHSCREEN_PARADE is not set
CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
# CONFIG_TOUCHSCREEN_RASPITS_FT5426 is not set
Expand Down Expand Up @@ -3803,6 +3805,7 @@ CONFIG_SPI_BITBANG=y
# CONFIG_SPI_PXA2XX is not set
CONFIG_SPI_ROCKCHIP=y
CONFIG_SPI_ROCKCHIP_MISCDEV=y
# CONFIG_SPI_ROCKCHIP_FLEXBUS_FSPI is not set
CONFIG_SPI_ROCKCHIP_SFC=y
CONFIG_SPI_ROCKCHIP_SLAVE=y
# CONFIG_SPI_SC18IS602 is not set
Expand Down Expand Up @@ -4463,12 +4466,11 @@ CONFIG_MFD_RDC321X=m
# CONFIG_MFD_RT5120 is not set
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RK618 is not set
# CONFIG_MFD_RK628 is not set
# CONFIG_MFD_RK630 is not set
# CONFIG_MFD_RK630_I2C is not set
# CONFIG_MFD_RK630_SPI is not set
CONFIG_MFD_RK806=y
# CONFIG_MFD_RK806_I2C is not set
CONFIG_MFD_RK806_I2C=y
CONFIG_MFD_RK806_SPI=y
CONFIG_MFD_RK808=y
# CONFIG_MFD_RK1000 is not set
Expand All @@ -4478,7 +4480,7 @@ CONFIG_MFD_RK808=y
#
# CONFIG_MFD_SERDES_DISPLAY is not set
# CONFIG_MFD_RKX110_X120 is not set
# CONFIG_ROCKCHIP_SERDES_DRM_PANEL is not set
# CONFIG_MFD_ROCKCHIP_FLEXBUS is not set
# CONFIG_MFD_RN5T618 is not set
# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
Expand Down Expand Up @@ -4949,18 +4951,17 @@ CONFIG_ROCKCHIP_CIF_USE_DUMMY_BUF=y
CONFIG_VIDEO_ROCKCHIP_RKISP1=y
CONFIG_VIDEO_ROCKCHIP_ISP=y
CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V1X=y
# CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V20 is not set
CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V21=y
CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V30=y
# CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V32 is not set
CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V39=y
CONFIG_VIDEO_ROCKCHIP_ISPP=y
# CONFIG_VIDEO_ROCKCHIP_ISPP_FEC is not set
# CONFIG_VIDEO_ROCKCHIP_ISPP_VERSION_V10 is not set
CONFIG_VIDEO_ROCKCHIP_ISPP_VERSION_V20=y
CONFIG_VIDEO_ROCKCHIP_HDMIRX_CLASS=y
CONFIG_VIDEO_ROCKCHIP_HDMIRX=y
CONFIG_VIDEO_ROCKCHIP_RGA=y
# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
# CONFIG_VIDEO_ROCKCHIP_VPSS is not set

#
# Samsung media platform drivers
Expand Down Expand Up @@ -5023,10 +5024,7 @@ CONFIG_VIDEOBUF2_DVB=m
#
CONFIG_MEDIA_ATTACH=y
# CONFIG_VIDEO_CAM_SLEEP_WAKEUP is not set

#
# Camera sensor devices
#
CONFIG_VIDEO_CAMERA_SENSOR=y
CONFIG_VIDEO_APTINA_PLL=m
CONFIG_VIDEO_AR0230=m
# CONFIG_VIDEO_AR0521 is not set
Expand Down Expand Up @@ -5082,6 +5080,7 @@ CONFIG_VIDEO_IMX378=m
CONFIG_VIDEO_IMX415=y
CONFIG_VIDEO_IMX464=y
# CONFIG_VIDEO_IMX492 is not set
# CONFIG_VIDEO_IMX498 is not set
CONFIG_VIDEO_IMX577=m
CONFIG_VIDEO_IMX586=m
# CONFIG_VIDEO_JX_F37 is not set
Expand Down Expand Up @@ -5120,6 +5119,7 @@ CONFIG_VIDEO_OV13850=y
CONFIG_VIDEO_OV13855=y
CONFIG_VIDEO_OV13858=m
# CONFIG_VIDEO_OV13B10 is not set
# CONFIG_VIDEO_OV16880 is not set
# CONFIG_VIDEO_OV16885 is not set
CONFIG_VIDEO_OV16A10=m
CONFIG_VIDEO_OV16A1Q=m
Expand Down Expand Up @@ -5180,6 +5180,7 @@ CONFIG_VIDEO_SC2336=m
# CONFIG_VIDEO_SC2355 is not set
CONFIG_VIDEO_SC301IOT=m
CONFIG_VIDEO_SC3336=m
# CONFIG_VIDEO_SC3336P is not set
CONFIG_VIDEO_SC3338=m
CONFIG_VIDEO_SC401AI=m
CONFIG_VIDEO_SC4210=m
Expand All @@ -5192,21 +5193,23 @@ CONFIG_VIDEO_SC500AI=m
CONFIG_VIDEO_SC501AI=m
CONFIG_VIDEO_SC530AI=m
# CONFIG_VIDEO_SC5336 is not set
# CONFIG_VIDEO_SC830AI is not set
# CONFIG_VIDEO_SC831AI is not set
CONFIG_VIDEO_SC850SL=m
CONFIG_VIDEO_SENSOR_ADAPTER=m
CONFIG_VIDEO_SR030PC30=m
CONFIG_VIDEO_VS6624=m
# CONFIG_VIDEO_CCS is not set
CONFIG_VIDEO_ET8EK8=m
CONFIG_VIDEO_M5MOLS=m
# end of Camera sensor devices

#
# Lens drivers
#
CONFIG_VIDEO_AD5820=m
CONFIG_VIDEO_AK7375=m
CONFIG_VIDEO_AW8601=m
# CONFIG_VIDEO_CES6301 is not set
CONFIG_VIDEO_CN3927V=m
CONFIG_VIDEO_DW9714=m
CONFIG_VIDEO_DW9763=m
Expand Down Expand Up @@ -5269,11 +5272,13 @@ CONFIG_VIDEO_SAA6588=m
# CONFIG_VIDEO_ISL7998X is not set
# CONFIG_VIDEO_IT6616 is not set
# CONFIG_VIDEO_KS0127 is not set
# CONFIG_VIDEO_LT6911C is not set
# CONFIG_VIDEO_LT6911UXC is not set
# CONFIG_VIDEO_LT6911UXE is not set
# CONFIG_VIDEO_LT7911D is not set
# CONFIG_VIDEO_LT7911UXC is not set
# CONFIG_VIDEO_LT8619C is not set
# CONFIG_VIDEO_LT8668SX is not set
# CONFIG_VIDEO_MAX9286 is not set
# CONFIG_VIDEO_MAX96712 is not set
# CONFIG_VIDEO_MAX96714 is not set
Expand All @@ -5300,8 +5305,7 @@ CONFIG_VIDEO_TW9906=m
# CONFIG_VIDEO_VPX3220 is not set
# CONFIG_VIDEO_RK628_CSI is not set
# CONFIG_VIDEO_RK628_BT1120 is not set
# CONFIG_VIDEO_DES_MAXIM2C is not set
# CONFIG_VIDEO_DES_MAXIM4C is not set
# CONFIG_VIDEO_MAXIM_SERDES is not set

#
# Video and audio decoders
Expand Down Expand Up @@ -5642,11 +5646,13 @@ CONFIG_ROCKCHIP_DW_MIPI_DSI=y
CONFIG_ROCKCHIP_DW_DP=y
CONFIG_ROCKCHIP_INNO_HDMI=y
CONFIG_ROCKCHIP_LVDS=y
# CONFIG_ROCKCHIP_PANEL_NOTIFIER is not set
CONFIG_ROCKCHIP_RGB=y
# CONFIG_ROCKCHIP_RK3066_HDMI is not set
# CONFIG_ROCKCHIP_VCONN is not set
# CONFIG_DRM_ROCKCHIP_VVOP is not set
CONFIG_ROCKCHIP_DW_HDCP2=y
# CONFIG_ROCKCHIP_DP_MST_AUX_CLIENT is not set
# CONFIG_DRM_VMWGFX is not set
# CONFIG_DRM_UDL is not set
# CONFIG_DRM_AST is not set
Expand Down Expand Up @@ -6025,6 +6031,7 @@ CONFIG_ROCKCHIP_MPP_VDPU2=y
CONFIG_ROCKCHIP_MPP_VEPU2=y
CONFIG_ROCKCHIP_MPP_IEP2=y
CONFIG_ROCKCHIP_MPP_JPGDEC=y
# CONFIG_ROCKCHIP_MPP_JPGENC is not set
CONFIG_ROCKCHIP_MPP_AV1DEC=y
# CONFIG_ROCKCHIP_MPP_VDPP is not set
# CONFIG_ROCKCHIP_DVBM is not set
Expand Down Expand Up @@ -6150,10 +6157,12 @@ CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y
# CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES is not set
# CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS is not set
CONFIG_SND_SOC_ROCKCHIP_PDM=y
# CONFIG_SND_SOC_ROCKCHIP_PDM_V2 is not set
CONFIG_SND_SOC_ROCKCHIP_SAI=y
# CONFIG_SND_SOC_ROCKCHIP_SAI_VERBOSE is not set
CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
CONFIG_SND_SOC_ROCKCHIP_SPDIFRX=y
CONFIG_SND_SOC_ROCKCHIP_TRCM=y
# CONFIG_SND_SOC_ROCKCHIP_VAD is not set
CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=y
Expand Down Expand Up @@ -6374,7 +6383,9 @@ CONFIG_SND_SOC_TS3A227E=y
# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
CONFIG_SND_SOC_AW87XXX=y
# CONFIG_SND_SOC_AW882XX is not set
# CONFIG_SND_SOC_AW883XX is not set
# CONFIG_SND_SOC_IT6621 is not set
# end of CODEC drivers

CONFIG_SND_SIMPLE_CARD_UTILS=y
Expand Down Expand Up @@ -6936,8 +6947,6 @@ CONFIG_MMC_HSQ=y
# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_MTK is not set
# CONFIG_MMC_SDHCI_XENON is not set
# CONFIG_MMC_SDHCI_OMAP is not set
# CONFIG_MMC_SDHCI_AM654 is not set
# CONFIG_SCSI_UFSHCD is not set
# CONFIG_MEMSTICK is not set
CONFIG_NEW_LEDS=y
Expand Down Expand Up @@ -7385,6 +7394,7 @@ CONFIG_CLK_RK3328=y
CONFIG_CLK_RK3399=y
CONFIG_CLK_RK3528=y
CONFIG_CLK_RK3568=y
CONFIG_CLK_RK3576=y
CONFIG_CLK_RK3588=y
# CONFIG_ROCKCHIP_CLK_COMPENSATION is not set
CONFIG_ROCKCHIP_CLK_LINK=y
Expand All @@ -7395,7 +7405,6 @@ CONFIG_ROCKCHIP_CLK_PVTM=y
CONFIG_ROCKCHIP_DDRCLK=y
CONFIG_ROCKCHIP_DDRCLK_SIP=y
CONFIG_ROCKCHIP_DDRCLK_SIP_V2=y
# CONFIG_ROCKCHIP_PLL_RK3066 is not set
CONFIG_ROCKCHIP_PLL_RK3399=y
CONFIG_ROCKCHIP_PLL_RK3588=y
# CONFIG_XILINX_VCU is not set
Expand All @@ -7419,6 +7428,7 @@ CONFIG_ARM64_ERRATUM_858921=y
# end of Clock Source drivers

CONFIG_MAILBOX=y
# CONFIG_MAILBOX_POLL_PERIOD_US is not set
# CONFIG_ARM_MHU is not set
# CONFIG_ARM_MHU_V2 is not set
# CONFIG_PLATFORM_MHU is not set
Expand Down Expand Up @@ -7528,6 +7538,7 @@ CONFIG_CPU_RK3399=y
CONFIG_CPU_RK3528=y
# CONFIG_CPU_RK3562 is not set
CONFIG_CPU_RK3568=y
CONFIG_CPU_RK3576=y
CONFIG_CPU_RK3588=y
# end of Rockchip CPU selection

Expand Down Expand Up @@ -7574,6 +7585,7 @@ CONFIG_ROCKCHIP_FIQ_DEBUGGER=y
CONFIG_ROCKCHIP_DEBUG=y
# CONFIG_ROCKCHIP_MINI_KERNEL is not set
# CONFIG_ROCKCHIP_THUNDER_BOOT is not set
# CONFIG_ROCKCHIP_THUNDER_BOOT_DEFER_FREE_MEMBLOCK is not set
# CONFIG_ROCKCHIP_NPOR_POWERGOOD is not set
# CONFIG_RK_CMA_PROCFS is not set
CONFIG_RK_DMABUF_PROCFS=y
Expand Down Expand Up @@ -8161,6 +8173,7 @@ CONFIG_PWM_SYSFS=y
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_ROCKCHIP=y
# CONFIG_PWM_ROCKCHIP_ONESHOT is not set
# CONFIG_PWM_ROCKCHIP_TEST is not set
# CONFIG_PWM_XILINX is not set

#
Expand Down
7 changes: 7 additions & 0 deletions config/sources/families/include/rockchip64_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@ case "$BOOT_SOC" in
ROCKUSB_BLOB="rk35/rk356x_spl_loader_v1.21.113.bin"
;;

rk3576)
BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
DDR_BLOB="${DDR_BLOB:-"rk35/rk3576_ddr_lp4_2112MHz_lp5_2736MHz_v1.03.bin"}"
BL31_BLOB="${BL31_BLOB:-"rk35/rk3576_bl31_v1.04.elf"}"
BL32_BLOB="${BL32_BLOB:-"rk35/rk3576_bl32_v1.01.bin"}"
;;

rk3588) #CPUMAX undefined?
BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
DDR_BLOB="${DDR_BLOB:-"rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"}"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config:

overlay-directories:
- { source: "defconfig", target: "configs" } # copies all files in defconfig dir to the configs/ dir in the u-boot source tree
- { source: "dt", target: "arch/arm/dts" } # copies all files in dt dir to the arch/arm/dts dir in the u-boot source tree
Loading