forked from xuos/xiuos
conflict resolution
This commit is contained in:
parent
0501122537
commit
233024f3f0
|
@ -41,6 +41,10 @@ ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
|
||||||
SRC_DIR += ethernet
|
SRC_DIR += ethernet
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y)
|
||||||
|
SRC_DIR += ethercat
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_CONNECTION_ADAPTER_BLUETOOTH),y)
|
ifeq ($(CONFIG_CONNECTION_ADAPTER_BLUETOOTH),y)
|
||||||
SRC_DIR += bluetooth
|
SRC_DIR += bluetooth
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue