package: uboot-sunxi: various changes
[openwrt-working-2016/.git] / package / boot / uboot-sunxi / patches / 101-sun6i-support-console-on-UART2.patch
1 From c058dfb69136d62f88ae8b121104bdb7ce2df03f Mon Sep 17 00:00:00 2001
2 From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
3 Date: Tue, 16 Jun 2015 10:53:11 +0200
4 Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7)
5
6
7 diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c
8 index 5f39aa0..99675c3 100644
9 --- a/arch/arm/cpu/armv7/sunxi/board.c
10 +++ b/arch/arm/cpu/armv7/sunxi/board.c
11 @@ -76,6 +76,10 @@ static int gpio_init(void)
12         sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1);
13         sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1);
14         sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP);
15 +#elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN6I)
16 +       sunxi_gpio_set_cfgpin(SUNXI_GPG(6), SUN6I_GPG_UART2);
17 +       sunxi_gpio_set_cfgpin(SUNXI_GPG(7), SUN6I_GPG_UART2);
18 +       sunxi_gpio_set_pull(SUNXI_GPG(7), SUNXI_GPIO_PULL_UP);
19  #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I)
20         sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUN8I_GPB_UART2);
21         sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2);
22 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
23 index 9576bc1..bda4059 100644
24 --- a/include/configs/sunxi-common.h
25 +++ b/include/configs/sunxi-common.h
26 @@ -260,6 +260,8 @@ extern int soft_i2c_gpio_scl;
27  #endif
28  #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I)
29  #define OF_STDOUT_PATH         "/soc@01c00000/serial@01c28400:115200"
30 +#elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN6I)
31 +#define OF_STDOUT_PATH          "/soc@01c00000/serial@01c28800:115200"
32  #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I)
33  #define OF_STDOUT_PATH         "/soc@01c00000/serial@01c28800:115200"
34  #elif CONFIG_CONS_INDEX == 5 && defined(CONFIG_MACH_SUN8I)
35 -- 
36 cgit v0.10.2
37