From 18fed4ec51aa22df18b83e480f6ba1da9cc718b3 Mon Sep 17 00:00:00 2001 From: Mathias Beaulieu-Duncan Date: Mon, 18 May 2026 18:43:22 -0400 Subject: [PATCH] pkgs config-arm64: add missing RP1 symbols to fix kernel link The v1.13.2 rebase of pkgs 0001 only restored some RP1-related kernel options (PINCTRL_RP1, COMMON_CLK_RP1, PINCTRL_BCM2712) because those hunks happened to apply cleanly against upstream v1.13.0's 6.18.24-era config-arm64. Several others were silently dropped, causing: ld.lld: error: undefined symbol: rp1_get_platform at the vmlinux link step (~19 min into local kernel build). Re-added: - CONFIG_MFD_RP1=y (defines rp1_get_platform) - CONFIG_COMMON_CLK_RP1_SDIO=y - CONFIG_FB_BCM2708=y (RPi framebuffer) - CONFIG_PWM_PIO_RP1=y (RPi PWM via PIO) - CONFIG_PWM_BRCMSTB=y (was "not set") Local build now succeeds: svrnty/talos-rpi5-kernel:v1.13.0-local loaded into local Docker (234MB). --- .../0001-Patched-for-Raspberry-Pi-5.patch | 119 +++++++++++------- 1 file changed, 77 insertions(+), 42 deletions(-) diff --git a/patches/siderolabs/pkgs/0001-Patched-for-Raspberry-Pi-5.patch b/patches/siderolabs/pkgs/0001-Patched-for-Raspberry-Pi-5.patch index 7b1b95f..f8029f0 100644 --- a/patches/siderolabs/pkgs/0001-Patched-for-Raspberry-Pi-5.patch +++ b/patches/siderolabs/pkgs/0001-Patched-for-Raspberry-Pi-5.patch @@ -1,14 +1,14 @@ -From b0f2132649a25c4ef4fb200657e1c568c9889fd2 Mon Sep 17 00:00:00 2001 +From d60ac2d35158faae78899da5f03479498ac6b317 Mon Sep 17 00:00:00 2001 From: Mathias Beaulieu-Duncan Date: Sat, 14 Feb 2026 13:14:00 -0500 Subject: [PATCH] Patched for Raspberry Pi 5 --- Pkgfile | 8 +- - kernel/build/config-arm64 | 309 ++++++++++++++++++++++++++------------ + kernel/build/config-arm64 | 315 ++++++++++++++++++++++++++------------ kernel/build/pkg.yaml | 2 +- kernel/prepare/pkg.yaml | 6 +- - 4 files changed, 217 insertions(+), 108 deletions(-) + 4 files changed, 222 insertions(+), 109 deletions(-) diff --git a/Pkgfile b/Pkgfile index a272582..ce10086 100644 @@ -30,7 +30,7 @@ index a272582..ce10086 100644 # renovate: datasource=git-tags extractVersion=^libaio-(?.*)$ depName=https://pagure.io/libaio.git libaio_version: 0.3.113 diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64 -index b095bcd..8928533 100644 +index b095bcd..1aad7d4 100644 --- a/kernel/build/config-arm64 +++ b/kernel/build/config-arm64 @@ -1,6 +1,6 @@ @@ -482,7 +482,15 @@ index b095bcd..8928533 100644 # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_RT4831 is not set # CONFIG_MFD_RT5033 is not set -@@ -5118,6 +5132,7 @@ CONFIG_REGULATOR_QCOM_SPMI=y +@@ -5001,6 +5015,7 @@ CONFIG_MFD_RK8XX_SPI=y + # CONFIG_MFD_STMPE is not set + CONFIG_MFD_SUN6I_PRCM=y + CONFIG_MFD_SYSCON=y ++CONFIG_MFD_RP1=y + # CONFIG_MFD_TI_AM335X_TSCADC is not set + # CONFIG_MFD_LP3943 is not set + # CONFIG_MFD_LP8788 is not set +@@ -5118,6 +5133,7 @@ CONFIG_REGULATOR_QCOM_SPMI=y # CONFIG_REGULATOR_RAA215300 is not set # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_V2 is not set @@ -490,7 +498,7 @@ index b095bcd..8928533 100644 CONFIG_REGULATOR_RK808=y # CONFIG_REGULATOR_RT4801 is not set # CONFIG_REGULATOR_RT4803 is not set -@@ -5252,6 +5267,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y +@@ -5252,6 +5268,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # # Atmel media platform drivers # @@ -498,7 +506,7 @@ index b095bcd..8928533 100644 # CONFIG_VIDEO_BCM2835_UNICAM is not set # -@@ -5314,6 +5330,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y +@@ -5314,6 +5331,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # # Raspberry Pi media platform drivers # @@ -506,7 +514,7 @@ index b095bcd..8928533 100644 # CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set # CONFIG_VIDEO_RP1_CFE is not set -@@ -5390,9 +5407,13 @@ CONFIG_VIDEOBUF2_VMALLOC=m +@@ -5390,9 +5408,13 @@ CONFIG_VIDEOBUF2_VMALLOC=m # CONFIG_VIDEO_THP7312 is not set # end of Camera ISPs @@ -521,7 +529,7 @@ index b095bcd..8928533 100644 # CONFIG_VIDEO_DW9714 is not set # CONFIG_VIDEO_DW9719 is not set # CONFIG_VIDEO_DW9768 is not set -@@ -5461,6 +5482,7 @@ CONFIG_VIDEO_CAMERA_LENS=y +@@ -5461,6 +5483,7 @@ CONFIG_VIDEO_CAMERA_LENS=y # CONFIG_VIDEO_TW9903 is not set # CONFIG_VIDEO_TW9906 is not set # CONFIG_VIDEO_TW9910 is not set @@ -529,7 +537,7 @@ index b095bcd..8928533 100644 # CONFIG_VIDEO_VPX3220 is not set # -@@ -5583,7 +5605,6 @@ CONFIG_DRM_DISPLAY_HDMI_HELPER=y +@@ -5583,7 +5606,6 @@ CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y CONFIG_DRM_TTM=m CONFIG_DRM_EXEC=m @@ -537,7 +545,7 @@ index b095bcd..8928533 100644 CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m -@@ -5702,6 +5723,7 @@ CONFIG_DRM_PANEL=y +@@ -5702,6 +5724,7 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set @@ -545,7 +553,7 @@ index b095bcd..8928533 100644 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set -@@ -5780,6 +5802,7 @@ CONFIG_DRM_PANEL_SIMPLE=y +@@ -5780,6 +5803,7 @@ CONFIG_DRM_PANEL_SIMPLE=y # CONFIG_DRM_PANEL_SUMMIT is not set # CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set @@ -553,7 +561,7 @@ index b095bcd..8928533 100644 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set -@@ -5789,6 +5812,8 @@ CONFIG_DRM_PANEL_SIMPLE=y +@@ -5789,6 +5813,8 @@ CONFIG_DRM_PANEL_SIMPLE=y # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set # CONFIG_DRM_PANEL_VISIONOX_RM692E5 is not set # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set @@ -562,7 +570,7 @@ index b095bcd..8928533 100644 # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels -@@ -5894,7 +5919,7 @@ CONFIG_DRM_MESON_DW_MIPI_DSI=y +@@ -5894,7 +5920,7 @@ CONFIG_DRM_MESON_DW_MIPI_DSI=y # CONFIG_DRM_XEN_FRONTEND is not set # CONFIG_DRM_LIMA is not set CONFIG_DRM_PANFROST=m @@ -571,7 +579,15 @@ index b095bcd..8928533 100644 # CONFIG_DRM_TIDSS is not set # CONFIG_DRM_GUD is not set # CONFIG_DRM_ST7571_I2C is not set -@@ -5951,6 +5976,7 @@ CONFIG_FB_HYPERV=y +@@ -5911,6 +5937,7 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y + # Frame buffer Devices + # + CONFIG_FB=y ++CONFIG_FB_BCM2708=y + # CONFIG_FB_CIRRUS is not set + # CONFIG_FB_PM2 is not set + # CONFIG_FB_CYBER2000 is not set +@@ -5951,6 +5978,7 @@ CONFIG_FB_HYPERV=y CONFIG_FB_SIMPLE=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_SM712 is not set @@ -579,7 +595,7 @@ index b095bcd..8928533 100644 CONFIG_FB_CORE=y CONFIG_FB_NOTIFY=y CONFIG_FB_DEVICE=y -@@ -5983,6 +6009,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y +@@ -5983,6 +6011,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_KTD2801 is not set # CONFIG_BACKLIGHT_KTZ8866 is not set # CONFIG_BACKLIGHT_PWM is not set @@ -587,7 +603,7 @@ index b095bcd..8928533 100644 # CONFIG_BACKLIGHT_QCOM_WLED is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set -@@ -6071,7 +6098,55 @@ CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y +@@ -6071,7 +6100,55 @@ CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y # CONFIG_SND_USB_VARIAX is not set CONFIG_SND_SOC=m CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y @@ -644,7 +660,7 @@ index b095bcd..8928533 100644 # # Analog Devices -@@ -6207,15 +6282,17 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +@@ -6207,15 +6284,17 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_MESON_G12A_TOACODEC is not set # CONFIG_SND_MESON_G12A_TOHDMITX is not set # CONFIG_SND_SOC_MESON_T9015 is not set @@ -665,7 +681,7 @@ index b095bcd..8928533 100644 # # Renesas # -@@ -6299,6 +6376,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=m +@@ -6299,6 +6378,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=m # CODEC drivers # # CONFIG_SND_SOC_AC97_CODEC is not set @@ -674,7 +690,7 @@ index b095bcd..8928533 100644 # CONFIG_SND_SOC_ADAU1372_I2C is not set # CONFIG_SND_SOC_ADAU1372_SPI is not set # CONFIG_SND_SOC_ADAU1373 is not set -@@ -6380,6 +6459,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m +@@ -6380,6 +6461,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_ICS43432 is not set # CONFIG_SND_SOC_IDT821034 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set @@ -682,7 +698,7 @@ index b095bcd..8928533 100644 # CONFIG_SND_SOC_MAX98088 is not set # CONFIG_SND_SOC_MAX98090 is not set # CONFIG_SND_SOC_MAX98357A is not set -@@ -6512,6 +6592,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m +@@ -6512,6 +6594,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_LPASS_VA_MACRO is not set # CONFIG_SND_SOC_LPASS_RX_MACRO is not set # CONFIG_SND_SOC_LPASS_TX_MACRO is not set @@ -690,7 +706,7 @@ index b095bcd..8928533 100644 # end of CODEC drivers # -@@ -6536,18 +6617,18 @@ CONFIG_HID_GENERIC=y +@@ -6536,18 +6619,18 @@ CONFIG_HID_GENERIC=y # # Special HID drivers # @@ -714,7 +730,7 @@ index b095bcd..8928533 100644 # CONFIG_HID_CORSAIR is not set # CONFIG_HID_COUGAR is not set # CONFIG_HID_MACALLY is not set -@@ -6555,14 +6636,14 @@ CONFIG_HID_CHICONY=m +@@ -6555,14 +6638,14 @@ CONFIG_HID_CHICONY=m # CONFIG_HID_CMEDIA is not set # CONFIG_HID_CP2112 is not set # CONFIG_HID_CREATIVE_SB0540 is not set @@ -731,7 +747,7 @@ index b095bcd..8928533 100644 # CONFIG_HID_FT260 is not set # CONFIG_HID_GEMBIRD is not set # CONFIG_HID_GFRM is not set -@@ -6580,17 +6661,17 @@ CONFIG_HID_EZKEY=m +@@ -6580,17 +6663,17 @@ CONFIG_HID_EZKEY=m # CONFIG_HID_VIEWSONIC is not set # CONFIG_HID_VRC2 is not set # CONFIG_HID_XIAOMI is not set @@ -753,7 +769,7 @@ index b095bcd..8928533 100644 # CONFIG_HID_LOGITECH_DJ is not set # CONFIG_HID_LOGITECH_HIDPP is not set CONFIG_LOGITECH_FF=y -@@ -6622,20 +6703,20 @@ CONFIG_HID_PETALYNX=m +@@ -6622,20 +6705,20 @@ CONFIG_HID_PETALYNX=m # CONFIG_HID_RETRODE is not set # CONFIG_HID_ROCCAT is not set # CONFIG_HID_SAITEK is not set @@ -777,7 +793,7 @@ index b095bcd..8928533 100644 # CONFIG_HID_TOPRE is not set # CONFIG_HID_THINGM is not set # CONFIG_HID_THRUSTMASTER is not set -@@ -6734,6 +6815,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y +@@ -6734,6 +6817,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_RENESAS_USBHS_HCD is not set @@ -785,7 +801,7 @@ index b095bcd..8928533 100644 # CONFIG_USB_HCD_TEST_MODE is not set # CONFIG_USB_XEN_HCD is not set CONFIG_USB_RENESAS_USBHS=y -@@ -6843,13 +6925,13 @@ CONFIG_USB_SERIAL_GENERIC=y +@@ -6843,13 +6927,13 @@ CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_AIRCABLE is not set # CONFIG_USB_SERIAL_ARK3116 is not set # CONFIG_USB_SERIAL_BELKIN is not set @@ -802,7 +818,7 @@ index b095bcd..8928533 100644 # CONFIG_USB_SERIAL_VISOR is not set # CONFIG_USB_SERIAL_IPAQ is not set # CONFIG_USB_SERIAL_IR is not set -@@ -6870,7 +6952,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m +@@ -6870,7 +6954,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m # CONFIG_USB_SERIAL_MOS7840 is not set # CONFIG_USB_SERIAL_MXUPORT is not set # CONFIG_USB_SERIAL_NAVMAN is not set @@ -811,7 +827,7 @@ index b095bcd..8928533 100644 # CONFIG_USB_SERIAL_OTI6858 is not set # CONFIG_USB_SERIAL_QCAUX is not set # CONFIG_USB_SERIAL_QUALCOMM is not set -@@ -7074,31 +7156,32 @@ CONFIG_MMC_BLOCK_MINORS=32 +@@ -7074,31 +7158,32 @@ CONFIG_MMC_BLOCK_MINORS=32 # # MMC/SD/SDIO Host Controller Drivers # @@ -856,7 +872,7 @@ index b095bcd..8928533 100644 # CONFIG_MMC_MXC is not set # CONFIG_MMC_TIFM_SD is not set CONFIG_MMC_SPI=y -@@ -7128,8 +7211,8 @@ CONFIG_MMC_CQHCI=y +@@ -7128,8 +7213,8 @@ CONFIG_MMC_CQHCI=y # CONFIG_MMC_TOSHIBA_PCI is not set CONFIG_MMC_BCM2835=y # CONFIG_MMC_MTK is not set @@ -867,7 +883,7 @@ index b095bcd..8928533 100644 # CONFIG_MMC_SDHCI_AM654 is not set # CONFIG_MMC_OWL is not set # CONFIG_SCSI_UFSHCD is not set -@@ -7222,28 +7305,26 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +@@ -7222,28 +7307,26 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # # CONFIG_LEDS_TRIGGER_TRANSIENT is not set # CONFIG_LEDS_TRIGGER_CAMERA is not set @@ -900,7 +916,7 @@ index b095bcd..8928533 100644 CONFIG_INFINIBAND_HNS_HIP08=m CONFIG_INFINIBAND_IRDMA=m CONFIG_MLX4_INFINIBAND=m -@@ -7302,6 +7383,7 @@ CONFIG_RTC_INTF_DEV=y +@@ -7302,6 +7385,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_ABB5ZES3 is not set # CONFIG_RTC_DRV_ABEOZ9 is not set # CONFIG_RTC_DRV_ABX80X is not set @@ -908,7 +924,7 @@ index b095bcd..8928533 100644 CONFIG_RTC_DRV_BRCMSTB=y CONFIG_RTC_DRV_DS1307=y # CONFIG_RTC_DRV_DS1307_CENTURY is not set -@@ -7454,6 +7536,7 @@ CONFIG_PL330_DMA=y +@@ -7454,6 +7538,7 @@ CONFIG_PL330_DMA=y CONFIG_TEGRA186_GPC_DMA=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA210_ADMA=y @@ -916,7 +932,7 @@ index b095bcd..8928533 100644 # CONFIG_XGENE_DMA is not set # CONFIG_XILINX_DMA is not set # CONFIG_XILINX_XDMA is not set -@@ -7543,17 +7626,17 @@ CONFIG_VMGENID=y +@@ -7543,17 +7628,17 @@ CONFIG_VMGENID=y # CONFIG_ARM_CCA_GUEST is not set CONFIG_VIRTIO_ANCHOR=y CONFIG_VIRTIO=y @@ -940,7 +956,15 @@ index b095bcd..8928533 100644 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_VIRTIO_DMA_SHARED_BUFFER=y # CONFIG_VIRTIO_DEBUG is not set -@@ -8171,6 +8254,8 @@ CONFIG_TEGRA_IOMMU_SMMU=y +@@ -7650,6 +7735,7 @@ CONFIG_COMMON_CLK=y + # CONFIG_COMMON_CLK_MAX9485 is not set + CONFIG_COMMON_CLK_RK808=y + CONFIG_COMMON_CLK_RP1=y ++CONFIG_COMMON_CLK_RP1_SDIO=y + CONFIG_COMMON_CLK_HI655X=y + CONFIG_COMMON_CLK_SCMI=y + CONFIG_COMMON_CLK_SCPI=y +@@ -8171,6 +8257,8 @@ CONFIG_TEGRA_IOMMU_SMMU=y # CONFIG_MTK_IOMMU is not set # CONFIG_VIRTIO_IOMMU is not set # CONFIG_SPRD_IOMMU is not set @@ -949,7 +973,18 @@ index b095bcd..8928533 100644 # # Remoteproc drivers -@@ -9096,7 +9181,8 @@ CONFIG_PWM_MESON=y +@@ -9079,8 +9167,9 @@ CONFIG_PWM=y + # CONFIG_PWM_AXI_PWMGEN is not set + CONFIG_PWM_BCM2835=y + CONFIG_PWM_BCM_IPROC=y ++CONFIG_PWM_PIO_RP1=y + # CONFIG_PWM_BERLIN is not set +-# CONFIG_PWM_BRCMSTB is not set ++CONFIG_PWM_BRCMSTB=y + # CONFIG_PWM_CLK is not set + # CONFIG_PWM_DWC is not set + # CONFIG_PWM_FSL_FTM is not set +@@ -9096,7 +9185,8 @@ CONFIG_PWM_MESON=y # CONFIG_PWM_OMAP_DMTIMER is not set # CONFIG_PWM_PCA9685 is not set CONFIG_PWM_RASPBERRYPI_POE=y @@ -959,7 +994,7 @@ index b095bcd..8928533 100644 # CONFIG_PWM_RENESAS_TPU is not set CONFIG_PWM_ROCKCHIP=y # CONFIG_PWM_SPRD is not set -@@ -9120,7 +9206,7 @@ CONFIG_ARM_GIC_V3_ITS=y +@@ -9120,7 +9210,7 @@ CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GIC_V5=y CONFIG_IRQ_MSI_LIB=y # CONFIG_AL_FIC is not set @@ -968,7 +1003,7 @@ index b095bcd..8928533 100644 CONFIG_BCM7038_L1_IRQ=y CONFIG_BCM7120_L2_IRQ=y CONFIG_BRCMSTB_L2_IRQ=y -@@ -9334,6 +9420,7 @@ CONFIG_ARM64_BRBE=y +@@ -9334,6 +9424,7 @@ CONFIG_ARM64_BRBE=y # CONFIG_ARM_DMC620_PMU is not set # CONFIG_MARVELL_CN10K_TAD_PMU is not set # CONFIG_ALIBABA_UNCORE_DRW_PMU is not set @@ -976,7 +1011,7 @@ index b095bcd..8928533 100644 CONFIG_HISI_PMU=m CONFIG_HISI_PCIE_PMU=m CONFIG_HNS3_PMU=m -@@ -9379,6 +9466,7 @@ CONFIG_NVMEM_LAYOUTS=y +@@ -9379,6 +9470,7 @@ CONFIG_NVMEM_LAYOUTS=y # CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set # end of Layout Types @@ -984,7 +1019,7 @@ index b095bcd..8928533 100644 CONFIG_NVMEM_BCM_OCOTP=y # CONFIG_NVMEM_IMX_IIM is not set # CONFIG_NVMEM_IMX_OCOTP is not set -@@ -9787,8 +9875,30 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y +@@ -9787,8 +9879,30 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_LOAD_UEFI_KEYS=y CONFIG_INTEGRITY_AUDIT=y @@ -1017,7 +1052,7 @@ index b095bcd..8928533 100644 # CONFIG_EVM is not set # CONFIG_DEFAULT_SECURITY_SELINUX is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set -@@ -9985,7 +10095,7 @@ CONFIG_CRYPTO_LZO=y +@@ -9985,7 +10099,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set # CONFIG_CRYPTO_LZ4 is not set # CONFIG_CRYPTO_LZ4HC is not set @@ -1026,7 +1061,7 @@ index b095bcd..8928533 100644 # end of Compression # -@@ -10238,7 +10348,6 @@ CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y +@@ -10238,7 +10352,6 @@ CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y CONFIG_SWIOTLB=y # CONFIG_SWIOTLB_DYNAMIC is not set