From 0b4edbae77d0a29ca59cfab14caaf6366a15924d Mon Sep 17 00:00:00 2001 From: Andrei Leonchikov Date: Wed, 24 Sep 2025 18:27:28 +0000 Subject: [PATCH] Create a more media, power, usb groups. --- cfg/kernel_v6.16-rc2 | 20 +++++++---- config/kernel/btt_boards.json | 8 +++-- config/kernel/io.json | 33 +++++++++++++++++ config/kernel/media.json | 15 +++++++- config/kernel/minimize.json | 4 +++ config/kernel/power.json | 19 ++++++++++ config/kernel/psave.json | 13 +++++++ config/kernel/rk35xx.json | 68 +++-------------------------------- config/kernel/stats.json | 13 +++++++ config/kernel/systems.json | 32 ++++++++++++++--- config/kernel/usb.json | 39 ++++++++++++++++++++ config/kernel_meta.json | 3 +- 12 files changed, 190 insertions(+), 77 deletions(-) create mode 100644 config/kernel/power.json diff --git a/cfg/kernel_v6.16-rc2 b/cfg/kernel_v6.16-rc2 index c6fedc4..9f8c0ae 100644 --- a/cfg/kernel_v6.16-rc2 +++ b/cfg/kernel_v6.16-rc2 @@ -11,8 +11,8 @@ CONFIG_AS_VERSION=24500 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24500 CONFIG_LLD_VERSION=0 -CONFIG_RUSTC_VERSION=108401 -CONFIG_RUSTC_LLVM_VERSION=190105 +CONFIG_RUSTC_VERSION=108800 +CONFIG_RUSTC_LLVM_VERSION=200105 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y @@ -23,6 +23,8 @@ CONFIG_CC_HAS_COUNTED_BY=y CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING=y CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y CONFIG_RUSTC_HAS_COERCE_POINTEE=y +CONFIG_RUSTC_HAS_SPAN_FILE=y +CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -143,8 +145,8 @@ CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y # CONFIG_IKHEADERS is not set -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_PRINTK_INDEX is not set CONFIG_GENERIC_SCHED_CLOCK=y @@ -226,7 +228,7 @@ CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y -# CONFIG_SHMEM is not set +CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y @@ -918,7 +920,7 @@ CONFIG_PERCPU_STATS=y # CONFIG_GUP_TEST is not set # CONFIG_DMAPOOL_TEST is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y -# CONFIG_MEMFD_CREATE is not set +CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y # CONFIG_ANON_VMA_NAME is not set # CONFIG_USERFAULTFD is not set @@ -4511,6 +4513,7 @@ CONFIG_PL330_DMA=y # CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set +# CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set # CONFIG_DMABUF_SELFTESTS is not set @@ -5671,6 +5674,11 @@ 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_TMPFS_INODE64 is not set +# CONFIG_TMPFS_QUOTA is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y # CONFIG_HUGETLBFS is not set CONFIG_ARCH_HAS_GIGANTIC_PAGE=y diff --git a/config/kernel/btt_boards.json b/config/kernel/btt_boards.json index a4caa6e..1b5b737 100644 --- a/config/kernel/btt_boards.json +++ b/config/kernel/btt_boards.json @@ -6,10 +6,14 @@ [ "rk3566", "serial_embed", - "media_camera_usb", "fs_min", "fs_misc", - "system_debug" + "system_debug", + "kbd_min", + "mouse_min", + "touch_min", + "usb_storage", + "usb_video" ], "options": [ diff --git a/config/kernel/io.json b/config/kernel/io.json index 2c5112c..7b4be5d 100644 --- a/config/kernel/io.json +++ b/config/kernel/io.json @@ -18,5 +18,38 @@ "CONFIG_LEDS_TRIGGER_PANIC=y", "CONFIG_LEDS_TRIGGER_NETDEV=y" ] + }, + { + "name": "kbd_min", + "options": + [ + "#Keyboards", + "CONFIG_INPUT=y", + "CONFIG_INPUT_MISC=y", + "CONFIG_INPUT_EVDEV=y", + "CONFIG_INPUT_KEYBOARD=y", + "CONFIG_KEYBOARD_GPIO=y" + ] + }, + { + "name": "mouse_min", + "options": + [ + "#Mouse", + "CONFIG_INPUT=y", + "CONFIG_INPUT_MISC=y", + "CONFIG_INPUT_MOUSEDEV=y", + "CONFIG_INPUT_MOUSE=y", + "CONFIG_MOUSE_SYNAPTICS_USB=y" + ] + }, + { + "name": "touch_min", + "options": + [ + "#Touchscreen", + "CONFIG_INPUT_MISC=y", + "CONFIG_HID_MULTITOUCH=y" + ] } ] diff --git a/config/kernel/media.json b/config/kernel/media.json index 60e4d10..6d0ff31 100644 --- a/config/kernel/media.json +++ b/config/kernel/media.json @@ -6,6 +6,7 @@ "CONFIG_MEDIA_SUPPORT=y", "CONFIG_MEDIA_SUPPORT_FILTER=y", "CONFIG_MEDIA_SUBDRV_AUTOSELECT=y", + "CONFIG_MEDIA_PLATFORM_SUPPORT=y", "CONFIG_MEDIA_ANALOG_TV_SUPPORT=n", "CONFIG_MEDIA_DIGITAL_TV_SUPPORT=n", "CONFIG_MEDIA_RADIO_SUPPORT=n", @@ -23,7 +24,6 @@ "options": [ "CONFIG_MEDIA_CAMERA_SUPPORT=y", - "CONFIG_MEDIA_PLATFORM_SUPPORT=y", "CONFIG_MEDIA_USB_SUPPORT=y" ] }, @@ -51,5 +51,18 @@ "CONFIG_STAGING_MEDIA=y", "CONFIG_VIDEO_ROCKCHIP_VDEC2=y" ] + }, + { + "name": "media_v4l", + "depends": + [ + "media_base" + ], + "options": + [ + "CONFIG_V4L_MEM2MEM_DRIVERS=y", + "CONFIG_V4L_PLATFORM_DRIVERS=y", + "CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y" + ] } ] diff --git a/config/kernel/minimize.json b/config/kernel/minimize.json index 17cfca4..78940ef 100644 --- a/config/kernel/minimize.json +++ b/config/kernel/minimize.json @@ -59,6 +59,10 @@ "CONFIG_XZ_DEC_RISCV=n", "# CONFIG_XZ_DEC_MICROLZMA is not set", "CONFIG_XZ_DEC_BCJ=n", + "CONFIG_USB_DWC3_HAPS=n", + "CONFIG_EEPROM_AT25=n", + "CONFIG_EEPROM_93CX6=n", + "CONFIG_VM_EVENT_COUNTERS=n", "CONFIG_NET_VENDOR_MYRI=n", "CONFIG_NET_VENDOR_ALACRITECH=n", "CONFIG_NET_VENDOR_AMAZON=n", diff --git a/config/kernel/power.json b/config/kernel/power.json new file mode 100644 index 0000000..25b470f --- /dev/null +++ b/config/kernel/power.json @@ -0,0 +1,19 @@ +[ + { + "name": "power_base", + "options": + [ + "CONFIG_REGULATOR=y", + "CONFIG_REGULATOR_FIXED_VOLTAGE=y", + "CONFIG_REGULATOR_GPIO=y", + "CONFIG_RESET_CONTROLLER=y", + "CONFIG_POWER_RESET_SYSCON=y", + "CONFIG_POWER_RESET_SYSCON_POWEROFF=y", + "CONFIG_POWER_RESET_RESTART=y", + "CONFIG_POWER_RESET_REGULATOR=y", + "CONFIG_POWER_SYSCON_REBOOT_MODE=y", + "CONFIG_SENSORS_ARM_SCPI=y", + "CONFIG_SENSORS_GPIO_FAN=y" + ] + } +] diff --git a/config/kernel/psave.json b/config/kernel/psave.json index bfe0247..5855ad9 100644 --- a/config/kernel/psave.json +++ b/config/kernel/psave.json @@ -37,6 +37,18 @@ "CONFIG_DEVFREQ_GOV_PASSIVE=y" ] }, + { + "name": "psave_scmi", + "options": + [ + "CONFIG_ARM_SCMI_PROTOCOL=y", + "CONFIG_ARM_SCMI_HAVE_SHMEM=y", + "CONFIG_ARM_SCMI_TRANSPORT_SMC=y", + "CONFIG_ARM_SCMI_CPUFREQ=y", + "CONFIG_COMMON_CLK_SCMI=y", + "CONFIG_SENSORS_ARM_SCMI=y" + ] + }, { "name": "psave_rk", "depends": @@ -45,6 +57,7 @@ ], "options": [ + "CONFIG_ARM_SCPI_PROTOCOL=y", "CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y" ] } diff --git a/config/kernel/rk35xx.json b/config/kernel/rk35xx.json index cbb3cdc..572fd73 100644 --- a/config/kernel/rk35xx.json +++ b/config/kernel/rk35xx.json @@ -30,11 +30,8 @@ "CONFIG_CLK_RK3568=n", "CONFIG_CLK_RK3576=n", "CONFIG_CLK_RK3588=n", - "CONFIG_PERF_EVENTS=y", - "CONFIG_HW_PERF_EVENTS=y", "CONFIG_ARM_PMUV3=y", "CONFIG_ROCKCHIP_IODOMAIN=y", - "CONFIG_REGULATOR=y", "CONFIG_ROCKCHIP_PM_DOMAINS=y", "CONFIG_CPU_IDLE=y", "CONFIG_ARM_PSCI_CPUIDLE=y", @@ -42,13 +39,7 @@ "CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y", "CONFIG_ARM_PSCI_FW=y", "CONFIG_SHMEM=y", - "CONFIG_ARM_SCMI_PROTOCOL=y", - "CONFIG_ARM_SCMI_HAVE_SHMEM=y", - "CONFIG_ARM_SCMI_TRANSPORT_SMC=y", - "CONFIG_ARM_SCMI_CPUFREQ=y", - "CONFIG_REGULATOR_FIXED_VOLTAGE=y", "CONFIG_COMMON_CLK=y", - "CONFIG_COMMON_CLK_SCMI=y", "CONFIG_COMMON_CLK_RK808=y", "CONFIG_SRAM=y" ] @@ -96,7 +87,10 @@ "media_rk", "pci_rk_dw", "nvme_blk", - "drm_panfrost" + "drm_panfrost", + "usb_dwc3", + "psave_scmi", + "power_base" ], "options": [ @@ -113,11 +107,8 @@ [ "CONFIG_PWM=y", - "CONFIG_USB_DWC3=y", - "CONFIG_USB_DWC3_HOST=y", "CONFIG_I2C_RK3X=y", "CONFIG_PWM_ROCKCHIP=y", - "CONFIG_V4L_MEM2MEM_DRIVERS=y", "CONFIG_VIDEO_ROCKCHIP_RGA=y", "CONFIG_HW_RANDOM_ROCKCHIP=y", "CONFIG_ROCKCHIP_SARADC=y", @@ -126,7 +117,6 @@ "CONFIG_SPI_MASTER=y", "CONFIG_SPI_ROCKCHIP=y", "CONFIG_SPI_ROCKCHIP_SFC=y", - "CONFIG_EXTCON=y", "CONFIG_PHY_ROCKCHIP_INNO_USB2=y", "CONFIG_WATCHDOG=y", "CONFIG_DW_WATCHDOG=y", @@ -134,12 +124,8 @@ "CONFIG_NVMEM_ROCKCHIP_EFUSE=y", "CONFIG_NVMEM_ROCKCHIP_OTP=y", "CONFIG_PHY_ROCKCHIP_EMMC=y", - "CONFIG_INPUT_MISC=y", "# to review", - "CONFIG_SYSVIPC=y", - "CONFIG_SYSVIPC_COMPAT=y", - "CONFIG_POSIX_MQUEUE=y", "CONFIG_I2C=y", "CONFIG_I2C_CHARDEV=y", "CONFIG_I2C_MUX_PINCTRL=y", @@ -147,75 +133,33 @@ "CONFIG_NVMEM=y", "CONFIG_PINMUX=y", "CONFIG_RPMB=y", - "CONFIG_RESET_CONTROLLER=y", "CONFIG_DMADEVICES=y", - "CONFIG_PERF_EVENTS=y", - "CONFIG_HW_PERF_EVENTS=y", "CONFIG_MAILBOX=y", - "CONFIG_REGULATOR=y", - "CONFIG_INPUT_MOUSEDEV=y", "CONFIG_INPUT_TOUCHSCREEN=y", - "CONFIG_ARM_SCMI_PROTOCOL=y", - "CONFIG_ARM_PSCI_CPUIDLE=y", - "CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y", "CONFIG_BLK_WBT=y", "CONFIG_BLK_WBT_MQ=y", - "CONFIG_PERCPU_STATS=y", - "CONFIG_VM_EVENT_COUNTERS=n", "CONFIG_VIDEO_DEV=y", - "CONFIG_GENERIC_IRQ_CHIP=y", "CONFIG_REGMAP_MMIO=y", - "CONFIG_HAS_IOMEM=y", "#debug?", "#system", - "CONFIG_ARM_GIC=y", - "CONFIG_ARM_GIC_V3=y", + "CONFIG_GENERIC_IRQ_CHIP=y", "CONFIG_PL330_DMA=y", - "CONFIG_ARM_SCPI_PROTOCOL=y", "#CONFIG_BT_HCIUART_BCM=y", "CONFIG_I2C_GPIO=y", "CONFIG_PWRSEQ_SIMPLE=y", "CONFIG_SENSORS_PWM_FAN=y", "CONFIG_OF_GPIO=y", - "CONFIG_DUMP_REG_MISC=y", - "CONFIG_REGULATOR_GPIO=y", - "CONFIG_SCSI=y", "CONFIG_USB_ACM=m", "#for system software", - "CONFIG_KEXEC_CORE=y", - "CONFIG_KEXEC=y", - "CONFIG_KEXEC_FILE=y", "CONFIG_UEVENT_HELPER=y", "CONFIG_UEVENT_HELPER_PATH=\"\"", - "CONFIG_INPUT_EVDEV=y", - "CONFIG_KEYBOARD_GPIO=y", - "CONFIG_MOUSE_SYNAPTICS_USB=y", "CONFIG_GPIO_SYSFS=y", - "CONFIG_POWER_RESET_SYSCON=y", - "CONFIG_POWER_RESET_SYSCON_POWEROFF=y", - "CONFIG_POWER_RESET_RESTART=y", - "CONFIG_POWER_RESET_REGULATOR=y", - "CONFIG_POWER_SYSCON_REBOOT_MODE=y", - "CONFIG_SENSORS_ARM_SCMI=y", - "CONFIG_SENSORS_ARM_SCPI=y", - "CONFIG_SENSORS_GPIO_FAN=y", - "CONFIG_USB_VIDEO_CLASS=y", - "CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y", - "CONFIG_V4L_PLATFORM_DRIVERS=y", - "CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y", - "CONFIG_HID_MULTITOUCH=y", "CONFIG_HW_RANDOM=y", "#sensors", "CONFIG_W1=y", "CONFIG_W1_MASTER_GPIO=y", "CONFIG_W1_SLAVE_THERM=y", - "#systemd", - "CONFIG_BPF_SYSCALL=y", - "CONFIG_CGROUP_BPF=y", - "CONFIG_UNIX=y", "#USB", - "CONFIG_USB_STORAGE=y", - "CONFIG_USB_DWC3_HAPS=n", "#vido, audio", "CONFIG_MEDIA_CEC_SUPPORT=y", "#Both", @@ -228,8 +172,6 @@ "CONFIG_EMAC_ROCKCHIP=y", "#EEPROM", "CONFIG_EEPROM_AT24=y", - "CONFIG_EEPROM_AT25=n", - "CONFIG_EEPROM_93CX6=n", "#eth", "#typeC", "#CONFIG_TYPEC=y" diff --git a/config/kernel/stats.json b/config/kernel/stats.json index 61ebfaf..6958c24 100644 --- a/config/kernel/stats.json +++ b/config/kernel/stats.json @@ -24,5 +24,18 @@ "CONFIG_PID_NS=y", "CONFIG_NET_NS=y" ] + }, + { + "name": "stats_perf", + "depends": + [ + "stats_base" + ], + "options": + [ + "CONFIG_PERCPU_STATS=y", + "CONFIG_PERF_EVENTS=y", + "CONFIG_HW_PERF_EVENTS=y" + ] } ] diff --git a/config/kernel/systems.json b/config/kernel/systems.json index 83d81c1..958637b 100644 --- a/config/kernel/systems.json +++ b/config/kernel/systems.json @@ -33,6 +33,30 @@ "CONFIG_OF_CONFIGFS=y" ] }, + { + "name": "linux_base", + "depends": + [ + "system_all", + "overlays", + "stats_perf" + ], + "options": + [ + "#systemd", + "CONFIG_BPF_SYSCALL=y", + "CONFIG_CGROUP_BPF=y", + "CONFIG_UNIX=y", + "#base", + "CONFIG_KEXEC_CORE=y", + "CONFIG_KEXEC=y", + "CONFIG_KEXEC_FILE=y", + "CONFIG_HAS_IOMEM=y", + "CONFIG_SYSVIPC=y", + "CONFIG_SYSVIPC_COMPAT=y", + "CONFIG_POSIX_MQUEUE=y" + ] + }, { "name": "arm64_errata", "options": @@ -86,10 +110,8 @@ "name": "arm64", "depends": [ - "system_all", - "overlays", - "arm64_errata", - "stats_base" + "linux_base", + "arm64_errata" ], "options": [ @@ -105,6 +127,8 @@ "CONFIG_THERMAL_GOV_STEP_WISE=y", "CONFIG_THERMAL_GOV_BANG_BANG=y", "CONFIG_THERMAL_GOV_USER_SPACE=y", + "CONFIG_ARM_GIC=y", + "CONFIG_ARM_GIC_V3=y", "CONFIG_CRYPTO=y", "CONFIG_CRYPTO_HW=y", "CONFIG_NLS_ASCII=y", diff --git a/config/kernel/usb.json b/config/kernel/usb.json index db87698..082e131 100644 --- a/config/kernel/usb.json +++ b/config/kernel/usb.json @@ -3,6 +3,7 @@ "name": "usb_base", "options": [ + "CONFIG_EXTCON=y", "CONFIG_USB_NET_DRIVERS=n", "CONFIG_USB_XHCI_PCI=n", "CONFIG_USB=y" @@ -43,5 +44,43 @@ "CONFIG_USB_XHCI_HCD=y", "CONFIG_USB_XHCI_PLATFORM=y" ] + }, + { + "name": "usb_dwc3", + "depends": + [ + "usb_base" + ], + "options": + [ + "CONFIG_USB_DWC3=y", + "CONFIG_USB_DWC3_HOST=y" + ] + }, + { + "name": "usb_storage", + "depends": + [ + "usb_base" + ], + "options": + [ + "CONFIG_SCSI=y", + "CONFIG_USB_STORAGE=y" + ] + }, + { + "name": "usb_video", + "depends": + [ + "usb_base", + "media_camera_usb", + "media_v4l" + ], + "options": + [ + "CONFIG_USB_VIDEO_CLASS=y", + "CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y" + ] } ] diff --git a/config/kernel_meta.json b/config/kernel_meta.json index 3812788..5fac64e 100644 --- a/config/kernel_meta.json +++ b/config/kernel_meta.json @@ -16,6 +16,7 @@ "drm", "media", "fs", - "stats" + "stats", + "power" ] }