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

Ubiquitous/XiZi/kernel/thread/init.c

@@ -31,10 +31,6 @@
 #include "connect_usb.h"
 #endif
 
-#ifdef BSP_USING_WDT
-#include "connect_wdt.h"
-#endif
-
 #ifdef KERNEL_USER_MAIN
 #ifndef MAIN_KTASK_STACK_SIZE
 #define MAIN_KTASK_STACK_SIZE     2048
@@ -44,6 +40,10 @@
 #endif
 #endif
 
+#ifdef BSP_USING_WDT
+extern int StartWatchdog(void);
+#endif
+
 extern void CreateKServiceKTask(void);
 extern int main(void);
 void InitBoardHardware(void);