diff --git a/u-boot/drivers/serial/serial_rk.c b/u-boot/drivers/serial/serial_rk.c
index 3c91cbafa..ae708d707 100755
--- a/u-boot/drivers/serial/serial_rk.c
+++ b/u-boot/drivers/serial/serial_rk.c
@@ -11,6 +11,8 @@
#define RKUART_VERSION "1.3"
+//#define UBOOT_UART2_ENABLE
+
/* io base config */
static volatile void __iomem *g_rkuart_base[UART_CH_MAX] = {
(void __iomem *)RKIO_UART0_BASE,
@@ -159,6 +161,7 @@ static inline int rk_uart_set_baudrate(volatile void *base, uint32 baudrate)
static int rk_uart_init(eUART_ch_t ch, uint32 baudrate)
{
+#ifdef UBOOT_UART2_ENABLE
volatile void *base = rk_uart_get_base(ch);
int val = -1;
@@ -181,6 +184,7 @@ static int rk_uart_init(eUART_ch_t ch, uint32 baudrate)
return -1;
rk_uart_set_fifo(base);
+#endif
return 0;
}
@@ -188,6 +192,7 @@ static int rk_uart_init(eUART_ch_t ch, uint32 baudrate)
static int rk_uart_sendbyte(eUART_ch_t ch, uint8 byte)
{
+#ifdef UBOOT_UART2_ENABLE
volatile void *base = rk_uart_get_base(ch);
if (base == NULL)
@@ -196,6 +201,7 @@ static int rk_uart_sendbyte(eUART_ch_t ch, uint8 byte)
do {} while ((readl(base + UART_USR) & UART_TRANSMIT_FIFO_NOT_FULL) == 0);
writel(byte, base + UART_THR);
+#endif
return 0;
}
@@ -203,6 +209,7 @@ static int rk_uart_sendbyte(eUART_ch_t ch, uint8 byte)
static uint8 rk_uart_recvbyte(eUART_ch_t ch)
{
+#ifdef UBOOT_UART2_ENABLE
volatile void *base = rk_uart_get_base(ch);
volatile uint8 data = 0;
@@ -214,28 +221,39 @@ static uint8 rk_uart_recvbyte(eUART_ch_t ch)
data = (uint8)readl(base + UART_RBR);
return data;
+#else
+ return 0;
+#endif
}
static int rk_uart_set_brg(eUART_ch_t ch, uint32 baudrate)
{
+#ifdef UBOOT_UART2_ENABLE
volatile void *base = rk_uart_get_base(ch);
if (base == NULL)
return -1;
return rk_uart_set_baudrate(base, baudrate);
+#else
+ return 0;
+#endif
}
static int rk_uart_tstc(eUART_ch_t ch)
{
+#ifdef UBOOT_UART2_ENABLE
volatile void *base = rk_uart_get_base(ch);
if (base == NULL)
return -1;
return (readl(base + UART_USR) & UART_RECEIVE_FIFO_NOT_EMPTY) == UART_RECEIVE_FIFO_NOT_EMPTY;
+#else
+ return 0;
+#endif
}
rk3399 android7.1 uboot关闭uart2调试信息输出
该文主要展示了对u-boot中RKUART驱动的修改,增加了对UART2的支持,包括初始化函数、发送和接收字节的功能,并定义了新的版本号1.3。更新内容涉及rk_uart_set_baudrate、rk_uart_init等函数,以及针对UART2的条件编译。
摘要由CSDN通过智能技术生成