diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2016-11-23 19:41:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-23 19:41:24 +0100 |
commit | fee8b58d42c5b155d91929a2148033eac0b26018 (patch) | |
tree | 90c6e6efe69a480f1ed9cb7ded42548fab0ef4c2 /package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch | |
parent | 10ccba1ba8759e1f1bbfb5471e9fe6b197979139 (diff) | |
parent | 9e2f8fa1e5df297c172ce1472eb076c3c0b27cad (diff) | |
download | master-187ad058-fee8b58d42c5b155d91929a2148033eac0b26018.tar.gz master-187ad058-fee8b58d42c5b155d91929a2148033eac0b26018.tar.bz2 master-187ad058-fee8b58d42c5b155d91929a2148033eac0b26018.zip |
Merge pull request #241 from wigyori/sunxi-uboot-fixes
uboot-sunxi: fix default config for OLIMEX A13 SOM
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.patch | 9 |
1 files changed, 1 insertions, 8 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 2b17999fb9..087074d0c9 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,11 +4,9 @@ Date: Tue, 16 Jun 2015 10:53:11 +0200 Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7) -diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c -index 5f39aa0..99675c3 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c -@@ -76,6 +76,10 @@ static int gpio_init(void) +@@ -88,6 +88,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,8 +17,6 @@ index 5f39aa0..99675c3 100644 #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I) sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUN8I_GPB_UART2); sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2); -diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h -index 9576bc1..bda4059 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -260,6 +260,8 @@ extern int soft_i2c_gpio_scl; @@ -32,6 +28,3 @@ index 9576bc1..bda4059 100644 #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I) #define OF_STDOUT_PATH "/soc@01c00000/serial@01c28800:115200" #elif CONFIG_CONS_INDEX == 5 && defined(CONFIG_MACH_SUN8I) --- -cgit v0.10.2 - |