Browse Source

add: 支持日志全部走UART1,不走UART0

https://gitee.com/openLuat/LuatOS/issues/I7XT8A
Wendal Chen 2 years ago
parent
commit
1721e1530a

+ 4 - 1
app/main.c

@@ -223,7 +223,10 @@ void bpool(void *buffer, long len) {}
 
 extern const u8 default_mac[];
 void sys_mac_init() {
-    u8 mac_addr[6];
+#ifdef LUAT_CONF_LOG_UART1
+	luat_log_set_uart_port(1);
+#endif
+    u8 mac_addr[6] = {0};
     char unique_id [20] = {0};
     tls_fls_read_unique_id(unique_id);
 

+ 7 - 0
cloudbuild/air101.meta.json

@@ -556,6 +556,13 @@
                         "rsize": 192000,
                         "fsize": 1024,
                         "dft": false
+                    },
+                    {
+                        "name" : "LUAT_CONF_LOG_UART1",
+                        "content": "日志走UART1, 不走UART0",
+                        "rsize": 1024,
+                        "fsize": 1024,
+                        "dft": false
                     }
                 ]
             },

+ 7 - 0
cloudbuild/air103.meta.json

@@ -268,6 +268,13 @@
                         "rsize": 192000,
                         "fsize": 1024,
                         "dft": false
+                    },
+                    {
+                        "name" : "LUAT_CONF_LOG_UART1",
+                        "content": "日志走UART1, 不走UART0",
+                        "rsize": 1024,
+                        "fsize": 1024,
+                        "dft": false
                     }
                 ]
             },

+ 7 - 0
cloudbuild/air601.meta.json

@@ -343,6 +343,13 @@
                         "rsize": 192000,
                         "fsize": 1024,
                         "dft": false
+                    },
+                    {
+                        "name" : "LUAT_CONF_LOG_UART1",
+                        "content": "日志走UART1, 不走UART0",
+                        "rsize": 1024,
+                        "fsize": 1024,
+                        "dft": false
                     }
                 ]
             },

+ 6 - 3
platform/arch/xt804/bsp/board_init.c

@@ -50,7 +50,10 @@ static void uart0Init (int bandrate)
 //	tls_reg_write32(HR_UART0_INT_MASK, 0x00);             		/* Disable INT */
 
 }
-#if 0
+
+#include "luat_conf_bsp.h"
+
+#ifndef LUAT_CONF_LOG_UART1
 static void uart1_io_init(void)
 {
     uint32_t temp;
@@ -95,13 +98,13 @@ static void uart1Init (int bandrate)
 void board_init(void)
 {
 
-#if USE_UART0_PRINT
+#ifndef LUAT_CONF_LOG_UART1
     /* use uart0 as log output io */
     uart0Init(921600);
 #else
     uart1_io_init();
     /* use uart1 as log output io */
-	uart1Init(115200);
+	uart1Init(921600);
 	set_printf_port(1);	
 #endif
 }