Merge pull request #2455 from armink/lts-v3.1.x

Lts v3.1.x

Author: BernardXiong

.travis.yml

@@ -18,9 +18,6 @@ before_script:
   - export RTT_ROOT=`pwd`
   - "[ x$RTT_CC == x ] && export RTT_CC='gcc' || true"
 
-script:
-  - scons -C bsp/$RTT_BSP
-
 env:
 #  - RTT_BSP='simulator' RTT_CC='clang-analyze' RTT_EXEC_PATH=/usr/share/clang/scan-build
   - RTT_BSP='CME_M7' RTT_TOOL_CHAIN='sourcery-arm'
@@ -110,3 +107,7 @@ env:
   - RTT_BSP='frdm-k64f' RTT_TOOL_CHAIN='sourcery-arm'
   - RTT_BSP='fh8620' RTT_TOOL_CHAIN='sourcery-arm'
   - RTT_BSP='x1000' RTT_TOOL_CHAIN='sourcery-mips'
+
+stage: compile
+script:
+  - scons -C bsp/$RTT_BSP

bsp/CME_M7/rtconfig.h

@@ -17,6 +17,7 @@
 /* SECTION: RT_DEBUG */
 /* Thread Debug */
 #define RT_DEBUG
+#define RT_DEBUG_COLOR
 #define RT_USING_OVERFLOW_CHECK
 
 /* Using Hook */

bsp/allwinner_tina/.config

@@ -14,6 +14,7 @@ CONFIG_RT_THREAD_PRIORITY_32=y
 CONFIG_RT_THREAD_PRIORITY_MAX=32
 CONFIG_RT_TICK_PER_SECOND=100
 CONFIG_RT_DEBUG=y
+CONFIG_RT_DEBUG_COLOR=y
 CONFIG_RT_USING_OVERFLOW_CHECK=y
 CONFIG_RT_DEBUG_INIT=0
 CONFIG_RT_DEBUG_THREAD=0

bsp/allwinner_tina/drivers/drv_gpio.c

@@ -27,13 +27,10 @@
 #include "drv_gpio.h"
 #include "interrupt.h"
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME  "GPIO"
 #define DBG_LEVEL         DBG_WARNING
-#define DBG_COLOR
 #include <rtdbg.h>
 
-
 #define readl(addr)           (*(volatile unsigned int *)(addr))
 #define writel(value,addr)    (*(volatile unsigned int *)(addr) = (value))
 

bsp/allwinner_tina/drivers/drv_sdio.c

@@ -32,13 +32,12 @@
 #include "drv_gpio.h"
 #include "drv_clock.h"
 
-#define DBG_ENABLE
+
 #define DBG_SECTION_NAME  "MMC"
 // #define DBG_LEVEL DBG_LOG    
 // #define DBG_LEVEL DBG_INFO   
 #define DBG_LEVEL DBG_WARNING
 // #define DBG_LEVEL DBG_ERROR  
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #ifdef RT_USING_SDIO

bsp/allwinner_tina/drivers/spi/drv_spi.c

@@ -35,14 +35,12 @@
 
 //#define DEBUG
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME  "SPI"
 #ifdef DEBUG
 #define DBG_LEVEL         DBG_LOG
 #else
 #define DBG_LEVEL         DBG_WARNING
 #endif /* DEBUG */
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #ifdef RT_USING_SPI

bsp/allwinner_tina/drivers/spi/drv_spi_flash.c

@@ -26,10 +26,8 @@
 #include <rthw.h>
 #include <rtdevice.h>
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME  "FLASH"
 #define DBG_LEVEL         DBG_LOG
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #define SPI_FLASH_DEVICE_NAME       "spi00"

bsp/allwinner_tina/rtconfig.h

@@ -14,6 +14,7 @@
 #define RT_THREAD_PRIORITY_MAX 32
 #define RT_TICK_PER_SECOND 100
 #define RT_DEBUG
+#define RT_DEBUG_COLOR
 #define RT_USING_OVERFLOW_CHECK
 #define RT_DEBUG_INIT 0
 #define RT_DEBUG_THREAD 0

bsp/amebaz/.config

@@ -21,6 +21,7 @@ CONFIG_RT_USING_TIMER_SOFT=y
 CONFIG_RT_TIMER_THREAD_PRIO=4
 CONFIG_RT_TIMER_THREAD_STACK_SIZE=1024
 CONFIG_RT_DEBUG=y
+CONFIG_RT_DEBUG_COLOR=y
 # CONFIG_RT_DEBUG_INIT_CONFIG is not set
 # CONFIG_RT_DEBUG_THREAD_CONFIG is not set
 # CONFIG_RT_DEBUG_SCHEDULER_CONFIG is not set

bsp/amebaz/drivers/wlan/drv_wifi.c

@@ -28,10 +28,8 @@
 #include "drv_wlan.h"
 #include "drv_wifi.h"
 
-#define DBG_ENABLE
 #define DBG_LEVEL DBG_INFO
 #define DBG_SECTION_NAME  "WIFI"
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #define MAX_ADDR_LEN          (6)