diff --git a/config/kernel/linux-genio-edge.config b/config/kernel/linux-genio-edge.config
index e6db0a8d51..0124303a70 100644
--- a/config/kernel/linux-genio-edge.config
+++ b/config/kernel/linux-genio-edge.config
@@ -119,6 +119,7 @@ CONFIG_ZSWAP=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
 # CONFIG_COMPAT_BRK is not set
+CONFIG_PAGE_REPORTING=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_MEMORY_FAILURE=y
@@ -557,7 +558,7 @@ CONFIG_EFI_ZBOOT=y
 CONFIG_EFI_BOOTLOADER_CONTROL=y
 CONFIG_EFI_CAPSULE_LOADER=y
 CONFIG_EFI_COCO_SECRET=y
-CONFIG_TEE_STMM_EFI=y
+CONFIG_TEE_STMM_EFI=m
 CONFIG_FWCTL=y
 CONFIG_GNSS=m
 CONFIG_GNSS_MTK_SERIAL=m
@@ -618,14 +619,13 @@ CONFIG_SATA_SIL24=y
 CONFIG_PATA_OF_PLATFORM=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
-CONFIG_BLK_DEV_DM=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_THIN_PROVISIONING=y
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
-CONFIG_DM_INIT=y
 CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=y
+CONFIG_DM_VERITY=m
 CONFIG_DM_INTEGRITY=m
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
@@ -728,10 +728,10 @@ CONFIG_MT7925U=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_MATRIXKMAP=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_CROS_EC=y
 CONFIG_KEYBOARD_MT6779=m
 CONFIG_KEYBOARD_MTK_PMIC=y
 CONFIG_MOUSE_PS2_ELANTECH=y
@@ -792,7 +792,6 @@ CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_MT65XX=y
 CONFIG_I2C_RK3X=y
-CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_SLAVE=y
 CONFIG_SPI=y
 CONFIG_SPI_CADENCE_QUADSPI=y
@@ -821,7 +820,6 @@ CONFIG_GPIO_MAX732X=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_BD9571MWV=m
-CONFIG_GPIO_CROS_EC=y
 CONFIG_GPIO_MAX77620=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
@@ -836,7 +834,6 @@ CONFIG_CHARGER_MT6360=y
 CONFIG_CHARGER_MT6370=y
 CONFIG_CHARGER_BQ25890=m
 CONFIG_CHARGER_BQ25980=m
-CONFIG_CHARGER_CROS_USBPD=y
 CONFIG_SENSORS_ARM_SCMI=y
 CONFIG_SENSORS_ARM_SCPI=y
 CONFIG_SENSORS_LM90=m
@@ -857,7 +854,6 @@ CONFIG_GENERIC_ADC_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_SOFT_WATCHDOG=y
-CONFIG_CROS_EC_WATCHDOG=y
 CONFIG_ARM_SP805_WATCHDOG=y
 CONFIG_ARM_SBSA_WATCHDOG=y
 CONFIG_DW_WATCHDOG=y
@@ -879,7 +875,6 @@ CONFIG_REGULATOR_USERSPACE_CONSUMER=y
 CONFIG_REGULATOR_AXP20X=y
 CONFIG_REGULATOR_BD718XX=y
 CONFIG_REGULATOR_BD9571MWV=y
-CONFIG_REGULATOR_CROS_EC=y
 CONFIG_REGULATOR_DA9211=y
 CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_GPIO=y
@@ -911,7 +906,6 @@ CONFIG_RC_CORE=m
 CONFIG_RC_DECODERS=y
 CONFIG_RC_DEVICES=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_CEC_CROS_EC=y
 CONFIG_CEC_MEDIATEK_V2=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_SUPPORT_FILTER=y
@@ -1120,6 +1114,7 @@ CONFIG_I2C_HID_OF_GOODIX=m
 CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=y
 CONFIG_USB_CONN_GPIO=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -1140,8 +1135,8 @@ CONFIG_USBIP_VHCI_HCD=m
 CONFIG_USB_MTU3=y
 CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_DWC3=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_DWC2=m
+CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_ISP1760=y
@@ -1152,13 +1147,13 @@ CONFIG_USB_SERIAL_CH341=m
 CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_HSIC_USB3503=y
-CONFIG_USB_ONBOARD_DEV=y
-CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_ONBOARD_DEV=m
+CONFIG_NOP_USB_XCEIV=m
 CONFIG_USB_ULPI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_SNP_UDC_PLAT=y
-CONFIG_USB_BDC_UDC=y
+CONFIG_USB_GADGET=m
+CONFIG_USB_SNP_UDC_PLAT=m
+CONFIG_USB_BDC_UDC=m
 CONFIG_USB_DUMMY_HCD=m
 CONFIG_USB_CONFIGFS=m
 CONFIG_USB_CONFIGFS_SERIAL=y
