Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop

APP_Framework/Framework/connection/Kconfig

@@ -62,12 +62,6 @@ if SUPPORT_CONNECTION_FRAMEWORK
                 default n
         if CONNECTION_ADAPTER_ETHERNET
         source "$APP_DIR/Framework/connection/ethernet/Kconfig"
-        config CONNECTION_ADAPTER_ETHERCAT
-                bool "Using ethercat on ethernet adapter device"
-                default n
-        if CONNECTION_ADAPTER_ETHERCAT
-        source "$APP_DIR/Framework/connection/ethercat/Kconfig"
-        endif
         endif
 
         menuconfig CONNECTION_ADAPTER_BLUETOOTH

APP_Framework/Framework/connection/Makefile

@@ -41,10 +41,6 @@ ifeq ($(CONFIG_ADD_XIZI_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

APP_Framework/Framework/connection/industrial_ethernet/Kconfig

@@ -0,0 +1,7 @@
+config CONNECTION_ADAPTER_ETHERCAT
+    bool "Using ethercat on industrial_ethernet adapter device"
+    default n
+
+    if CONNECTION_ADAPTER_ETHERCAT
+        source "$APP_DIR/Framework/connection/industrial_ethernet/ethercat/Kconfig"
+    endif

APP_Framework/Framework/connection/industrial_ethernet/Makefile

@@ -1,2 +1,5 @@
+ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y)
+	SRC_DIR += ethercat
+endif
 
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Framework/connection/industrial_ethernet/ethercat/Kconfig

@@ -5,6 +5,7 @@ config ADAPTER_HFA21_ETHERCAT
         bool "Using ethercat on ethernet adapter device HFA21"
         default n
 
-if ADAPTER_HFA21_ETHERCAT
-    source "$APP_DIR/Framework/connection/ethercat/hfa21_ethercat/Kconfig"
-endif
+    if ADAPTER_HFA21_ETHERCAT
+        source "$APP_DIR/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/Kconfig"
+    endif
+