From: Arnd Bergmann Date: Fri, 11 Mar 2022 10:01:10 +0000 (+0100) Subject: Merge tag 'arm64_defconfig_for_v5.18' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=47c561af900ab593b911ff1caf642a5bc64893d4;p=linux.git Merge tag 'arm64_defconfig_for_v5.18' of git://git./linux/kernel/git/dinguyen/linux into arm/defconfig ARM64 defconfig for v5.18 - Enable the Altera FPGA Manager CVP driver * tag 'arm64_defconfig_for_v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: arm64: defconfig: enable the CVP driver Link: https://lore.kernel.org/r/20220310195740.151250-2-dinguyen@kernel.org Signed-off-by: Arnd Bergmann --- 47c561af900ab593b911ff1caf642a5bc64893d4 diff --cc arch/arm64/configs/defconfig index e5700421603bd,b2efafb15de66..0a2fe757c4545 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -1193,8 -1171,8 +1193,9 @@@ CONFIG_NVMEM_SUNXI_SID= CONFIG_UNIPHIER_EFUSE=y CONFIG_MESON_EFUSE=m CONFIG_NVMEM_RMEM=m +CONFIG_NVMEM_LAYERSCAPE_SFP=m CONFIG_FPGA=y + CONFIG_FPGA_MGR_ALTERA_CVP=m CONFIG_FPGA_MGR_STRATIX10_SOC=m CONFIG_FPGA_BRIDGE=m CONFIG_ALTERA_FREEZE_BRIDGE=m