aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-12-27 16:00:41 +0100
committerGitHub <noreply@github.com>2016-12-27 16:00:41 +0100
commit187ad058ee1f21b1d78ff86fe2fc42459f10457b (patch)
treec34448b5d917975d8a6f6b5ccbbebe4f67443e9f /package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch
parent5ecf7a9b2804ed5dc6fc0389c95656c6695568a0 (diff)
parent52b0b6ea7a440b4cf3c9eb33557be7ad63e23f77 (diff)
downloadmaster-187ad058-187ad058ee1f21b1d78ff86fe2fc42459f10457b.tar.gz
master-187ad058-187ad058ee1f21b1d78ff86fe2fc42459f10457b.tar.bz2
master-187ad058-187ad058ee1f21b1d78ff86fe2fc42459f10457b.zip
Merge pull request #291 from wigyori/sunxi-uboot-fixesHEADmaster
sunxi: uboot-sunxi: update to 2016.11
Diffstat (limited to 'package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch')
-rw-r--r--package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch b/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch
index 087074d0c9..e0cd933443 100644
--- a/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch
+++ b/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch
@@ -4,9 +4,9 @@ Date: Tue, 16 Jun 2015 10:53:11 +0200
Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7)
---- a/arch/arm/cpu/armv7/sunxi/board.c
-+++ b/arch/arm/cpu/armv7/sunxi/board.c
-@@ -88,6 +88,10 @@ static int gpio_init(void)
+--- a/arch/arm/mach-sunxi/board.c
++++ b/arch/arm/mach-sunxi/board.c
+@@ -118,6 +118,10 @@ static int gpio_init(void)
sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1);
sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1);
sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP);
@@ -19,7 +19,7 @@ Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7)
sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2);
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
-@@ -260,6 +260,8 @@ extern int soft_i2c_gpio_scl;
+@@ -263,6 +263,8 @@ extern int soft_i2c_gpio_scl;
#endif
#elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN5I)
#define OF_STDOUT_PATH "/soc@01c00000/serial@01c28400:115200"