From 6ebdcd436ca6d13d5e7339cbc142b4b363cef5fa Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 18 Oct 2022 14:58:15 +0100 Subject: [PATCH 450/726] configs: arm64: Restore the easy settings Setting ARCH_BCM=y fixes the majority of the breakage. See: https://github.com/raspberrypi/linux/issues/5213 Signed-off-by: Phil Elwell --- arch/arm64/configs/bcm2711_defconfig | 25 +++++++++---------------- arch/arm64/configs/bcmrpi3_defconfig | 20 +++++++------------- 2 files changed, 16 insertions(+), 29 deletions(-) diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index 349eeb8a14a5..4f588cde28f7 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -31,6 +31,7 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y +CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM2835=y # CONFIG_CAVIUM_ERRATUM_22375 is not set # CONFIG_CAVIUM_ERRATUM_23154 is not set @@ -57,8 +58,6 @@ CONFIG_CPUFREQ_DT=y CONFIG_ARM_RASPBERRYPI_CPUFREQ=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y -CONFIG_CRYPTO_AES_ARM64=m -CONFIG_CRYPTO_AES_ARM64_BS=m CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y @@ -693,7 +692,6 @@ 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 @@ -805,7 +803,6 @@ CONFIG_RC_LOOPBACK=m CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_VIDEO_CPIA2=m CONFIG_USB_GSPCA=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m @@ -860,7 +857,6 @@ CONFIG_USB_PWC=m CONFIG_USB_S2255=m CONFIG_VIDEO_USBTV=m CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_ZR364XX=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m @@ -872,9 +868,6 @@ CONFIG_VIDEO_AU0828_RC=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m CONFIG_DVB_AS102=m CONFIG_DVB_B2C2_FLEXCOP_USB=m CONFIG_DVB_USB_V2=m @@ -972,12 +965,10 @@ 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 @@ -1565,21 +1556,23 @@ CONFIG_SECURITY_APPARMOR=y CONFIG_LSM="" CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_ADIANTUM=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_HMAC=m -CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_AES=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_AES_ARM64=m +CONFIG_CRYPTO_AES_ARM64_BS=m # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig index e089eb07e98e..8f2ad529cfed 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -30,6 +30,7 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y +CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM2835=y # CONFIG_CAVIUM_ERRATUM_22375 is not set # CONFIG_CAVIUM_ERRATUM_23154 is not set @@ -57,8 +58,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPUFREQ_DT=y CONFIG_ARM_RASPBERRYPI_CPUFREQ=y -CONFIG_CRYPTO_AES_ARM64=m -CONFIG_CRYPTO_AES_ARM64_BS=m CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y @@ -641,7 +640,6 @@ CONFIG_GAMEPORT_L4=m CONFIG_BRCM_CHAR_DRIVERS=y CONFIG_BCM_VCIO=y CONFIG_BCM2835_DEVGPIOMEM=y -# CONFIG_BCM2835_SMI_DEV is not set # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set @@ -666,11 +664,9 @@ 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 -# CONFIG_I2C_BRCMSTB is not set CONFIG_I2C_GPIO=m CONFIG_I2C_ROBOTFUZZ_OSIF=m CONFIG_I2C_TINY_USB=m @@ -777,7 +773,6 @@ CONFIG_RC_LOOPBACK=m CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_VIDEO_CPIA2=m CONFIG_USB_GSPCA=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m @@ -832,7 +827,6 @@ CONFIG_USB_PWC=m CONFIG_USB_S2255=m CONFIG_VIDEO_USBTV=m CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_ZR364XX=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m @@ -909,12 +903,10 @@ 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 @@ -1463,18 +1455,20 @@ 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_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_AES_ARM64=m +CONFIG_CRYPTO_AES_ARM64_BS=m # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y -- 2.33.1