[U-Boot] [PATCH 1/4] rmobile: armadillo-800eva: Change init function of SCIFA1
This initializes GPIO, without using PFC framework in board_early_init_f function. It is because it cannot initialize normally when PFC is used.
Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com --- board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index a075865..0e9c222 100644 --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c @@ -243,6 +243,9 @@ void s_init(void) #define I2C1_MSTP323 (1 << 23) #define GETHER_MSTP309 (1 << 9)
+#define GPIO_SCIFA1_TXD (0xE60520C4) +#define GPIO_SCIFA1_RXD (0xE60520C3) + int board_early_init_f(void) { /* TMU */ @@ -256,9 +259,8 @@ int board_early_init_f(void) clrbits_le32(MSTPCR3, I2C1_MSTP323);
/* SCIFA1 */ - r8a7740_pinmux_init(); - gpio_request(GPIO_FN_SCIFA1_RXD, NULL); - gpio_request(GPIO_FN_SCIFA1_TXD, NULL); + writeb(1, GPIO_SCIFA1_TXD); /* SCIFA1_TXD */ + writeb(1, GPIO_SCIFA1_RXD); /* SCIFA1_RXD */
/* IICCR */ writew(GPIO_ICCR_DATA, GPIO_ICCR);
Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com --- include/configs/armadillo-800eva.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 2f75099..5b634fd 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -43,6 +43,8 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP + +#define CONFIG_OF_LIBFDT #define BOARD_LATE_INIT
#define CONFIG_BAUDRATE 115200
Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com --- include/configs/armadillo-800eva.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 5b634fd..d1a0b62 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -43,6 +43,8 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP +#define CONFIG_CMD_NFS +#define CONFIG_CMD_BOOTZ
#define CONFIG_OF_LIBFDT #define BOARD_LATE_INIT
armadillo-800eva needs this config.
Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com --- include/configs/armadillo-800eva.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index d1a0b62..b4402dd 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -58,7 +58,6 @@
#define CONFIG_ARCH_CPU_INIT #define CONFIG_DISPLAY_CPUINFO -#define CONFIG_SYS_NO_L2CACHE #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_USE_ARCH_MEMSET
participants (1)
-
Nobuhiro Iwamatsu