From f538d84415ddee95d4665a9a038c91237ed37cc7 Mon Sep 17 00:00:00 2001 From: xiane Date: Tue, 9 Jul 2024 14:15:36 +0900 Subject: [PATCH] ODROID: configs: moved can configs. - moved can configs to odroid_common.config. Signed-off-by: xiane Change-Id: Ie40fda61c3201583da346bf96badc33570b34caa --- arch/arm64/configs/odroid_common.config | 5 +++++ arch/arm64/configs/odroidm1.config | 4 ---- arch/arm64/configs/odroidm1s.config | 4 ---- arch/arm64/configs/odroidm2.config | 2 -- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/arm64/configs/odroid_common.config b/arch/arm64/configs/odroid_common.config index 96e5f3bdce57..b272ddb2e338 100644 --- a/arch/arm64/configs/odroid_common.config +++ b/arch/arm64/configs/odroid_common.config @@ -1,3 +1,8 @@ +# can +CONFIG_CAN=y +CONFIG_CANFD_ROCKCHIP=y +CONFIG_CAN_MCP251X=y +CONFIG_CAN_ROCKCHIP=y # wifi/bt CONFIG_BT=y CONFIG_BT_BCM=m diff --git a/arch/arm64/configs/odroidm1.config b/arch/arm64/configs/odroidm1.config index 253d3bb842ad..95156dc56c91 100644 --- a/arch/arm64/configs/odroidm1.config +++ b/arch/arm64/configs/odroidm1.config @@ -4,10 +4,6 @@ # CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER is not set CONFIG_ARCH_ROCKCHIP_ODROIDM1=y # CONFIG_BCMDHD is not set -CONFIG_CAN=y -CONFIG_CANFD_ROCKCHIP=y -CONFIG_CAN_MCP251X=y -CONFIG_CAN_ROCKCHIP=y #CONFIG_DEVMEM=y CONFIG_DRM_PANEL_ILITEK_ILI9881C=y CONFIG_KEYBOARD_GPIO_POLLED=y diff --git a/arch/arm64/configs/odroidm1s.config b/arch/arm64/configs/odroidm1s.config index e4c2aaff6553..9773af029234 100644 --- a/arch/arm64/configs/odroidm1s.config +++ b/arch/arm64/configs/odroidm1s.config @@ -4,10 +4,6 @@ # CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER is not set CONFIG_ARCH_ROCKCHIP_ODROIDM1=y # CONFIG_BCMDHD is not set -CONFIG_CAN=y -CONFIG_CANFD_ROCKCHIP=y -CONFIG_CAN_MCP251X=y -CONFIG_CAN_ROCKCHIP=y #CONFIG_DEVMEM=y CONFIG_DRM_PANEL_ILITEK_ILI9881C=y CONFIG_KEYBOARD_GPIO_POLLED=y diff --git a/arch/arm64/configs/odroidm2.config b/arch/arm64/configs/odroidm2.config index 4e387e3d6ec4..8c1daf2959be 100644 --- a/arch/arm64/configs/odroidm2.config +++ b/arch/arm64/configs/odroidm2.config @@ -4,8 +4,6 @@ # CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER is not set CONFIG_ARCH_ROCKCHIP_ODROIDM2=y # CONFIG_BCMDHD is not set -CONFIG_CAN=y -CONFIG_CAN_MCP251X=y # CONFIG_DEVMEM is not set CONFIG_DRM_PANEL_ILITEK_ILI9881C=y CONFIG_KEYBOARD_GPIO_POLLED=y