From c5cfb070259db1696419673911f79d3b85dbd0a8 Mon Sep 17 00:00:00 2001 From: Andrei Leonchikov Date: Sat, 20 Sep 2025 22:16:39 +0000 Subject: [PATCH] Move more settings to groups --- config/kernel/btt_boards.json | 51 +++++-- config/kernel/drm.json | 42 ++++++ config/kernel/fs.json | 92 ++++++++++++ config/kernel/media.json | 55 +++++++ config/kernel/minimize.json | 11 +- config/kernel/network.json | 1 + config/kernel/psave.json | 8 +- config/kernel/rk35xx.json | 260 ++-------------------------------- config/kernel/stats.json | 28 ++++ config/kernel/storage.json | 27 ++++ config/kernel/systems.json | 46 +++++- config/kernel_meta.json | 5 +- config/target_meta.json | 2 +- 13 files changed, 367 insertions(+), 261 deletions(-) create mode 100644 config/kernel/fs.json create mode 100644 config/kernel/media.json create mode 100644 config/kernel/stats.json diff --git a/config/kernel/btt_boards.json b/config/kernel/btt_boards.json index ee5df09..a4caa6e 100644 --- a/config/kernel/btt_boards.json +++ b/config/kernel/btt_boards.json @@ -2,12 +2,47 @@ { "name": "btt_pi2_defconfig", "save_path": "arch/arm64/configs/btt_pi2_defconfig", - "_depends": + "depends": [ - "rk356x" + "rk3566", + "serial_embed", + "media_camera_usb", + "fs_min", + "fs_misc", + "system_debug" ], "options": [ + "CONFIG_IIO=y", + "CONFIG_DHT11=m", + "CONFIG_MFD_RK8XX_I2C=y", + "CONFIG_RTC_CLASS=y", + "CONFIG_RTC_DRV_RK808=y", + "CONFIG_INPUT_RK805_PWRKEY=y", + "CONFIG_REGULATOR_RK808=y", + "CONFIG_LOCALVERSION=\"-arm64\"", + "CONFIG_LOCALVERSION_AUTO=n", + "CONFIG_CLK_RK3528=y", + "CONFIG_CLK_RK3562=y", + "CONFIG_ARM_RK3328_DMC_DEVFREQ=y", + "#WiFi", + "CONFIG_WLAN_VENDOR_BROADCOM=y", + "CONFIG_BRCMFMAC=m", + "CONFIG_BRCMFMAC_SDIO=y", + "CONFIG_B43=n", + "CONFIG_B43_SDIO=n", + "CONFIG_B43_PHY_G=n", + "CONFIG_B43_PHY_N=n", + "CONFIG_B43_PHY_LP=n", + "CONFIG_B43_PHY_HT=n", + "CONFIG_BCMA_DRIVER_PCI=n", + "CONFIG_BCMA_HOST_PCI=n", + "#touchscreens", + "#CONFIG_TOUCHSCREEN_GOODIX=m", + "#CONFIG_TOUCHSCREEN_TSC2007=y", + "CONFIG_TOUCHSCREEN_EDT_FT5X06=m", + "#CONFIG_TOUCHSCREEN_USB_COMPOSITE=m", + "CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=y", "CONFIG_DEFAULT_HOSTNAME=\"(none)\"" ] }, @@ -16,16 +51,14 @@ "save_path": "arch/arm64/configs/btt_pi2_printer_defconfig", "depends": [ - "rk3566", - "serial_embed" + "btt_pi2_defconfig" ], "options": [ - "CONFIG_LOCALVERSION=\"-arm64\"", - "CONFIG_LOCALVERSION_AUTO=n", - "CONFIG_CLK_RK3528=y", - "CONFIG_CLK_RK3562=y", - "CONFIG_ARM_RK3328_DMC_DEVFREQ=y", + "#printer devices", + "CONFIG_CAN=y", + "CONFIG_CAN_GS_USB=y", + "CONFIG_CAN_ROCKCHIP_CANFD=m", "CONFIG_DEFAULT_HOSTNAME=\"Printer\"" ] } diff --git a/config/kernel/drm.json b/config/kernel/drm.json index 1837473..d464cda 100644 --- a/config/kernel/drm.json +++ b/config/kernel/drm.json @@ -63,5 +63,47 @@ "CONFIG_DRM_ROCKCHIP=y", "CONFIG_ROCKCHIP_VOP2=y" ] + }, + { + "name": "drm_panfrost", + "depends": + [ + "drm" + ], + "options": + [ + "CONFIG_DRM_PANFROST=y" + ] + }, + { + "name": "drm_rk_phy", + "options": + [ + "CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=y", + "CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=y", + "CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y" + ] + }, + { + "name": "drm_fb", + "options": + [ + "#FB", + "CONFIG_DRM_SIMPLEDRM=y", + "CONFIG_FB=y", + "CONFIG_FB_CORE=y", + "CONFIG_FB_NOTIFY=y", + "CONFIG_FB_DEVICE=y", + "CONFIG_FB_SYS_FILLRECT=y", + "CONFIG_FB_SYS_COPYAREA=y", + "CONFIG_FB_SYS_IMAGEBLIT=y", + "CONFIG_FB_SYSMEM_FOPS=y", + "CONFIG_FB_DEFERRED_IO=y", + "CONFIG_FB_DMAMEM_HELPERS=y", + "CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y", + "CONFIG_FB_SYSMEM_HELPERS=y", + "CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y", + "CONFIG_FB_MODE_HELPERS=y" + ] } ] diff --git a/config/kernel/fs.json b/config/kernel/fs.json new file mode 100644 index 0000000..ffce109 --- /dev/null +++ b/config/kernel/fs.json @@ -0,0 +1,92 @@ +[ + { + "name": "fs_base", + "options": + [ + "CONFIG_FS_POSIX_ACL=y", + "CONFIG_FILE_LOCKING=y", + "CONFIG_FSNOTIFY=y", + "CONFIG_DNOTIFY=y", + "CONFIG_INOTIFY_USER=y", + "CONFIG_FANOTIFY=y", + "CONFIG_VALIDATE_FS_PARSER=y" + ] + }, + { + "name": "fs_sys", + "depends": + [ + "fs_base" + ], + "options": + [ + "CONFIG_AUTOFS_FS=y", + "CONFIG_FUSE_FS=y", + "CONFIG_FUSE_PASSTHROUGH=y", + "CONFIG_OVERLAY_FS=y", + "CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y", + "CONFIG_FAT_FS=y", + "CONFIG_VFAT_FS=y", + "CONFIG_FAT_DEFAULT_CODEPAGE=437", + "CONFIG_FAT_DEFAULT_IOCHARSET=\"utf8\"", + "CONFIG_EXFAT_FS=y", + "CONFIG_EXFAT_DEFAULT_IOCHARSET=\"utf8\"", + "CONFIG_PROC_FS=y", + "CONFIG_PROC_KCORE=y", + "CONFIG_PROC_VMCORE=y", + "CONFIG_PROC_SYSCTL=y", + "CONFIG_PROC_PAGE_MONITOR=y", + "CONFIG_PROC_CHILDREN=y", + "CONFIG_KERNFS=y", + "CONFIG_SYSFS=y", + "CONFIG_TMPFS=y", + "CONFIG_TMPFS_POSIX_ACL=y", + "CONFIG_TMPFS_XATTR=y", + "CONFIG_CONFIGFS_FS=y", + "CONFIG_DEVTMPFS=y", + "CONFIG_DEVTMPFS_MOUNT=y" + ] + }, + { + "name": "fs_min", + "depends": + [ + "fs_sys" + ], + "options": + [ + "CONFIG_SQUASHFS=y", + "CONFIG_SQUASHFS_FILE_DIRECT=y", + "CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y", + "CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y", + "CONFIG_SQUASHFS_XATTR=y", + "CONFIG_SQUASHFS_ZLIB=y", + "CONFIG_SQUASHFS_LZ4=y", + "CONFIG_SQUASHFS_LZO=y", + "CONFIG_SQUASHFS_XZ=y", + "CONFIG_SQUASHFS_ZSTD=n", + "CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3", + "CONFIG_EXT4_FS=y", + "CONFIG_EXT4_USE_FOR_EXT2=y", + "CONFIG_EXT4_FS_POSIX_ACL=y", + "CONFIG_EXT4_FS_SECURITY=y" + ] + }, + { + "name": "fs_misc", + "depends": + [ + "fs_base" + ], + "options": + [ + "CONFIG_NTFS3_FS=y", + "CONFIG_NTFS3_LZX_XPRESS=y", + "CONFIG_NTFS3_FS_POSIX_ACL=y", + "CONFIG_F2FS_FS=y", + "CONFIG_F2FS_FS_COMPRESSION=y", + "CONFIG_F2FS_FS_ZSTD=n", + "CONFIG_F2FS_CHECK_FS=y" + ] + } +] diff --git a/config/kernel/media.json b/config/kernel/media.json new file mode 100644 index 0000000..60e4d10 --- /dev/null +++ b/config/kernel/media.json @@ -0,0 +1,55 @@ +[ + { + "name": "media_base", + "options": + [ + "CONFIG_MEDIA_SUPPORT=y", + "CONFIG_MEDIA_SUPPORT_FILTER=y", + "CONFIG_MEDIA_SUBDRV_AUTOSELECT=y", + "CONFIG_MEDIA_ANALOG_TV_SUPPORT=n", + "CONFIG_MEDIA_DIGITAL_TV_SUPPORT=n", + "CONFIG_MEDIA_RADIO_SUPPORT=n", + "CONFIG_MEDIA_SDR_SUPPORT=n", + "CONFIG_MEDIA_TEST_SUPPORT=n", + "CONFIG_MEDIA_TUNER=n" + ] + }, + { + "name": "media_camera_usb", + "depends": + [ + "media_base" + ], + "options": + [ + "CONFIG_MEDIA_CAMERA_SUPPORT=y", + "CONFIG_MEDIA_PLATFORM_SUPPORT=y", + "CONFIG_MEDIA_USB_SUPPORT=y" + ] + }, + { + "name": "media_hantro", + "depends": + [ + "media_base" + ], + "options": + [ + "CONFIG_VIDEO_HANTRO=y" + ] + }, + { + "name": "media_rk", + "depends": + [ + "media_hantro" + ], + "options": + [ + "CONFIG_VIDEO_HANTRO_ROCKCHIP=y", + "CONFIG_STAGING=y", + "CONFIG_STAGING_MEDIA=y", + "CONFIG_VIDEO_ROCKCHIP_VDEC2=y" + ] + } +] diff --git a/config/kernel/minimize.json b/config/kernel/minimize.json index d9b1753..17cfca4 100644 --- a/config/kernel/minimize.json +++ b/config/kernel/minimize.json @@ -3,6 +3,13 @@ "name": "minimize", "options": [ + "CONFIG_SERIAL_8250_PCILIB=n", + "CONFIG_SERIAL_8250_PCI=n", + "CONFIG_SERIAL_8250_EXAR=n", + "CONFIG_SERIAL_8250_PERICOM=n", + "CONFIG_CXD2880_SPI_DRV=n", + "CONFIG_LEGACY_PTYS=n", + "CONFIG_LEGACY_TIOCSTI=n", "CONFIG_SOUND=n", "CONFIG_COMPAT=n", "CONFIG_EXPERT=y", @@ -16,8 +23,8 @@ "CONFIG_EFI=n", "CONFIG_SWAP=n", "CONFIG_SURFACE_PLATFORMS=n", - "CONFIG_LOG_BUF_SHIFT=12", - "CONFIG_LOG_CPU_MAX_BUF_SHIFT=11", + "CONFIG_LOG_BUF_SHIFT=13", + "CONFIG_LOG_CPU_MAX_BUF_SHIFT=12", "CONFIG_FTRACE=n", "CONFIG_MOUSE_PS2=n", "CONFIG_SUNXI_SYS_INFO=n", diff --git a/config/kernel/network.json b/config/kernel/network.json index 42b76be..a383c4e 100644 --- a/config/kernel/network.json +++ b/config/kernel/network.json @@ -8,6 +8,7 @@ "CONFIG_NETDEVICES=y", "CONFIG_NET=y", "CONFIG_INET=y", + "CONFIG_PACKET=y", "CONFIG_IPV6=y" ] }, diff --git a/config/kernel/psave.json b/config/kernel/psave.json index 94af7e9..bfe0247 100644 --- a/config/kernel/psave.json +++ b/config/kernel/psave.json @@ -15,6 +15,8 @@ "options": [ "CONFIG_CPU_FREQ=y", + "CONFIG_CPUFREQ_DT=y", + "CONFIG_CPUFREQ_DT_PLATDEV=y", "CONFIG_CPU_FREQ_GOV_COMMON=y", "CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y", "CONFIG_CPU_FREQ_GOV_POWERSAVE=y", @@ -28,7 +30,11 @@ "options": [ "CONFIG_PM_DEVFREQ=y", - "CONFIG_PM_DEVFREQ_EVENT=y" + "CONFIG_PM_DEVFREQ_EVENT=y", + "CONFIG_DEVFREQ_GOV_PERFORMANCE=y", + "CONFIG_DEVFREQ_GOV_POWERSAVE=y", + "CONFIG_DEVFREQ_GOV_USERSPACE=y", + "CONFIG_DEVFREQ_GOV_PASSIVE=y" ] }, { diff --git a/config/kernel/rk35xx.json b/config/kernel/rk35xx.json index b9d125d..cbb3cdc 100644 --- a/config/kernel/rk35xx.json +++ b/config/kernel/rk35xx.json @@ -4,11 +4,14 @@ "depends": [ "arm64", - "net_base" + "net_base", + "drm_fb" ], "options": [ "CONFIG_OF=y", + "CONFIG_BLK_DEV_LOOP=y", + "CONFIG_BLK_DEV_SD=y", "CONFIG_ARCH_ROCKCHIP=y", "CONFIG_ROCKCHIP_IOMMU=y", "CONFIG_ROCKCHIP_MBOX=y", @@ -42,8 +45,6 @@ "CONFIG_ARM_SCMI_PROTOCOL=y", "CONFIG_ARM_SCMI_HAVE_SHMEM=y", "CONFIG_ARM_SCMI_TRANSPORT_SMC=y", - "CONFIG_CPUFREQ_DT=y", - "CONFIG_CPUFREQ_DT_PLATDEV=y", "CONFIG_ARM_SCMI_CPUFREQ=y", "CONFIG_REGULATOR_FIXED_VOLTAGE=y", "CONFIG_COMMON_CLK=y", @@ -58,8 +59,9 @@ [ "rk_base" ], - "_options": + "options": [ + "CONFIG_CRYPTO_DEV_ROCKCHIP2=y", "#BT", "CONFIG_BT", "CONFIG_BT_HCIUART", @@ -71,7 +73,7 @@ "name": "rk3568", "depends": [ - "rk_base", + "rk35xx", "net_brcmfmac", "net_dwmac", "usb_ehci", @@ -87,12 +89,18 @@ "drm_rk", "drm_dw_hdmi", "drm_dw_dsi", + "drm_rk_phy", "mtd_nor", "psave_cpufreq", - "psave_cpuidle" + "psave_cpuidle", + "media_rk", + "pci_rk_dw", + "nvme_blk", + "drm_panfrost" ], "options": [ + "CONFIG_CLK_RK3568=y" ] }, { @@ -104,33 +112,10 @@ "options": [ "CONFIG_PWM=y", - "CONFIG_DEBUG_FS=y", - "CONFIG_DEBUG_FS_ALLOW_ALL=y", - "CONFIG_CLK_RK3568=y", - "CONFIG_MEDIA_SUPPORT=y", - "CONFIG_MEDIA_SUPPORT_FILTER=y", - "CONFIG_MEDIA_SUBDRV_AUTOSELECT=y", - "CONFIG_MEDIA_ANALOG_TV_SUPPORT=n", - "CONFIG_MEDIA_DIGITAL_TV_SUPPORT=n", - "CONFIG_MEDIA_RADIO_SUPPORT=n", - "CONFIG_MEDIA_SDR_SUPPORT=n", - "CONFIG_MEDIA_TEST_SUPPORT=n", - "CONFIG_MEDIA_TUNER=n", - "CONFIG_MEDIA_CAMERA_SUPPORT=y", - "CONFIG_MEDIA_PLATFORM_SUPPORT=y", - "CONFIG_MEDIA_USB_SUPPORT=y", - "CONFIG_VIDEO_HANTRO=y", - "CONFIG_CRYPTO_DEV_ROCKCHIP2=y", - "CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=y", - "CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=y", - "CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y", "CONFIG_USB_DWC3=y", "CONFIG_USB_DWC3_HOST=y", "CONFIG_I2C_RK3X=y", - "CONFIG_PCI=y", - "CONFIG_PCIE_ROCKCHIP_DW=y", - "CONFIG_PCIE_ROCKCHIP_DW_HOST=y", "CONFIG_PWM_ROCKCHIP=y", "CONFIG_V4L_MEM2MEM_DRIVERS=y", "CONFIG_VIDEO_ROCKCHIP_RGA=y", @@ -143,25 +128,13 @@ "CONFIG_SPI_ROCKCHIP_SFC=y", "CONFIG_EXTCON=y", "CONFIG_PHY_ROCKCHIP_INNO_USB2=y", - "CONFIG_VIDEO_HANTRO_ROCKCHIP=y", "CONFIG_WATCHDOG=y", "CONFIG_DW_WATCHDOG=y", - "CONFIG_STAGING=y", - "CONFIG_STAGING_MEDIA=y", - "CONFIG_VIDEO_ROCKCHIP_VDEC2=y", - "CONFIG_MFD_RK8XX_I2C=y", "#specific", "CONFIG_NVMEM_ROCKCHIP_EFUSE=y", "CONFIG_NVMEM_ROCKCHIP_OTP=y", "CONFIG_PHY_ROCKCHIP_EMMC=y", "CONFIG_INPUT_MISC=y", - "CONFIG_INPUT_RK805_PWRKEY=y", - "CONFIG_REGULATOR_RK808=y", - "CONFIG_RTC_CLASS=y", - "CONFIG_RTC_DRV_RK808=y", - "#NVMe", - "CONFIG_NVME_CORE=y", - "CONFIG_BLK_DEV_NVME=y", "# to review", "CONFIG_SYSVIPC=y", @@ -175,10 +148,7 @@ "CONFIG_PINMUX=y", "CONFIG_RPMB=y", "CONFIG_RESET_CONTROLLER=y", - "CONFIG_ARM64=y", "CONFIG_DMADEVICES=y", - "CONFIG_IIO=y", - "CONFIG_DHT11=m", "CONFIG_PERF_EVENTS=y", "CONFIG_HW_PERF_EVENTS=y", "CONFIG_MAILBOX=y", @@ -197,133 +167,11 @@ "CONFIG_REGMAP_MMIO=y", "CONFIG_HAS_IOMEM=y", "#debug?", - "CONFIG_PRINTK_TIME=y", - "CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7", - "CONFIG_DEBUG_MISC=n", - "CONFIG_MAGIC_SYSRQ=n", - "CONFIG_SCHED_DEBUG=n", - "#minimize", - "CONFIG_UID16=n", - "CONFIG_BUG=n", - "CONFIG_SHMEM=n", - "CONFIG_SWAP=n", - "CONFIG_NR_CPUS=8", - "CONFIG_EFI=n", - "CONFIG_COREDUMP=n", - "CONFIG_LOG_BUF_SHIFT=12", - "CONFIG_LOG_CPU_MAX_BUF_SHIFT=11", - "CONFIG_RD_ZSTD=n", - "CONFIG_KALLSYMS=n", - "CONFIG_LEGACY_PTYS=n", - "CONFIG_LEGACY_TIOCSTI=n", - "CONFIG_CXD2880_SPI_DRV=n", - "CONFIG_FTRACE=n", - "CONFIG_RUNTIME_TESTING_MENU=n", - "CONFIG_MOUSE_PS2=n", - "CONFIG_MOUSE_PS2_ALPS=n", - "CONFIG_MOUSE_PS2_BYD=n", - "CONFIG_MOUSE_PS2_LOGIPS2PP=n", - "CONFIG_MOUSE_PS2_SYNAPTICS=n", - "CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=n", - "CONFIG_MOUSE_PS2_CYPRESS=n", - "CONFIG_MOUSE_PS2_TRACKPOINT=n", - "CONFIG_MOUSE_PS2_FOCALTECH=n", - "CONFIG_MOUSE_PS2_SMBUS=n", - "CONFIG_VIRTIO_MENU=n", - "CONFIG_VHOST_MENU=n", - "CONFIG_SURFACE_PLATFORMS=n", - "#disable ERRATA for another CPUs", - "CONFIG_ARM64_ERRATUM_2966298=n", - "CONFIG_ARM64_ERRATUM_3117295=n", - "CONFIG_ARM64_ERRATUM_3194386=n", - "CONFIG_CAVIUM_ERRATUM_22375=n", - "CONFIG_CAVIUM_ERRATUM_23154=n", - "CONFIG_CAVIUM_ERRATUM_27456=n", - "CONFIG_CAVIUM_ERRATUM_30115=n", - "CONFIG_CAVIUM_TX2_ERRATUM_219=n", - "CONFIG_FUJITSU_ERRATUM_010001=n", - "CONFIG_HISILICON_ERRATUM_161600802=n", - "CONFIG_HISILICON_ERRATUM_162100801=n", - "CONFIG_QCOM_FALKOR_ERRATUM_1003=n", - "CONFIG_QCOM_FALKOR_ERRATUM_1009=n", - "CONFIG_QCOM_QDF2400_ERRATUM_0065=n", - "CONFIG_QCOM_FALKOR_ERRATUM_E1041=n", - "CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=n", - "CONFIG_SOCIONEXT_SYNQUACER_PREITS=n", - "CONFIG_ARM64_ERRATUM_2457168=n", - "CONFIG_ARM64_ERRATUM_2645198=n", - "CONFIG_ARM64_ERRATUM_2054223=n", - "CONFIG_ARM64_ERRATUM_2067961=n", - "CONFIG_ARM64_ERRATUM_2051678=n", - "CONFIG_ARM64_ERRATUM_2077057=n", - "CONFIG_ARM64_ERRATUM_2658417=n", - "CONFIG_SERIAL_8250_PCILIB=n", - "CONFIG_SERIAL_8250_PCI=n", - "CONFIG_SERIAL_8250_EXAR=n", - "CONFIG_SERIAL_8250_PERICOM=n", "#system", - "CONFIG_VALIDATE_FS_PARSER=y", - "CONFIG_EXT4_FS=y", - "CONFIG_EXT4_USE_FOR_EXT2=y", - "CONFIG_EXT4_FS_POSIX_ACL=y", - "CONFIG_EXT4_FS_SECURITY=y", - "CONFIG_FS_POSIX_ACL=y", - "CONFIG_FILE_LOCKING=y", - "CONFIG_FSNOTIFY=y", - "CONFIG_DNOTIFY=y", - "CONFIG_INOTIFY_USER=y", - "CONFIG_FANOTIFY=y", - "CONFIG_AUTOFS_FS=y", - "CONFIG_FUSE_FS=y", - "CONFIG_FUSE_PASSTHROUGH=y", - "CONFIG_OVERLAY_FS=y", - "CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y", - "CONFIG_FAT_FS=y", - "CONFIG_VFAT_FS=y", - "CONFIG_FAT_DEFAULT_CODEPAGE=437", - "CONFIG_FAT_DEFAULT_IOCHARSET=\"utf8\"", - "CONFIG_EXFAT_FS=y", - "CONFIG_EXFAT_DEFAULT_IOCHARSET=\"utf8\"", - "CONFIG_NTFS3_FS=y", - "CONFIG_NTFS3_LZX_XPRESS=y", - "CONFIG_NTFS3_FS_POSIX_ACL=y", - "CONFIG_PROC_FS=y", - "CONFIG_PROC_KCORE=y", - "CONFIG_PROC_VMCORE=y", - "CONFIG_PROC_SYSCTL=y", - "CONFIG_PROC_PAGE_MONITOR=y", - "CONFIG_PROC_CHILDREN=y", - "CONFIG_KERNFS=y", - "CONFIG_SYSFS=y", - "CONFIG_TMPFS=y", - "CONFIG_TMPFS_POSIX_ACL=y", - "CONFIG_TMPFS_XATTR=y", - "CONFIG_CONFIGFS_FS=y", - "CONFIG_SQUASHFS=y", - "CONFIG_SQUASHFS_FILE_DIRECT=y", - "CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y", - "CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y", - "CONFIG_SQUASHFS_XATTR=y", - "CONFIG_SQUASHFS_ZLIB=y", - "CONFIG_SQUASHFS_LZ4=y", - "CONFIG_SQUASHFS_LZO=y", - "CONFIG_SQUASHFS_XZ=y", - "CONFIG_SQUASHFS_ZSTD=n", - "CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3", - "CONFIG_F2FS_FS=y", - "CONFIG_F2FS_FS_COMPRESSION=y", - "CONFIG_F2FS_FS_ZSTD=n", - "CONFIG_F2FS_CHECK_FS=y", - "CONFIG_ARM_ARCH_TIMER=y", - "CONFIG_ARM_PMUV3=y", "CONFIG_ARM_GIC=y", "CONFIG_ARM_GIC_V3=y", "CONFIG_PL330_DMA=y", - "CONFIG_ARM_PSCI_FW=y", - "CONFIG_ARM_SCMI_HAVE_SHMEM=y", - "CONFIG_ARM_SCMI_TRANSPORT_SMC=y", "CONFIG_ARM_SCPI_PROTOCOL=y", - "CONFIG_OF=y", "#CONFIG_BT_HCIUART_BCM=y", "CONFIG_I2C_GPIO=y", "CONFIG_PWRSEQ_SIMPLE=y", @@ -331,42 +179,14 @@ "CONFIG_OF_GPIO=y", "CONFIG_DUMP_REG_MISC=y", "CONFIG_REGULATOR_GPIO=y", - "#printer devices", - "CONFIG_CAN=y", - "CONFIG_CAN_GS_USB=y", - "CONFIG_CAN_ROCKCHIP_CANFD=m", - "CONFIG_BLK_DEV_LOOP=y", "CONFIG_SCSI=y", - "CONFIG_BLK_DEV_SD=y", "CONFIG_USB_ACM=m", "#for system software", - "CONFIG_TASKSTATS=y", - "CONFIG_TASK_XACCT=y", - "CONFIG_TASK_IO_ACCOUNTING=y", - "CONFIG_CGROUPS=y", - "CONFIG_PAGE_COUNTER=y", - "CONFIG_MEMCG=y", - "CONFIG_SCHED_MM_CID=y", - "CONFIG_CGROUP_PIDS=y", - "CONFIG_CGROUP_FREEZER=y", - "CONFIG_CGROUP_DEVICE=y", - "CONFIG_CGROUP_CPUACCT=y", - "CONFIG_CGROUP_PERF=y", - "CONFIG_SOCK_CGROUP_DATA=y", - "CONFIG_NAMESPACES=y", - "CONFIG_UTS_NS=y", - "CONFIG_TIME_NS=y", - "CONFIG_IPC_NS=y", - "CONFIG_USER_NS=y", - "CONFIG_PID_NS=y", - "CONFIG_NET_NS=y", "CONFIG_KEXEC_CORE=y", "CONFIG_KEXEC=y", "CONFIG_KEXEC_FILE=y", "CONFIG_UEVENT_HELPER=y", "CONFIG_UEVENT_HELPER_PATH=\"\"", - "CONFIG_DEVTMPFS=y", - "CONFIG_DEVTMPFS_MOUNT=y", "CONFIG_INPUT_EVDEV=y", "CONFIG_KEYBOARD_GPIO=y", "CONFIG_MOUSE_SYNAPTICS_USB=y", @@ -384,10 +204,6 @@ "CONFIG_V4L_PLATFORM_DRIVERS=y", "CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y", "CONFIG_HID_MULTITOUCH=y", - "CONFIG_DEVFREQ_GOV_PERFORMANCE=y", - "CONFIG_DEVFREQ_GOV_POWERSAVE=y", - "CONFIG_DEVFREQ_GOV_USERSPACE=y", - "CONFIG_DEVFREQ_GOV_PASSIVE=y", "CONFIG_HW_RANDOM=y", "#sensors", "CONFIG_W1=y", @@ -402,67 +218,21 @@ "CONFIG_USB_DWC3_HAPS=n", "#vido, audio", "CONFIG_MEDIA_CEC_SUPPORT=y", - "#network", - "CONFIG_PACKET=y", - "CONFIG_INET=y", - "#wifi", - "##########", "#Both", - "CONFIG_DRM_PANFROST=y", "CONFIG_NOP_USB_XCEIV=y", - "CONFIG_DRM_SUN8I_DW_HDMI=y", "##CONFIG_CAN_MCP251X=y", "##CONFIG_FB_TFT_ST7796S=y", "CONFIG_REGULATOR_FAN53555=y", "#rk3566/3568, SoC-specific", - "CONFIG_CLK_RK3308=n", - "CONFIG_CLK_RK3328=n", - "CONFIG_CLK_RK3399=n", - "CONFIG_CLK_RK3368=n", - "CONFIG_CLK_RK3676=n", - "CONFIG_CLK_RK3588=n", "CONFIG_EMAC_ROCKCHIP=y", "#EEPROM", "CONFIG_EEPROM_AT24=y", "CONFIG_EEPROM_AT25=n", "CONFIG_EEPROM_93CX6=n", - "#FB", - "CONFIG_DRM_SIMPLEDRM=y", - "CONFIG_FB=y", - "CONFIG_FB_CORE=y", - "CONFIG_FB_NOTIFY=y", - "CONFIG_FB_DEVICE=y", - "CONFIG_FB_SYS_FILLRECT=y", - "CONFIG_FB_SYS_COPYAREA=y", - "CONFIG_FB_SYS_IMAGEBLIT=y", - "CONFIG_FB_SYSMEM_FOPS=y", - "CONFIG_FB_DEFERRED_IO=y", - "CONFIG_FB_DMAMEM_HELPERS=y", - "CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y", - "CONFIG_FB_SYSMEM_HELPERS=y", - "CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y", - "CONFIG_FB_MODE_HELPERS=y", "#eth", - "CONFIG_WLAN_VENDOR_BROADCOM=y", - "CONFIG_BRCMFMAC=m", - "CONFIG_BRCMFMAC_SDIO=y", - "CONFIG_B43=n", - "CONFIG_B43_SDIO=n", - "CONFIG_B43_PHY_G=n", - "CONFIG_B43_PHY_N=n", - "CONFIG_B43_PHY_LP=n", - "CONFIG_B43_PHY_HT=n", - "CONFIG_BCMA_DRIVER_PCI=n", - "CONFIG_BCMA_HOST_PCI=n", "#typeC", - "#CONFIG_TYPEC=y", - "#touchscreens", - "#CONFIG_TOUCHSCREEN_GOODIX=m", - "#CONFIG_TOUCHSCREEN_TSC2007=y", - "CONFIG_TOUCHSCREEN_EDT_FT5X06=m", - "#CONFIG_TOUCHSCREEN_USB_COMPOSITE=m", - "CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=y" + "#CONFIG_TYPEC=y" ] } ] diff --git a/config/kernel/stats.json b/config/kernel/stats.json new file mode 100644 index 0000000..61ebfaf --- /dev/null +++ b/config/kernel/stats.json @@ -0,0 +1,28 @@ +[ + { + "name": "stats_base", + "options": + [ + "CONFIG_TASKSTATS=y", + "CONFIG_TASK_XACCT=y", + "CONFIG_TASK_IO_ACCOUNTING=y", + "CONFIG_CGROUPS=y", + "CONFIG_PAGE_COUNTER=y", + "CONFIG_MEMCG=y", + "CONFIG_SCHED_MM_CID=y", + "CONFIG_CGROUP_PIDS=y", + "CONFIG_CGROUP_FREEZER=y", + "CONFIG_CGROUP_DEVICE=y", + "CONFIG_CGROUP_CPUACCT=y", + "CONFIG_CGROUP_PERF=y", + "CONFIG_SOCK_CGROUP_DATA=y", + "CONFIG_NAMESPACES=y", + "CONFIG_UTS_NS=y", + "CONFIG_TIME_NS=y", + "CONFIG_IPC_NS=y", + "CONFIG_USER_NS=y", + "CONFIG_PID_NS=y", + "CONFIG_NET_NS=y" + ] + } +] diff --git a/config/kernel/storage.json b/config/kernel/storage.json index 9fafd61..38dedb3 100644 --- a/config/kernel/storage.json +++ b/config/kernel/storage.json @@ -41,5 +41,32 @@ [ "CONFIG_MTD_SPI_NOR=y" ] + }, + { + "name": "pci", + "options": + [ + "CONFIG_PCI=y" + ] + }, + { + "name": "pci_rk_dw", + "options": + [ + "CONFIG_PCIE_ROCKCHIP_DW=y", + "CONFIG_PCIE_ROCKCHIP_DW_HOST=y" + ] + }, + { + "name": "nvme_blk", + "depends": + [ + "pci" + ], + "options": + [ + "CONFIG_NVME_CORE=y", + "CONFIG_BLK_DEV_NVME=y" + ] } ] diff --git a/config/kernel/systems.json b/config/kernel/systems.json index 02ce996..83d81c1 100644 --- a/config/kernel/systems.json +++ b/config/kernel/systems.json @@ -53,7 +53,33 @@ "CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y", "CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y", "CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y", - "CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y" + "CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y", + + "#disable ERRATA for another CPUs", + "CONFIG_ARM64_ERRATUM_2966298=n", + "CONFIG_ARM64_ERRATUM_3117295=n", + "CONFIG_ARM64_ERRATUM_3194386=n", + "CONFIG_CAVIUM_ERRATUM_22375=n", + "CONFIG_CAVIUM_ERRATUM_23154=n", + "CONFIG_CAVIUM_ERRATUM_27456=n", + "CONFIG_CAVIUM_ERRATUM_30115=n", + "CONFIG_CAVIUM_TX2_ERRATUM_219=n", + "CONFIG_FUJITSU_ERRATUM_010001=n", + "CONFIG_HISILICON_ERRATUM_161600802=n", + "CONFIG_HISILICON_ERRATUM_162100801=n", + "CONFIG_QCOM_FALKOR_ERRATUM_1003=n", + "CONFIG_QCOM_FALKOR_ERRATUM_1009=n", + "CONFIG_QCOM_QDF2400_ERRATUM_0065=n", + "CONFIG_QCOM_FALKOR_ERRATUM_E1041=n", + "CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=n", + "CONFIG_SOCIONEXT_SYNQUACER_PREITS=n", + "CONFIG_ARM64_ERRATUM_2457168=n", + "CONFIG_ARM64_ERRATUM_2645198=n", + "CONFIG_ARM64_ERRATUM_2054223=n", + "CONFIG_ARM64_ERRATUM_2067961=n", + "CONFIG_ARM64_ERRATUM_2051678=n", + "CONFIG_ARM64_ERRATUM_2077057=n", + "CONFIG_ARM64_ERRATUM_2658417=n" ] }, { @@ -62,12 +88,15 @@ [ "system_all", "overlays", - "arm64_errata" + "arm64_errata", + "stats_base" ], "options": [ + "CONFIG_ARM64=y", "CONFIG_MODULES=y", "CONFIG_MODULE_UNLOAD=y", + "CONFIG_ARM_ARCH_TIMER=y", "CONFIG_THERMAL=y", "CONFIG_CPU_THERMAL=y", "CONFIG_CPU_FREQ_THERMAL=y", @@ -99,5 +128,18 @@ "CONFIG_RUNTIME_TESTING_MENU=n", "CONFIG_PRINTK_TIME=y" ] + }, + { + "name": "system_debug", + "options": + [ + "CONFIG_DEBUG_FS=y", + "CONFIG_DEBUG_FS_ALLOW_ALL=y", + "CONFIG_PRINTK_TIME=y", + "CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7", + "CONFIG_DEBUG_MISC=n", + "CONFIG_MAGIC_SYSRQ=n", + "CONFIG_SCHED_DEBUG=n" + ] } ] diff --git a/config/kernel_meta.json b/config/kernel_meta.json index 4eaeb08..3812788 100644 --- a/config/kernel_meta.json +++ b/config/kernel_meta.json @@ -13,6 +13,9 @@ "audio", "io", "psave", - "drm" + "drm", + "media", + "fs", + "stats" ] } diff --git a/config/target_meta.json b/config/target_meta.json index 5372953..fb361c7 100644 --- a/config/target_meta.json +++ b/config/target_meta.json @@ -27,7 +27,7 @@ "version_type": "tag", "patch_dir": [ "kernel", "kernel/sunxi-6.16", "kernel/rockchip64-6.16" ], "config_def": "printer_defconfig", - "target": [ "clean", "Image", "modules", "dtbs", "modules_install" ], + "target": [ "Image", "modules", "dtbs", "modules_install" ], "common": true, "have_defconfig": true, "artifacts":