aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-11-23 19:41:24 +0100
committerGitHub <noreply@github.com>2016-11-23 19:41:24 +0100
commitfee8b58d42c5b155d91929a2148033eac0b26018 (patch)
tree90c6e6efe69a480f1ed9cb7ded42548fab0ef4c2 /package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
parent10ccba1ba8759e1f1bbfb5471e9fe6b197979139 (diff)
parent9e2f8fa1e5df297c172ce1472eb076c3c0b27cad (diff)
downloadmaster-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/100-sun6i-alternate-on-UART2.patch')
-rw-r--r--package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch b/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
index 46c497269a..bf5dc66e1a 100644
--- a/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
+++ b/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
@@ -4,11 +4,9 @@ Date: Tue, 16 Jun 2015 10:52:01 +0200
Subject: sun6i: define alternate-function for UART2 on GPG
-diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
-index 8e67b3b..1fbf494 100644
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
-@@ -177,6 +177,7 @@ enum sunxi_gpio_number {
+@@ -180,6 +180,7 @@ enum sunxi_gpio_number {
#define SUN6I_GPG_SDC1 2
#define SUN8I_GPG_SDC1 2
#define SUN6I_GPG_TWI3 2
@@ -16,6 +14,3 @@ index 8e67b3b..1fbf494 100644
#define SUN5I_GPG_UART1 4
#define SUN4I_GPH_SDC1 5
---
-cgit v0.10.2
-