sync the upstream

Ubiquitous/XiZi/kernel/thread/console.c

@@ -68,11 +68,12 @@ void InstallConsole(const char *bus_name, const char *drv_name, const char *dev_
             BusDevClose(_console);
         }
 
+        console_bus->match(console_drv, console);
+
         configure_info.configure_cmd = OPE_INT;
         memset(&serial_cfg, 0, sizeof(struct SerialCfgParam));
         configure_info.private_data = &serial_cfg;
         BusDrvConfigure(console_drv, &configure_info);
-        console_bus->match(console_drv, console);
 
         serial_dev_param = (struct SerialDevParam *)console->private_data;
         serial_dev_param->serial_set_mode = 0;

Ubiquitous/XiZi/kernel/thread/init.c

@@ -31,6 +31,10 @@
 #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
@@ -242,6 +246,10 @@ extern int InitUserspace(void);
 	HwLockSpinlock(&AssignSpinLock);
 #endif
 
+#ifdef BSP_USING_WDT
+    StartWatchdog();
+#endif
+
     StartupOsAssign();
 	
     return 0;

Ubiquitous/XiZi/kernel/thread/msgqueue.c

@@ -96,7 +96,6 @@ static x_err_t _MsgQueueSend(struct MsgQueue *mq,
 
     tick_delta = 0;
     task = GetKTaskDescriptor();
-    
     if(WAITING_FOREVER == msec)
         timeout = WAITING_FOREVER;
     else

Ubiquitous/XiZi/kernel/thread/semaphore.c

@@ -94,12 +94,10 @@ static int32 _SemaphoreObtain(struct Semaphore *sem, int32 msec)
     struct TaskDescriptor *task = NONE;
 
     NULL_PARAM_CHECK(sem);
-    
     if(WAITING_FOREVER == msec)
         wait_time = WAITING_FOREVER;
     else
         wait_time = CalculteTickFromTimeMs(msec);
-    
     lock = CriticalAreaLock();
 
     SYS_KDEBUG_LOG(KDBG_IPC, ("obtain semaphore: id %d, value %d, by task %s\n",