OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 4... Line 4...
4 Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7) 4 Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7)
Line 5... Line 5...
5   5  
6   6  
7 --- a/arch/arm/mach-sunxi/board.c 7 --- a/arch/arm/mach-sunxi/board.c
8 +++ b/arch/arm/mach-sunxi/board.c 8 +++ b/arch/arm/mach-sunxi/board.c
9 @@ -127,6 +127,10 @@ static int gpio_init(void) 9 @@ -124,6 +124,10 @@ static int gpio_init(void)
10 sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1); 10 sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1);
11 sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1); 11 sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1);
12 sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP); 12 sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP);
Line 17... Line 17...
17 #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I) 17 #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I)
18 sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUN8I_GPB_UART2); 18 sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUN8I_GPB_UART2);
19 sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2); 19 sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2);
20 --- a/include/configs/sunxi-common.h 20 --- a/include/configs/sunxi-common.h
21 +++ b/include/configs/sunxi-common.h 21 +++ b/include/configs/sunxi-common.h
22 @@ -258,6 +258,8 @@ extern int soft_i2c_gpio_scl; 22 @@ -256,6 +256,8 @@ extern int soft_i2c_gpio_scl;
23 #endif 23 #endif
24 #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I) 24 #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I)
25 #define OF_STDOUT_PATH "/soc@01c00000/serial@01c28400:115200" 25 #define OF_STDOUT_PATH "/soc@01c00000/serial@01c28400:115200"
26 +#elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN6I) 26 +#elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN6I)
27 +#define OF_STDOUT_PATH "/soc@01c00000/serial@01c28800:115200" 27 +#define OF_STDOUT_PATH "/soc@01c00000/serial@01c28800:115200"