@@ -25,11 +25,9 @@ CONFIG_ARCH_ROCKCHIP=y
2525# CONFIG_ARM64_ERRATUM_1742098 is not set
2626# CONFIG_ARM64_ERRATUM_845719 is not set
2727# CONFIG_ARM64_ERRATUM_843419 is not set
28- # CONFIG_ARM64_ERRATUM_1418040 is not set
29- # CONFIG_ARM64_ERRATUM_1165522 is not set
3028# CONFIG_ARM64_ERRATUM_1319367 is not set
3129CONFIG_ARM64_ERRATUM_2441007=y
32- # CONFIG_ARM64_ERRATUM_1463225 is not set
30+ CONFIG_ARM64_ERRATUM_1286807=y
3331# CONFIG_ARM64_ERRATUM_1508412 is not set
3432# CONFIG_ARM64_ERRATUM_2051678 is not set
3533# CONFIG_ARM64_ERRATUM_2077057 is not set
@@ -53,11 +51,10 @@ CONFIG_ARM64_ERRATUM_2441007=y
5351# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set
5452# CONFIG_QCOM_FALKOR_ERRATUM_E1041 is not set
5553# CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set
56- # CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
5754# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
5855CONFIG_ARM64_VA_BITS_39=y
5956CONFIG_SCHED_MC=y
60- CONFIG_NR_CPUS=4
57+ CONFIG_NR_CPUS=8
6158CONFIG_HZ_1000=y
6259# CONFIG_UNMAP_KERNEL_AT_EL0 is not set
6360# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
@@ -145,6 +142,8 @@ CONFIG_DEVTMPFS=y
145142CONFIG_DEVTMPFS_MOUNT=y
146143# CONFIG_STANDALONE is not set
147144# CONFIG_PREVENT_FIRMWARE_BUILD is not set
145+ CONFIG_EXTRA_FIRMWARE="arm/mali/arch10.8/mali_csffw.bin"
146+ CONFIG_EXTRA_FIRMWARE_DIR="firmware"
148147CONFIG_ARM_SCMI_PROTOCOL=y
149148CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE=y
150149CONFIG_ARM_SCMI_POWER_CONTROL=y
@@ -219,7 +218,7 @@ CONFIG_IPVLAN=m
219218# CONFIG_NET_VENDOR_BROCADE is not set
220219# CONFIG_NET_VENDOR_QUALCOMM is not set
221220# CONFIG_NET_VENDOR_RDC is not set
222- # CONFIG_NET_VENDOR_REALTEK is not set
221+ CONFIG_R8169=m
223222# CONFIG_NET_VENDOR_RENESAS is not set
224223# CONFIG_NET_VENDOR_ROCKER is not set
225224# CONFIG_NET_VENDOR_SAMSUNG is not set
@@ -320,6 +319,7 @@ CONFIG_ROCKCHIP_THERMAL=y
320319CONFIG_WATCHDOG=y
321320CONFIG_DW_WATCHDOG=y
322321CONFIG_MFD_RK8XX_I2C=y
322+ CONFIG_MFD_RK8XX_SPI=y
323323CONFIG_REGULATOR=y
324324CONFIG_REGULATOR_FIXED_VOLTAGE=y
325325CONFIG_REGULATOR_FAN53555=y
@@ -509,6 +509,7 @@ CONFIG_DRM_DISPLAY_CONNECTOR=y
509509CONFIG_DRM_DW_HDMI_I2S_AUDIO=y
510510CONFIG_DRM_DW_HDMI_CEC=y
511511CONFIG_DRM_PANFROST=y
512+ CONFIG_DRM_PANTHOR=y
512513CONFIG_FB=y
513514CONFIG_BACKLIGHT_CLASS_DEVICE=y
514515CONFIG_BACKLIGHT_PWM=y
@@ -623,7 +624,6 @@ CONFIG_COMMON_CLK_SCMI=y
623624# CONFIG_CLK_RK3368 is not set
624625# CONFIG_CLK_RK3399 is not set
625626# CONFIG_CLK_RK3576 is not set
626- # CONFIG_CLK_RK3588 is not set
627627# CONFIG_FSL_ERRATUM_A008585 is not set
628628# CONFIG_HISILICON_ERRATUM_161010101 is not set
629629CONFIG_MAILBOX=y
@@ -646,9 +646,12 @@ CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
646646CONFIG_PHY_ROCKCHIP_INNO_USB2=y
647647CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=y
648648CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y
649+ CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
649650CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
650651CONFIG_PHY_ROCKCHIP_TYPEC=y
651652CONFIG_PHY_ROCKCHIP_USB=y
653+ CONFIG_PHY_ROCKCHIP_USBDP=y
654+ CONFIG_NVMEM_ROCKCHIP_OTP=y
652655CONFIG_EXT2_FS=y
653656CONFIG_EXT3_FS=y
654657CONFIG_F2FS_FS=y
0 commit comments