aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-06-09 18:40:16 +0200
committerJohn Crispin <john@phrozen.org>2018-06-18 07:10:20 +0200
commitf2135e7811fec7174f5a74bc579a6a8f936d1100 (patch)
tree341f8bf3695aa505400854ba1adf11a316dbdfe5 /package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
parent7afe1caf7000f4ca671d3d681feef11af01e8551 (diff)
downloadupstream-f2135e7811fec7174f5a74bc579a6a8f936d1100.tar.gz
upstream-f2135e7811fec7174f5a74bc579a6a8f936d1100.tar.bz2
upstream-f2135e7811fec7174f5a74bc579a6a8f936d1100.zip
uboot-sunxi: update to version 2018.05
This patch 220-add-sunxi50i-nanopi-neo-plus2.patch was merged upstream. The u-boot-sunxi-with-spl.bin is now also created for the ARM64 sunxi boards by U-Boot itself, no need to do it manually any more. This was tested on a H2+ Orange Pi R1 and a H5 Orange Pi Zero Plus. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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.patch2
1 files changed, 1 insertions, 1 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 8bab220518..b3d9ba0409 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
@@ -6,7 +6,7 @@ Subject: sun6i: define alternate-function for UART2 on GPG
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
-@@ -186,6 +186,7 @@ enum sunxi_gpio_number {
+@@ -185,6 +185,7 @@ enum sunxi_gpio_number {
#define SUN6I_GPG_SDC1 2
#define SUN8I_GPG_SDC1 2
#define SUN6I_GPG_TWI3 2