From c2c2e8a825e1376e30996af0564d69a625e06ff8 Mon Sep 17 00:00:00 2001 From: Andrey Leonchikov Date: Tue, 16 Sep 2025 20:33:08 +0200 Subject: [PATCH] Create more cconfiguration sets. --- cfg/kernel_v6.16-rc2 | 2 +- config/kernel/btt_boards.json | 20 +-------- config/kernel/drm.json | 67 ++++++++++++++++++++++++++++++ config/kernel/psave.json | 45 ++++++++++++++++++++ config/kernel/rk35xx.json | 77 ++++++++++------------------------- config/kernel/serial.json | 16 ++++++++ config/kernel/storage.json | 38 ++++++++++++++++- config/kernel/systems.json | 26 +++++++++++- config/kernel/usb.json | 13 ++++++ config/kernel_meta.json | 4 +- 10 files changed, 231 insertions(+), 77 deletions(-) create mode 100644 config/kernel/drm.json create mode 100644 config/kernel/psave.json diff --git a/cfg/kernel_v6.16-rc2 b/cfg/kernel_v6.16-rc2 index 2e20668..8186738 100644 --- a/cfg/kernel_v6.16-rc2 +++ b/cfg/kernel_v6.16-rc2 @@ -4126,7 +4126,7 @@ CONFIG_USB_DWC3_OF_SIMPLE=y # CONFIG_USB_SERIAL=y # CONFIG_USB_SERIAL_CONSOLE is not set -CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_GENERIC is not set # CONFIG_USB_SERIAL_SIMPLE is not set # CONFIG_USB_SERIAL_AIRCABLE is not set # CONFIG_USB_SERIAL_ARK3116 is not set diff --git a/config/kernel/btt_boards.json b/config/kernel/btt_boards.json index 44a7c2a..ee5df09 100644 --- a/config/kernel/btt_boards.json +++ b/config/kernel/btt_boards.json @@ -16,27 +16,11 @@ "save_path": "arch/arm64/configs/btt_pi2_printer_defconfig", "depends": [ - "rk3566" + "rk3566", + "serial_embed" ], "options": [ - "CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y", - "#Cortex-A53 errata fixes", - "CONFIG_ARM64_ERRATUM_826319=y", - "CONFIG_ARM64_ERRATUM_827319=y", - "CONFIG_ARM64_ERRATUM_824069=y", - "CONFIG_ARM64_ERRATUM_819472=y", - "CONFIG_ARM64_ERRATUM_843419=y", - "#Cortex-A57 errata fixes", - "CONFIG_ARM64_ERRATUM_832075=y", - "#Cortex-A55 errata fixes", - "CONFIG_ARM64_ERRATUM_1024718=y", - "CONFIG_ARM64_ERRATUM_1530923=y", - - "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_LOCALVERSION=\"-arm64\"", "CONFIG_LOCALVERSION_AUTO=n", "CONFIG_CLK_RK3528=y", diff --git a/config/kernel/drm.json b/config/kernel/drm.json new file mode 100644 index 0000000..1837473 --- /dev/null +++ b/config/kernel/drm.json @@ -0,0 +1,67 @@ +[ + { + "name": "drm", + "options": + [ + "CONFIG_DRM=y", + "CONFIG_DRM_DISPLAY_CONNECTOR=y" + ] + }, + { + "name": "drm_dw_hdmi", + "depends": + [ + "drm" + ], + "options": + [ + "CONFIG_DRM_DISPLAY_HDMI_AUDIO_HELPER=y", + "CONFIG_DRM_DW_HDMI=y", + "CONFIG_DRM_DW_HDMI_AHB_AUDIO=y", + "CONFIG_DRM_DW_HDMI_I2S_AUDIO=y", + "CONFIG_DRM_DW_HDMI_CEC=y" + ] + }, + { + "name": "drm_dsi_base", + "depends": + [ + "drm" + ], + "options": + [ + "CONFIG_BACKLIGHT_CLASS_DEVICE=y", + "CONFIG_BACKLIGHT_PWM=y", + "CONFIG_DRM_PANEL_SIMPLE=m", + "# platform specific, depends on different options", + "CONFIG_ROCKCHIP_DW_HDMI=y" + ] + }, + { + "name": "drm_dw_dsi", + "depends": + [ + "drm_dsi_base" + ], + "options": + [ + "CONFIG_DRM_DW_MIPI_DSI=y", + "CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m", + "CONFIG_DRM_PANEL_DSI_CM=m", + "# platform specific, depends on different options", + "CONFIG_ROCKCHIP_DW_MIPI_DSI=y" + ] + }, + { + "name": "drm_rk", + "depends": + [ + "drm" + ], + "options": + [ + "CONFIG_DRM_ROCKCHIP=y", + "CONFIG_ROCKCHIP_VOP2=y" + ] + } +] diff --git a/config/kernel/psave.json b/config/kernel/psave.json new file mode 100644 index 0000000..94af7e9 --- /dev/null +++ b/config/kernel/psave.json @@ -0,0 +1,45 @@ +[ + { + "name": "psave_cpuidle", + "options": + [ + "CONFIG_CPU_IDLE=y", + "CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y", + "CONFIG_CPU_IDLE_GOV_MENU=y", + "CONFIG_DT_IDLE_STATES=y", + "CONFIG_DT_IDLE_GENPD=y" + ] + }, + { + "name": "psave_cpufreq", + "options": + [ + "CONFIG_CPU_FREQ=y", + "CONFIG_CPU_FREQ_GOV_COMMON=y", + "CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y", + "CONFIG_CPU_FREQ_GOV_POWERSAVE=y", + "CONFIG_CPU_FREQ_GOV_USERSPACE=y", + "CONFIG_CPU_FREQ_GOV_ONDEMAND=y", + "CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y" + ] + }, + { + "name": "psave_devfreq", + "options": + [ + "CONFIG_PM_DEVFREQ=y", + "CONFIG_PM_DEVFREQ_EVENT=y" + ] + }, + { + "name": "psave_rk", + "depends": + [ + "psave_devfreq" + ], + "options": + [ + "CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y" + ] + } +] diff --git a/config/kernel/rk35xx.json b/config/kernel/rk35xx.json index cd6a65c..b9d125d 100644 --- a/config/kernel/rk35xx.json +++ b/config/kernel/rk35xx.json @@ -68,7 +68,7 @@ ] }, { - "name": "rk3566", + "name": "rk3568", "depends": [ "rk_base", @@ -79,41 +79,35 @@ "mmc", "8250_dw", "audio_rk_meta", - "leds" + "leds", + "usb_xhci", + "serial_embed", + "mmc_dwc", + "psave_rk", + "drm_rk", + "drm_dw_hdmi", + "drm_dw_dsi", + "mtd_nor", + "psave_cpufreq", + "psave_cpuidle" + ], + "options": + [ + ] + }, + { + "name": "rk3566", + "depends": + [ + "rk3568" ], "options": [ "CONFIG_PWM=y", "CONFIG_DEBUG_FS=y", "CONFIG_DEBUG_FS_ALLOW_ALL=y", - "#devfreq", - "CONFIG_PM_DEVFREQ=y", - "CONFIG_PM_DEVFREQ_EVENT=y", - "CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y", - "CONFIG_MMC_SDHCI=y", - "CONFIG_MMC_SDHCI_PLTFM=y", - "CONFIG_MMC_SDHCI_OF_DWCMSHC=y", "CONFIG_CLK_RK3568=y", - "CONFIG_DRM=y", - "CONFIG_DRM_DISPLAY_CONNECTOR=y", - "CONFIG_DRM_DISPLAY_HDMI_AUDIO_HELPER=y", - "CONFIG_DRM_DW_HDMI=y", - "CONFIG_DRM_DW_HDMI_AHB_AUDIO=y", - "CONFIG_DRM_DW_HDMI_I2S_AUDIO=y", - "CONFIG_DRM_DW_HDMI_CEC=y", - "CONFIG_DRM_DW_MIPI_DSI=y", - "CONFIG_BACKLIGHT_CLASS_DEVICE=y", - "CONFIG_BACKLIGHT_PWM=y", - "CONFIG_DRM_PANEL_SIMPLE=m", - "CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m", - "CONFIG_DRM_PANEL_DSI_CM=m", - - "CONFIG_DRM_ROCKCHIP=y", - "CONFIG_ROCKCHIP_VOP2=y", - "CONFIG_ROCKCHIP_DW_HDMI=y", - "CONFIG_ROCKCHIP_DW_MIPI_DSI=y", - "CONFIG_MEDIA_SUPPORT=y", "CONFIG_MEDIA_SUPPORT_FILTER=y", "CONFIG_MEDIA_SUBDRV_AUTOSELECT=y", @@ -133,8 +127,6 @@ "CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y", "CONFIG_USB_DWC3=y", "CONFIG_USB_DWC3_HOST=y", - "CONFIG_MMC_DW=y", - "CONFIG_MMC_DW_ROCKCHIP=y", "CONFIG_I2C_RK3X=y", "CONFIG_PCI=y", "CONFIG_PCIE_ROCKCHIP_DW=y", @@ -170,10 +162,6 @@ "#NVMe", "CONFIG_NVME_CORE=y", "CONFIG_BLK_DEV_NVME=y", - "CONFIG_MTD=y", - "CONFIG_MTD_BLKDEVS=y", - "CONFIG_MTD_BLOCK=y", - "CONFIG_MTD_SPI_NOR=y", "# to review", "CONFIG_SYSVIPC=y", @@ -185,14 +173,12 @@ "CONFIG_I2C_MUX_REG=y", "CONFIG_NVMEM=y", "CONFIG_PINMUX=y", - "CONFIG_MMC=y", "CONFIG_RPMB=y", "CONFIG_RESET_CONTROLLER=y", "CONFIG_ARM64=y", "CONFIG_DMADEVICES=y", "CONFIG_IIO=y", "CONFIG_DHT11=m", - "CONFIG_CPU_FREQ=y", "CONFIG_PERF_EVENTS=y", "CONFIG_HW_PERF_EVENTS=y", "CONFIG_MAILBOX=y", @@ -200,19 +186,8 @@ "CONFIG_INPUT_MOUSEDEV=y", "CONFIG_INPUT_TOUCHSCREEN=y", "CONFIG_ARM_SCMI_PROTOCOL=y", - "CONFIG_CPU_IDLE=y", - "CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y", - "CONFIG_CPU_IDLE_GOV_MENU=y", - "CONFIG_DT_IDLE_STATES=y", - "CONFIG_DT_IDLE_GENPD=y", "CONFIG_ARM_PSCI_CPUIDLE=y", "CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y", - "CONFIG_CPU_FREQ_GOV_COMMON=y", - "CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y", - "CONFIG_CPU_FREQ_GOV_POWERSAVE=y", - "CONFIG_CPU_FREQ_GOV_USERSPACE=y", - "CONFIG_CPU_FREQ_GOV_ONDEMAND=y", - "CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y", "CONFIG_BLK_WBT=y", "CONFIG_BLK_WBT_MQ=y", "CONFIG_PERCPU_STATS=y", @@ -409,9 +384,6 @@ "CONFIG_V4L_PLATFORM_DRIVERS=y", "CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y", "CONFIG_HID_MULTITOUCH=y", - "CONFIG_USB_XHCI_HCD=y", - "CONFIG_USB_XHCI_PLATFORM=y", - "CONFIG_USB_XHCI_PCI=n", "CONFIG_DEVFREQ_GOV_PERFORMANCE=y", "CONFIG_DEVFREQ_GOV_POWERSAVE=y", "CONFIG_DEVFREQ_GOV_USERSPACE=y", @@ -428,11 +400,6 @@ "#USB", "CONFIG_USB_STORAGE=y", "CONFIG_USB_DWC3_HAPS=n", - "CONFIG_USB_SERIAL=y", - "CONFIG_USB_SERIAL_GENERIC=y", - "CONFIG_USB_SERIAL_CH341=y", - "CONFIG_USB_SERIAL_CP210X=y", - "CONFIG_USB_SERIAL_FTDI_SIO=y", "#vido, audio", "CONFIG_MEDIA_CEC_SUPPORT=y", "#network", diff --git a/config/kernel/serial.json b/config/kernel/serial.json index e5ccc54..b2fec73 100644 --- a/config/kernel/serial.json +++ b/config/kernel/serial.json @@ -3,6 +3,7 @@ "name": "8250_base", "options": [ + "CONFIG_TTY=y", "CONFIG_SERIAL_8250=y", "CONFIG_SERIAL_OF_PLATFORM=y", "CONFIG_SERIAL_DEV_BUS=y", @@ -23,5 +24,20 @@ [ "CONFIG_SERIAL_8250_DW=y" ] + }, + { + "name": "serial_embed", + "depends": + [ + "8250_base" + ], + "options": + [ + "CONFIG_USB_SERIAL=y", + "CONFIG_USB_SERIAL_GENERIC=n", + "CONFIG_USB_SERIAL_CH341=y", + "CONFIG_USB_SERIAL_CP210X=y", + "CONFIG_USB_SERIAL_FTDI_SIO=y" + ] } ] diff --git a/config/kernel/storage.json b/config/kernel/storage.json index 472b328..9fafd61 100644 --- a/config/kernel/storage.json +++ b/config/kernel/storage.json @@ -3,7 +3,43 @@ "name": "mmc", "options": [ - "CONFIG_MMC=y" + "CONFIG_MMC=y", + "CONFIG_MMC_SDHCI=y", + "CONFIG_MMC_SDHCI_PLTFM=y" + ] + }, + { + "name": "mmc_dwc", + "depends": + [ + "mmc" + ], + "options": + [ + "CONFIG_MMC_DW=y", + "CONFIG_MMC_DW_ROCKCHIP=y", + "CONFIG_MMC_SDHCI_OF_DWCMSHC=y" + ] + }, + { + "name": "mtd_blk", + "options": + [ + "CONFIG_BLOCK=y", + "CONFIG_MTD=y", + "CONFIG_MTD_BLKDEVS=y", + "CONFIG_MTD_BLOCK=y" + ] + }, + { + "name": "mtd_nor", + "depends": + [ + "mtd_blk" + ], + "options": + [ + "CONFIG_MTD_SPI_NOR=y" ] } ] diff --git a/config/kernel/systems.json b/config/kernel/systems.json index e26d81c..02ce996 100644 --- a/config/kernel/systems.json +++ b/config/kernel/systems.json @@ -33,12 +33,36 @@ "CONFIG_OF_CONFIGFS=y" ] }, + { + "name": "arm64_errata", + "options": + [ + "CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y", + "#Cortex-A53 errata fixes", + "CONFIG_ARM64_ERRATUM_826319=y", + "CONFIG_ARM64_ERRATUM_827319=y", + "CONFIG_ARM64_ERRATUM_824069=y", + "CONFIG_ARM64_ERRATUM_819472=y", + "CONFIG_ARM64_ERRATUM_843419=y", + "#Cortex-A57 errata fixes", + "CONFIG_ARM64_ERRATUM_832075=y", + "#Cortex-A55 errata fixes", + "CONFIG_ARM64_ERRATUM_1024718=y", + "CONFIG_ARM64_ERRATUM_1530923=y", + + "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" + ] + }, { "name": "arm64", "depends": [ "system_all", - "overlays" + "overlays", + "arm64_errata" ], "options": [ diff --git a/config/kernel/usb.json b/config/kernel/usb.json index d9f67b7..db87698 100644 --- a/config/kernel/usb.json +++ b/config/kernel/usb.json @@ -4,6 +4,7 @@ "options": [ "CONFIG_USB_NET_DRIVERS=n", + "CONFIG_USB_XHCI_PCI=n", "CONFIG_USB=y" ] }, @@ -30,5 +31,17 @@ "CONFIG_USB_OHCI_HCD_PLATFORM=y", "CONFIG_USB_OHCI_HCD=y" ] + }, + { + "name": "usb_xhci", + "depends": + [ + "usb_base" + ], + "options": + [ + "CONFIG_USB_XHCI_HCD=y", + "CONFIG_USB_XHCI_PLATFORM=y" + ] } ] diff --git a/config/kernel_meta.json b/config/kernel_meta.json index eafa30e..4eaeb08 100644 --- a/config/kernel_meta.json +++ b/config/kernel_meta.json @@ -11,6 +11,8 @@ "sunxi", "serial", "audio", - "io" + "io", + "psave", + "drm" ] }