From 394518ed27dade52e2ef0ba63ffab01e38517ec2 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 18 Oct 2022 16:39:53 +0100 Subject: [PATCH 452/726] configs: Re-enable more lost config settings Signed-off-by: Phil Elwell --- arch/arm/configs/bcm2709_defconfig | 14 +++++++------- arch/arm/configs/bcm2711_defconfig | 14 +++++++------- arch/arm/configs/bcmrpi_defconfig | 14 +++++++------- arch/arm64/configs/bcm2711_defconfig | 3 +++ arch/arm64/configs/bcmrpi3_defconfig | 3 +++ 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig index 8257cf812d34..01e901e5fc4c 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -55,9 +55,6 @@ CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y # CONFIG_SUSPEND is not set CONFIG_PM=y -CONFIG_CRYPTO_SHA1_ARM_NEON=m -CONFIG_CRYPTO_AES_ARM=m -CONFIG_CRYPTO_AES_ARM_BS=m CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y @@ -1523,18 +1520,21 @@ CONFIG_SECURITY=y CONFIG_SECURITY_APPARMOR=y CONFIG_LSM="" CONFIG_CRYPTO_USER=m -CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_ADIANTUM=m -CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_SHA1_ARM_NEON=m +CONFIG_CRYPTO_AES_ARM=m +CONFIG_CRYPTO_AES_ARM_BS=m # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig index 3484ccece519..4a40b230ecb2 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -55,9 +55,6 @@ CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y # CONFIG_SUSPEND is not set CONFIG_PM=y -CONFIG_CRYPTO_SHA1_ARM_NEON=m -CONFIG_CRYPTO_AES_ARM=m -CONFIG_CRYPTO_AES_ARM_BS=m CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y @@ -1549,18 +1546,21 @@ CONFIG_SECURITY=y CONFIG_SECURITY_APPARMOR=y CONFIG_LSM="" CONFIG_CRYPTO_USER=m -CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_ADIANTUM=m -CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_SHA1_ARM_NEON=m +CONFIG_CRYPTO_AES_ARM=m +CONFIG_CRYPTO_AES_ARM_BS=m # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig index 791a221ce904..bd11c96d371b 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -50,8 +50,6 @@ CONFIG_ARM_RASPBERRYPI_CPUFREQ=y CONFIG_VFP=y # CONFIG_SUSPEND is not set CONFIG_PM=y -CONFIG_CRYPTO_SHA1_ARM=m -CONFIG_CRYPTO_AES_ARM=m CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y @@ -1515,21 +1513,23 @@ CONFIG_SECURITY_APPARMOR=y CONFIG_LSM="" CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_ADIANTUM=m -CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_SHA1_ARM=m +CONFIG_CRYPTO_AES_ARM=m # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index 4f588cde28f7..2486ed5567be 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -692,6 +692,7 @@ CONFIG_TCG_TIS_I2C=m CONFIG_I2C=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX_GPMUX=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2835=m @@ -965,10 +966,12 @@ CONFIG_DRM=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_UDL=m CONFIG_DRM_PANEL_SIMPLE=m +CONFIG_DRM_PANEL_ILITEK_ILI9806E=m CONFIG_DRM_PANEL_ILITEK_ILI9881C=m CONFIG_DRM_PANEL_JDI_LT070ME05000=m CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m CONFIG_DRM_PANEL_SITRONIX_ST7701=m +CONFIG_DRM_PANEL_TPO_Y17P=m CONFIG_DRM_DISPLAY_CONNECTOR=m CONFIG_DRM_SIMPLE_BRIDGE=m CONFIG_DRM_TOSHIBA_TC358762=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig index 8f2ad529cfed..e4a7e0427c62 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -664,6 +664,7 @@ CONFIG_TCG_TIS_I2C=m CONFIG_I2C=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX_GPMUX=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2835=m @@ -903,10 +904,12 @@ CONFIG_DRM=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_UDL=m CONFIG_DRM_PANEL_SIMPLE=m +CONFIG_DRM_PANEL_ILITEK_ILI9806E=m CONFIG_DRM_PANEL_ILITEK_ILI9881C=m CONFIG_DRM_PANEL_JDI_LT070ME05000=m CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m CONFIG_DRM_PANEL_SITRONIX_ST7701=m +CONFIG_DRM_PANEL_TPO_Y17P=m CONFIG_DRM_DISPLAY_CONNECTOR=m CONFIG_DRM_SIMPLE_BRIDGE=m CONFIG_DRM_TOSHIBA_TC358762=m -- 2.33.1