From ab0b9d685bc5245e3d0da78036aaef12d8066bf1 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 29 Nov 2024 14:49:54 +0800 Subject: [PATCH] ARM: rockchip_defconfig: reorder configs for kernel 6.1 Signed-off-by: Tao Huang Change-Id: I3dcff4b8f8b12480c7fc7ec468541087c5de0720 --- arch/arm/configs/rockchip_defconfig | 44 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig index 552fe1067062..a23b3a7b0a96 100644 --- a/arch/arm/configs/rockchip_defconfig +++ b/arch/arm/configs/rockchip_defconfig @@ -4,6 +4,8 @@ CONFIG_AUDIT=y # CONFIG_AUDITSYSCALL is not set CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y +CONFIG_BPF_JIT=y CONFIG_PREEMPT=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y @@ -34,10 +36,7 @@ CONFIG_INITRD_ASYNC=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set -CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARM_ERRATA_643719 is not set @@ -70,13 +69,7 @@ CONFIG_PM_WAKELOCKS_LIMIT=0 CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y CONFIG_ENERGY_MODEL=y -CONFIG_ROCKCHIP_SIP=y CONFIG_ARM_CRYPTO=y -CONFIG_CRYPTO_SHA1_ARM_NEON=y -CONFIG_CRYPTO_SHA2_ARM_CE=y -CONFIG_CRYPTO_SHA512_ARM=y -CONFIG_CRYPTO_AES_ARM_BS=y -CONFIG_CRYPTO_AES_ARM_CE=y CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y @@ -88,6 +81,7 @@ CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_IOSCHED_BFQ=y CONFIG_BFQ_GROUP_IOSCHED=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_COMPAT_BRK is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_CMA=y CONFIG_ZSMALLOC=y @@ -218,7 +212,6 @@ CONFIG_NET_EMATCH_U32=y CONFIG_NET_EMATCH_META=y CONFIG_NET_EMATCH_TEXT=y CONFIG_NET_CLS_ACT=y -CONFIG_BPF_JIT=y CONFIG_BT=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y @@ -232,6 +225,7 @@ CONFIG_RFKILL=y CONFIG_DEVTMPFS=y CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_FW_CACHE is not set +CONFIG_ROCKCHIP_SIP=y CONFIG_DTC_SYMBOLS=y CONFIG_ZRAM=y CONFIG_BLK_DEV_LOOP=y @@ -282,9 +276,9 @@ CONFIG_VETH=y # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_NET_VENDOR_MICROSEMI is not set +# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NETRONOME is not set -# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_QUALCOMM is not set # CONFIG_NET_VENDOR_RENESAS is not set # CONFIG_NET_VENDOR_ROCKER is not set @@ -430,8 +424,8 @@ CONFIG_GPIO_SYSFS=y CONFIG_POWER_RESET=y CONFIG_SYSCON_REBOOT_MODE=y CONFIG_TEST_POWER=y -CONFIG_CHARGER_BQ25700=y CONFIG_BATTERY_CW2015=y +CONFIG_CHARGER_BQ25700=y CONFIG_BATTERY_RK816=y CONFIG_BATTERY_RK818=y CONFIG_CHARGER_RK818=y @@ -469,25 +463,25 @@ CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ROCKCHIP_CIF=y CONFIG_VIDEO_ROCKCHIP_ISP1=y -CONFIG_VIDEO_VM149C=y -CONFIG_VIDEO_RK628_CSI=y CONFIG_VIDEO_GC0312=y CONFIG_VIDEO_GC0329=y CONFIG_VIDEO_GC2035=y CONFIG_VIDEO_GC2145=y -CONFIG_VIDEO_OV8858=y CONFIG_VIDEO_OV13850=y +CONFIG_VIDEO_OV8858=y +CONFIG_VIDEO_VM149C=y CONFIG_VIDEO_SGM3784=y +CONFIG_VIDEO_RK628_CSI=y CONFIG_DRM=y CONFIG_DRM_IGNORE_IOTCL_PERMIT=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_ROCKCHIP=y CONFIG_ROCKCHIP_ANALOGIX_DP=y +CONFIG_ROCKCHIP_DRM_TVE=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_INNO_HDMI=y CONFIG_ROCKCHIP_LVDS=y -CONFIG_ROCKCHIP_DRM_TVE=y CONFIG_ROCKCHIP_RGB=y CONFIG_DRM_ROCKCHIP_RK628=y CONFIG_DRM_PANEL_SIMPLE=y @@ -586,12 +580,6 @@ CONFIG_STAGING=y CONFIG_ASHMEM=y CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y -CONFIG_FIQ_DEBUGGER=y -CONFIG_FIQ_DEBUGGER_NO_SLEEP=y -CONFIG_FIQ_DEBUGGER_CONSOLE=y -CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y -CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y -CONFIG_RK_CONSOLE_THREAD=y CONFIG_COMMON_CLK_RK808=y CONFIG_ROCKCHIP_IOMMU=y CONFIG_CPU_RK312X=y @@ -603,6 +591,12 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_PVTM=y CONFIG_ROCKCHIP_SUSPEND_MODE=y CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y +CONFIG_FIQ_DEBUGGER=y +CONFIG_FIQ_DEBUGGER_NO_SLEEP=y +CONFIG_FIQ_DEBUGGER_CONSOLE=y +CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y +CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y +CONFIG_RK_CONSOLE_THREAD=y CONFIG_PM_DEVFREQ=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y @@ -678,6 +672,11 @@ CONFIG_TEE_SUPPORT=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_LZ4=y CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_SHA1_ARM_NEON=y +CONFIG_CRYPTO_SHA2_ARM_CE=y +CONFIG_CRYPTO_SHA512_ARM=y +CONFIG_CRYPTO_AES_ARM_BS=y +CONFIG_CRYPTO_AES_ARM_CE=y CONFIG_CRYPTO_DEV_ROCKCHIP=y CONFIG_CRYPTO_DEV_ROCKCHIP_DEV=y CONFIG_DMA_CMA=y @@ -686,6 +685,7 @@ CONFIG_DEBUG_INFO=y CONFIG_FRAME_WARN=1280 CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y +# CONFIG_SLUB_DEBUG is not set CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_TIMEOUT=5 CONFIG_SOFTLOCKUP_DETECTOR=y