Commit: c0d4bb945cfbcc3731661b02f7caf6b18f060c2e - uboot (git)

Commit MetaInfo

• Revision: c0d4bb945cfbcc3731661b02f7caf6b18f060c2e (tree)
• Time: 2020-06-03 18:59:50
• Author: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

fix build error

Change Summary

• modified: cmd/bdinfo.c
• modified: drivers/serial/serial_sh.h

Incremental Difference

--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -482,7 +482,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 	return 0;
 }
 #elif defined(CONFIG_RX)
-int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
 	bd_t *bd = gd->bd;
 

--- a/drivers/serial/serial_sh.h
+++ b/drivers/serial/serial_sh.h
@@ -107,7 +107,7 @@ struct uart_port {
 # define SCSPTR5 0x00088268             /* 8 bit SCI */
 # define SCSPTR6 0x00088270             /* 8 bit SCI */
 # define SCSCR_INIT(port)       0x38    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-#elif defined(CONFIG_RXV2)
+#elif defined(CONFIG_RX) && !defined(CONFIG_SCI)
 # define SCSCR_INIT(port)       0x30    /* TE=1,RE=1 */
 #else
 # error CPU subtype not defined