From 4621270a7ee1fb06802e2e34d28d837331d5ab65 Mon Sep 17 00:00:00 2001 From: Camelia Alexandra Groza Date: Wed, 13 May 2020 21:55:43 +0000 Subject: [PATCH] arm64: lsdk.config: enable the DPAA1 SDK drivers Explicitly disable the upstream DPAA1 drivers and enable the SDK variants. This prevents upstream changes to the arm64 defconfig from interfering with the options. Signed-off-by: Camelia Groza --- arch/arm64/configs/lsdk.config | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/configs/lsdk.config b/arch/arm64/configs/lsdk.config index 496e64ad9cdc..c4cb15bf9f34 100644 --- a/arch/arm64/configs/lsdk.config +++ b/arch/arm64/configs/lsdk.config @@ -20,6 +20,17 @@ CONFIG_CHECKPOINT_RESTORE=y # virtualization CONFIG_VHOST_NET=y CONFIG_KVM_ARM_MAX_VCPUS=8 + +# DPAA1 networking +# disable the DPAA1 upstream driver +CONFIG_FSL_DPAA=n +CONFIG_FSL_FMAN=n +CONFIG_FSL_DPAA_ETH=n +# enable the DPAA1 SDK driver +CONFIG_FSL_SDK_DPA=y +CONFIG_FSL_SDK_FMAN=y +CONFIG_FSL_SDK_DPAA_ETH=y + # network and misc CONFIG_NET_DSA=y CONFIG_NET_DSA_MSCC_FELIX=y