From 233024f3f0afa0bc5c2435741de55612b3fd2cd1 Mon Sep 17 00:00:00 2001 From: wgz-code <820906721@qq.com> Date: Fri, 4 Mar 2022 11:58:46 +0800 Subject: [PATCH] conflict resolution --- APP_Framework/Framework/connection/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/APP_Framework/Framework/connection/Makefile b/APP_Framework/Framework/connection/Makefile index 205b9f52b..67308ba5b 100644 --- a/APP_Framework/Framework/connection/Makefile +++ b/APP_Framework/Framework/connection/Makefile @@ -41,6 +41,10 @@ ifeq ($(CONFIG_ADD_XIUOS_FETURES),y) SRC_DIR += ethernet endif + ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y) + SRC_DIR += ethercat + endif + ifeq ($(CONFIG_CONNECTION_ADAPTER_BLUETOOTH),y) SRC_DIR += bluetooth endif