From 06e46a8669ea82dc19744e9a0e230f8e3f6cadb4 Mon Sep 17 00:00:00 2001 From: Andrei Leonchikov Date: Wed, 24 Sep 2025 20:08:29 +0000 Subject: [PATCH] Sort all basic configurations. --- cfg/kernel_v6.16-rc2 | 2 +- config/kernel/btt_boards.json | 5 +- config/kernel/i2c.json | 13 +++++ config/kernel/io.json | 10 ++++ config/kernel/media.json | 1 + config/kernel/rk35xx.json | 95 ++++++++--------------------------- config/kernel/sensors.json | 12 +++++ config/kernel/spi.json | 13 +++++ config/kernel/sys_dev.json | 70 ++++++++++++++++++++++++++ config/kernel/usb.json | 3 +- config/kernel_meta.json | 6 ++- 11 files changed, 151 insertions(+), 79 deletions(-) create mode 100644 config/kernel/i2c.json create mode 100644 config/kernel/sensors.json create mode 100644 config/kernel/spi.json create mode 100644 config/kernel/sys_dev.json diff --git a/cfg/kernel_v6.16-rc2 b/cfg/kernel_v6.16-rc2 index 9f8c0ae..4be5513 100644 --- a/cfg/kernel_v6.16-rc2 +++ b/cfg/kernel_v6.16-rc2 @@ -4095,7 +4095,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set +CONFIG_USB_UAS=y # # USB Imaging devices diff --git a/config/kernel/btt_boards.json b/config/kernel/btt_boards.json index 1b5b737..785a7e4 100644 --- a/config/kernel/btt_boards.json +++ b/config/kernel/btt_boards.json @@ -13,12 +13,15 @@ "mouse_min", "touch_min", "usb_storage", - "usb_video" + "usb_video", + "spi_rk", + "w1_base" ], "options": [ "CONFIG_IIO=y", "CONFIG_DHT11=m", + "CONFIG_COMMON_CLK_RK808=y", "CONFIG_MFD_RK8XX_I2C=y", "CONFIG_RTC_CLASS=y", "CONFIG_RTC_DRV_RK808=y", diff --git a/config/kernel/i2c.json b/config/kernel/i2c.json new file mode 100644 index 0000000..7f2fa6f --- /dev/null +++ b/config/kernel/i2c.json @@ -0,0 +1,13 @@ +[ + { + "name": "i2c_base", + "options": + [ + "CONFIG_I2C=y", + "CONFIG_I2C_CHARDEV=y", + "CONFIG_I2C_MUX_PINCTRL=y", + "CONFIG_I2C_MUX_REG=y", + "CONFIG_I2C_GPIO=y" + ] + } +] diff --git a/config/kernel/io.json b/config/kernel/io.json index 7b4be5d..5787a8a 100644 --- a/config/kernel/io.json +++ b/config/kernel/io.json @@ -49,7 +49,17 @@ [ "#Touchscreen", "CONFIG_INPUT_MISC=y", + "CONFIG_INPUT_TOUCHSCREEN=y", "CONFIG_HID_MULTITOUCH=y" ] + }, + { + "name": "gpio_base", + "options": + [ + "#GPIO", + "CONFIG_OF_GPIO=y", + "CONFIG_GPIO_SYSFS=y" + ] } ] diff --git a/config/kernel/media.json b/config/kernel/media.json index 6d0ff31..8e43973 100644 --- a/config/kernel/media.json +++ b/config/kernel/media.json @@ -60,6 +60,7 @@ ], "options": [ + "CONFIG_VIDEO_DEV=y", "CONFIG_V4L_MEM2MEM_DRIVERS=y", "CONFIG_V4L_PLATFORM_DRIVERS=y", "CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y" diff --git a/config/kernel/rk35xx.json b/config/kernel/rk35xx.json index 572fd73..874275b 100644 --- a/config/kernel/rk35xx.json +++ b/config/kernel/rk35xx.json @@ -5,10 +5,17 @@ [ "arm64", "net_base", - "drm_fb" + "drm_fb", + "pwm", + "hw_rand_rk", + "nvmem_rk", + "gpio_base", + "dma", + "misc" ], "options": [ + "CONFIG_PWM_ROCKCHIP=y", "CONFIG_OF=y", "CONFIG_BLK_DEV_LOOP=y", "CONFIG_BLK_DEV_SD=y", @@ -40,7 +47,6 @@ "CONFIG_ARM_PSCI_FW=y", "CONFIG_SHMEM=y", "CONFIG_COMMON_CLK=y", - "CONFIG_COMMON_CLK_RK808=y", "CONFIG_SRAM=y" ] }, @@ -48,16 +54,24 @@ "name": "rk35xx", "depends": [ - "rk_base" + "rk_base", + "wdt" ], "options": [ "CONFIG_CRYPTO_DEV_ROCKCHIP2=y", + "CONFIG_DW_WATCHDOG=y", + "CONFIG_I2C_RK3X=y", + "CONFIG_VIDEO_ROCKCHIP_RGA=y", + "CONFIG_ROCKCHIP_SARADC=y", "#BT", "CONFIG_BT", "CONFIG_BT_HCIUART", "CONFIG_BT_HCIUART_SERDEV", - "CONFIG_BT_HCIUART_BCM" + "CONFIG_BT_HCIUART_BCM", + "#PHYs", + "CONFIG_PHY_ROCKCHIP_INNO_USB2=y", + "CONFIG_PHY_ROCKCHIP_EMMC=y" ] }, { @@ -90,7 +104,8 @@ "drm_panfrost", "usb_dwc3", "psave_scmi", - "power_base" + "power_base", + "i2c_base" ], "options": [ @@ -105,76 +120,6 @@ ], "options": [ - "CONFIG_PWM=y", - - "CONFIG_I2C_RK3X=y", - "CONFIG_PWM_ROCKCHIP=y", - "CONFIG_VIDEO_ROCKCHIP_RGA=y", - "CONFIG_HW_RANDOM_ROCKCHIP=y", - "CONFIG_ROCKCHIP_SARADC=y", - "CONFIG_SPI=y", - "CONFIG_SPI_MEM=y", - "CONFIG_SPI_MASTER=y", - "CONFIG_SPI_ROCKCHIP=y", - "CONFIG_SPI_ROCKCHIP_SFC=y", - "CONFIG_PHY_ROCKCHIP_INNO_USB2=y", - "CONFIG_WATCHDOG=y", - "CONFIG_DW_WATCHDOG=y", - "#specific", - "CONFIG_NVMEM_ROCKCHIP_EFUSE=y", - "CONFIG_NVMEM_ROCKCHIP_OTP=y", - "CONFIG_PHY_ROCKCHIP_EMMC=y", - - "# to review", - "CONFIG_I2C=y", - "CONFIG_I2C_CHARDEV=y", - "CONFIG_I2C_MUX_PINCTRL=y", - "CONFIG_I2C_MUX_REG=y", - "CONFIG_NVMEM=y", - "CONFIG_PINMUX=y", - "CONFIG_RPMB=y", - "CONFIG_DMADEVICES=y", - "CONFIG_MAILBOX=y", - "CONFIG_INPUT_TOUCHSCREEN=y", - "CONFIG_BLK_WBT=y", - "CONFIG_BLK_WBT_MQ=y", - "CONFIG_VIDEO_DEV=y", - "CONFIG_REGMAP_MMIO=y", - "#debug?", - "#system", - "CONFIG_GENERIC_IRQ_CHIP=y", - "CONFIG_PL330_DMA=y", - "#CONFIG_BT_HCIUART_BCM=y", - "CONFIG_I2C_GPIO=y", - "CONFIG_PWRSEQ_SIMPLE=y", - "CONFIG_SENSORS_PWM_FAN=y", - "CONFIG_OF_GPIO=y", - "CONFIG_USB_ACM=m", - "#for system software", - "CONFIG_UEVENT_HELPER=y", - "CONFIG_UEVENT_HELPER_PATH=\"\"", - "CONFIG_GPIO_SYSFS=y", - "CONFIG_HW_RANDOM=y", - "#sensors", - "CONFIG_W1=y", - "CONFIG_W1_MASTER_GPIO=y", - "CONFIG_W1_SLAVE_THERM=y", - "#USB", - "#vido, audio", - "CONFIG_MEDIA_CEC_SUPPORT=y", - "#Both", - - "CONFIG_NOP_USB_XCEIV=y", - "##CONFIG_CAN_MCP251X=y", - "##CONFIG_FB_TFT_ST7796S=y", - "CONFIG_REGULATOR_FAN53555=y", - "#rk3566/3568, SoC-specific", - "CONFIG_EMAC_ROCKCHIP=y", - "#EEPROM", - "CONFIG_EEPROM_AT24=y", - "#eth", - "#typeC", - "#CONFIG_TYPEC=y" ] } ] diff --git a/config/kernel/sensors.json b/config/kernel/sensors.json new file mode 100644 index 0000000..1cceb46 --- /dev/null +++ b/config/kernel/sensors.json @@ -0,0 +1,12 @@ +[ + { + "name": "w1_base", + "options": + [ + "#Dallas 1-wire", + "CONFIG_W1=y", + "CONFIG_W1_MASTER_GPIO=y", + "CONFIG_W1_SLAVE_THERM=y" + ] + } +] diff --git a/config/kernel/spi.json b/config/kernel/spi.json new file mode 100644 index 0000000..98bd64a --- /dev/null +++ b/config/kernel/spi.json @@ -0,0 +1,13 @@ +[ + { + "name": "spi_rk", + "options": + [ + "CONFIG_SPI=y", + "CONFIG_SPI_MEM=y", + "CONFIG_SPI_MASTER=y", + "CONFIG_SPI_ROCKCHIP=y", + "CONFIG_SPI_ROCKCHIP_SFC=y" + ] + } +] diff --git a/config/kernel/sys_dev.json b/config/kernel/sys_dev.json new file mode 100644 index 0000000..2e8e608 --- /dev/null +++ b/config/kernel/sys_dev.json @@ -0,0 +1,70 @@ +[ + { + "name": "wdt", + "options": + [ + "CONFIG_WATCHDOG=y" + ] + }, + { + "name": "pwm", + "options": + [ + "CONFIG_PWM=y" + ] + }, + { + "name": "hw_rand_rk", + "options": + [ + "CONFIG_HW_RANDOM=y", + "CONFIG_HW_RANDOM_ROCKCHIP=y" + ] + }, + { + "name": "nvmem_rk", + "options": + [ + "CONFIG_NVMEM=y", + "CONFIG_NVMEM_ROCKCHIP_EFUSE=y", + "CONFIG_NVMEM_ROCKCHIP_OTP=y" + ] + }, + { + "name": "dma", + "options": + [ + "CONFIG_DMADEVICES=y", + "CONFIG_PL330_DMA=y" + ] + }, + { + "name": "misc", + "options": + [ + "#Need to review all", + "CONFIG_PINMUX=y", + "CONFIG_RPMB=y", + "CONFIG_MAILBOX=y", + "CONFIG_BLK_WBT=y", + "CONFIG_BLK_WBT_MQ=y", + "CONFIG_REGMAP_MMIO=y", + "CONFIG_GENERIC_IRQ_CHIP=y", + "#CONFIG_BT_HCIUART_BCM=y", + "CONFIG_PWRSEQ_SIMPLE=y", + "CONFIG_SENSORS_PWM_FAN=y", + "CONFIG_USB_ACM=m", + "CONFIG_UEVENT_HELPER=y", + "CONFIG_UEVENT_HELPER_PATH=\"\"", + "CONFIG_MEDIA_CEC_SUPPORT=y", + + "CONFIG_NOP_USB_XCEIV=y", + "##CONFIG_CAN_MCP251X=y", + "##CONFIG_FB_TFT_ST7796S=y", + "CONFIG_REGULATOR_FAN53555=y", + "CONFIG_EMAC_ROCKCHIP=y", + "CONFIG_EEPROM_AT24=y", + "#CONFIG_TYPEC=y" + ] + } +] diff --git a/config/kernel/usb.json b/config/kernel/usb.json index 082e131..940942b 100644 --- a/config/kernel/usb.json +++ b/config/kernel/usb.json @@ -66,7 +66,8 @@ "options": [ "CONFIG_SCSI=y", - "CONFIG_USB_STORAGE=y" + "CONFIG_USB_STORAGE=y", + "CONFIG_USB_UAS=y" ] }, { diff --git a/config/kernel_meta.json b/config/kernel_meta.json index 5fac64e..1019363 100644 --- a/config/kernel_meta.json +++ b/config/kernel_meta.json @@ -17,6 +17,10 @@ "media", "fs", "stats", - "power" + "power", + "spi", + "i2c", + "sys_dev", + "sensors" ] }