From 6193ec3ebdfd49c5d540073ac5de604b37083e04 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Mon, 6 Feb 2023 01:27:59 +0800 Subject: [PATCH] use sdk branch for rk35xx legacy --- config/kernel/linux-rk35xx-legacy.config | 27 +++++++++++++----------- config/sources/families/rk35xx.conf | 4 ++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/config/kernel/linux-rk35xx-legacy.config b/config/kernel/linux-rk35xx-legacy.config index 82289af6c2..92b2a932d0 100644 --- a/config/kernel/linux-rk35xx-legacy.config +++ b/config/kernel/linux-rk35xx-legacy.config @@ -560,7 +560,6 @@ CONFIG_CPU_FREQ_GOV_INTERACTIVE=y # CPU frequency scaling drivers # CONFIG_CPUFREQ_DT=y -CONFIG_CPUFREQ_DT_PLATDEV=y # CONFIG_CPUFREQ_DUMMY is not set CONFIG_ARM_ROCKCHIP_CPUFREQ=y # CONFIG_ARM_SCMI_CPUFREQ is not set @@ -1198,7 +1197,6 @@ CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -# CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD is not set CONFIG_NETFILTER_XT_TARGET_RATEEST=m CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m @@ -1883,6 +1881,7 @@ CONFIG_PCIE_DW_HOST=y CONFIG_PCIE_DW_ROCKCHIP=y CONFIG_PCIE_RK_THREADED_INIT=y # CONFIG_PCIE_DW_DMATEST is not set +# CONFIG_PCIE_DW_ROCKCHIP_EP is not set # CONFIG_PCI_HISI is not set # CONFIG_PCIE_KIRIN is not set # CONFIG_PCI_MESON is not set @@ -2074,6 +2073,7 @@ CONFIG_MTD_CFI_UTIL=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +# CONFIG_MTD_SPI_NOR_MISC is not set CONFIG_MTD_UBI=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -2662,7 +2662,7 @@ CONFIG_NET_VENDOR_REALTEK=y # CONFIG_8139CP is not set # CONFIG_8139TOO is not set # CONFIG_R8168 is not set -# CONFIG_R8169 is not set +CONFIG_R8169=m CONFIG_NET_VENDOR_RENESAS=y CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SAMSUNG=y @@ -3317,7 +3317,6 @@ CONFIG_TOUCHSCREEN_COLIBRI_VF50=m # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set # CONFIG_TOUCHSCREEN_ZINITIX is not set -# CONFIG_TOUCHSCREEN_FE_PANELS is not set CONFIG_ROCKCHIP_REMOTECTL=y CONFIG_ROCKCHIP_REMOTECTL_PWM=y @@ -3614,6 +3613,7 @@ CONFIG_SPI_BITBANG=y # CONFIG_SPI_PL022 is not set # CONFIG_SPI_PXA2XX is not set CONFIG_SPI_ROCKCHIP=y +# CONFIG_SPI_ROCKCHIP_MISCDEV is not set # CONFIG_SPI_ROCKCHIP_SFC is not set # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set @@ -4148,9 +4148,7 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_MAX8997 is not set # CONFIG_MFD_MAX8998 is not set # CONFIG_MFD_MAX96745 is not set -# CONFIG_MFD_MAX96752F is not set # CONFIG_MFD_MAX96755F is not set -# CONFIG_MFD_MAX96776 is not set # CONFIG_MFD_MT6360 is not set # CONFIG_MFD_MT6397 is not set # CONFIG_MFD_MENF21BMC is not set @@ -4637,6 +4635,7 @@ CONFIG_VIDEO_IR_I2C=y # CONFIG_VIDEO_KS0127 is not set # CONFIG_VIDEO_IT6616 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 @@ -4722,10 +4721,12 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_AR0230 is not set # CONFIG_VIDEO_GC02M2 is not set # CONFIG_VIDEO_GC08A3 is not set +# CONFIG_VIDEO_GC1084 is not set # CONFIG_VIDEO_GC2053 is not set # CONFIG_VIDEO_GC2093 is not set # CONFIG_VIDEO_GC2145 is not set # CONFIG_VIDEO_GC2385 is not set +# CONFIG_VIDEO_GC3003 is not set # CONFIG_VIDEO_GC4023 is not set # CONFIG_VIDEO_GC4653 is not set # CONFIG_VIDEO_GC4663 is not set @@ -4761,6 +4762,7 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_OS08A20 is not set # CONFIG_VIDEO_OV02B10 is not set # CONFIG_VIDEO_OV02K10 is not set +# CONFIG_VIDEO_OV16A10 is not set # CONFIG_VIDEO_OV2640 is not set # CONFIG_VIDEO_OV2659 is not set # CONFIG_VIDEO_OV2680 is not set @@ -4810,6 +4812,7 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_SC2239 is not set # CONFIG_VIDEO_SC230AI is not set # CONFIG_VIDEO_SC2310 is not set +# CONFIG_VIDEO_SC2336 is not set # CONFIG_VIDEO_SC301IOT is not set # CONFIG_VIDEO_SC3336 is not set # CONFIG_VIDEO_SC3338 is not set @@ -5145,6 +5148,7 @@ CONFIG_ROCKCHIP_VOP=y CONFIG_ROCKCHIP_VOP2=y CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y +# CONFIG_ROCKCHIP_DRM_TVE is not set CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y # CONFIG_ROCKCHIP_DW_DP is not set @@ -5222,7 +5226,6 @@ CONFIG_DRM_PANEL_SIMPLE=y # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set -# CONFIG_DRM_PANEL_FRIENDLYELEC is not set # end of Display Panels CONFIG_DRM_BRIDGE=y @@ -5238,9 +5241,7 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_LONTIUM_LT9611 is not set # CONFIG_DRM_LVDS_CODEC is not set # CONFIG_DRM_MAXIM_MAX96745 is not set -# CONFIG_DRM_MAXIM_MAX96752F is not set # CONFIG_DRM_MAXIM_MAX96755F is not set -# CONFIG_DRM_MAXIM_MAX96776 is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set @@ -5614,6 +5615,7 @@ CONFIG_SND_SOC_ROCKCHIP_I2S=y CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y # CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS is not set CONFIG_SND_SOC_ROCKCHIP_PDM=y +# CONFIG_SND_SOC_ROCKCHIP_SAI is not set CONFIG_SND_SOC_ROCKCHIP_SPDIF=y # CONFIG_SND_SOC_ROCKCHIP_SPDIFRX is not set # CONFIG_SND_SOC_ROCKCHIP_VAD is not set @@ -5730,6 +5732,7 @@ CONFIG_SND_SOC_RK312X=m CONFIG_SND_SOC_RK3228=m CONFIG_SND_SOC_RK3308=y CONFIG_SND_SOC_RK3328=y +# CONFIG_SND_SOC_RK730 is not set CONFIG_SND_SOC_RK817=y CONFIG_SND_SOC_RK_CODEC_DIGITAL=y CONFIG_SND_SOC_RL6231=y @@ -6300,7 +6303,7 @@ CONFIG_MMC_DW_ROCKCHIP=y # CONFIG_MMC_USHC is not set # CONFIG_MMC_USDHI6ROL0 is not set CONFIG_MMC_CQHCI=y -# CONFIG_MMC_HSQ is not set +CONFIG_MMC_HSQ=y # CONFIG_MMC_TOSHIBA_PCI is not set # CONFIG_MMC_MTK is not set # CONFIG_MMC_SDHCI_XENON is not set @@ -6552,6 +6555,7 @@ CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y CONFIG_DMABUF_HEAPS_PAGE_POOL=y CONFIG_DMABUF_HEAPS_SYSTEM=y CONFIG_DMABUF_HEAPS_CMA=y +# CONFIG_DMABUF_HEAPS_SRAM is not set # CONFIG_DMABUF_HEAPS_ROCKCHIP is not set # end of DMABUF options @@ -6861,6 +6865,7 @@ CONFIG_CPU_RK1808=y CONFIG_CPU_RK3328=y CONFIG_CPU_RK3368=y CONFIG_CPU_RK3399=y +# CONFIG_CPU_RK3528 is not set CONFIG_CPU_RK3568=y # CONFIG_CPU_RK3588 is not set # end of Rockchip CPU selection @@ -6902,8 +6907,6 @@ CONFIG_ROCKCHIP_DEBUG=y # # CONFIG_XILINX_VCU is not set # end of Xilinx SoC drivers - -# CONFIG_VENDOR_FRIENDLYELEC is not set # end of SOC (System On Chip) specific Drivers CONFIG_PM_DEVFREQ=y diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf index b88115faf7..6e87e2046c 100644 --- a/config/sources/families/rk35xx.conf +++ b/config/sources/families/rk35xx.conf @@ -11,8 +11,8 @@ case $BRANCH in UBOOT_COMPILER="aarch64-linux-gnu-" UBOOT_USE_GCC='< 8.0' BOOTDIR='u-boot-rockchip64' - KERNELSOURCE='https://github.com/friendlyarm/kernel-rockchip' - KERNELBRANCH='branch:nanopi5-v5.10.y_opt' + KERNELSOURCE='https://gitlab.com/rk3588_linux/rk/kernel.git' + KERNELBRANCH='tag:linux-5.10-gen-rkr3.6' KERNELDIR='linux-rockchip64' KERNELPATCHDIR='rk35xx-legacy'