@@ -1237,8 +1232,7 @@ CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_DS3232=y
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_EFI=m
-CONFIG_RTC_DRV_OPTEE=y
-CONFIG_RTC_DRV_CROS_EC=y
+CONFIG_RTC_DRV_OPTEE=m
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_MT6397=y
 CONFIG_DMADEVICES=y
@@ -1253,26 +1247,17 @@ CONFIG_QCOM_HIDMA_MGMT=y
 CONFIG_QCOM_HIDMA=y
 CONFIG_SW_SYNC=y
 CONFIG_UDMABUF=y
-CONFIG_VFIO=y
+CONFIG_VFIO=m
 CONFIG_VFIO_DEVICE_CDEV=y
-CONFIG_VFIO_PCI=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_RTC=m
+CONFIG_VFIO_PCI=m
+# CONFIG_VIRTIO_MENU is not set
+# CONFIG_VHOST_MENU is not set
 CONFIG_XEN_GNTDEV=y
 CONFIG_XEN_GRANT_DEV_ALLOC=y
 # CONFIG_XEN_PCIDEV_STUB is not set
 CONFIG_STAGING=y
 CONFIG_STAGING_MEDIA=y
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CROS_EC=y
-CONFIG_CROS_EC_I2C=y
-CONFIG_CROS_EC_RPMSG=y
-CONFIG_CROS_EC_SPI=y
-CONFIG_CROS_KBD_LED_BACKLIGHT=y
-CONFIG_CROS_HPS_I2C=y
-CONFIG_CROS_USBPD_LOGGER=m
+# CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_CLK_VEXPRESS_OSC=y
 CONFIG_COMMON_CLK_SCMI=y
 CONFIG_COMMON_CLK_SCPI=y
@@ -1331,7 +1316,6 @@ CONFIG_ARM_MEDIATEK_CCI_DEVFREQ=y
 CONFIG_PM_DEVFREQ_EVENT=y
 CONFIG_EXTCON_PTN5150=m
 CONFIG_EXTCON_USB_GPIO=y
-CONFIG_EXTCON_USBC_CROS_EC=y
 CONFIG_IIO=y
 CONFIG_IIO_SW_TRIGGER=m
 CONFIG_MAX9611=m
@@ -1341,21 +1325,13 @@ CONFIG_MEDIATEK_MT6370_ADC=y
 CONFIG_MEDIATEK_MT6577_AUXADC=y
 CONFIG_QCOM_SPMI_VADC=m
 CONFIG_QCOM_SPMI_ADC5=m
-CONFIG_IIO_CROS_EC_SENSORS_CORE=y
-CONFIG_IIO_CROS_EC_SENSORS=y
-CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=y
-CONFIG_IIO_CROS_EC_ACTIVITY=y
 CONFIG_IIO_ST_LSM6DSX=m
-CONFIG_IIO_CROS_EC_LIGHT_PROX=y
 CONFIG_SENSORS_ISL29018=m
 CONFIG_VCNL4000=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_CROS_EC_BARO=y
 CONFIG_MPL3115=m
-CONFIG_CROS_EC_MKBP_PROXIMITY=y
 CONFIG_PWM=y
 CONFIG_PWM_CLK=m
-CONFIG_PWM_CROS_EC=y
 CONFIG_PWM_MEDIATEK=y
 CONFIG_PWM_MTK_DISP=y
 CONFIG_RESET_GPIO=y
@@ -1369,21 +1345,19 @@ CONFIG_PHY_MTK_MIPI_CSI_0_5=m
 CONFIG_PHY_MTK_MIPI_DSI=y
 CONFIG_PHY_MTK_DP=y
 CONFIG_PHY_QCOM_USB_HS=y
-CONFIG_PHY_SAMSUNG_USB2=y
+CONFIG_PHY_SAMSUNG_USB2=m
 CONFIG_ARM_DSU_PMU=y
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
-CONFIG_DAX=y
+CONFIG_DAX=m
 CONFIG_NVMEM_MTK_EFUSE=y
 CONFIG_NVMEM_RMEM=m
 CONFIG_NVMEM_SPMI_SDAM=m
-CONFIG_FPGA=y
+CONFIG_FPGA=m
 CONFIG_FPGA_BRIDGE=m
 CONFIG_ALTERA_FREEZE_BRIDGE=m
 CONFIG_FPGA_REGION=m
 CONFIG_OF_FPGA_REGION=m
-CONFIG_TEE=y
-CONFIG_OPTEE=y
+CONFIG_TEE=m
+CONFIG_OPTEE=m
 CONFIG_MUX_MMIO=y
 CONFIG_INTERCONNECT=y
 CONFIG_INTERCONNECT_MTK=y
@@ -1463,7 +1437,6 @@ CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_LOADPIN=y
-CONFIG_SECURITY_LOADPIN_VERITY=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_SAFESETID=y
 CONFIG_SECURITY_LANDLOCK=y
@@ -1480,6 +1453,7 @@ CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_HCTR2=y
 CONFIG_CRYPTO_ECHAINIV=y
+CONFIG_CRYPTO_ESSIV=y
 CONFIG_CRYPTO_BLAKE2B=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=y