diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-15 18:41:57 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-09-18 18:36:26 +0200 |
| commit | 1422d4435b173d0c80289327095026d7da44b5f1 (patch) | |
| tree | a601e1e0f9a435acde64fc498bb54c2ee865dbf8 /package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch | |
| parent | ea9fab904bcb71033e71b819328d97a6e2b3de36 (diff) | |
| download | upstream-1422d4435b173d0c80289327095026d7da44b5f1.tar.gz upstream-1422d4435b173d0c80289327095026d7da44b5f1.tar.bz2 upstream-1422d4435b173d0c80289327095026d7da44b5f1.zip | |
uboot-sunxi: update to version 2017.07
The deleted patches are already integrated in the upstream U-Boot
version.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 | 8 |
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..d140f2d538 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 +@@ -126,6 +126,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; +@@ -259,6 +259,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" |