From 52b0b6ea7a440b4cf3c9eb33557be7ad63e23f77 Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Tue, 27 Dec 2016 14:49:28 +0100 Subject: sunxi: uboot-sunxi: update to 2016.11 While at it: - refresh Theobroma patches - refresh patches - delete obsolete/upstreamed patches - add support for Merrii A80 board Signed-off-by: Zoltan HERPAI --- .../uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch') diff --git a/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch b/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch index e5a66d7ebe..71ec7a1303 100644 --- a/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch +++ b/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch @@ -1,16 +1,16 @@ --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -152,6 +152,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ +@@ -206,6 +206,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ sun6i-a31-m9.dtb \ sun6i-a31-mele-a1000g-quad.dtb \ sun6i-a31-mixtile-loftq.dtb \ + sun6i-a31-pangolin.dtb \ + sun6i-a31s-colorfly-e708-q1.dtb \ sun6i-a31s-cs908.dtb \ - sun6i-a31s-primo81.dtb \ - sun6i-a31s-sinovoip-bpi-m2.dtb + sun6i-a31s-inet-q972.dtb \ --- a/arch/arm/dts/sun6i-a31.dtsi +++ b/arch/arm/dts/sun6i-a31.dtsi -@@ -643,6 +643,13 @@ +@@ -679,6 +679,13 @@ allwinner,pull = ; }; @@ -360,7 +360,7 @@ +CONFIG_SUNXI_SPI=y --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig -@@ -15,7 +15,6 @@ config SUNXI_GEN_SUN6I +@@ -42,7 +42,6 @@ config SUNXI_GEN_SUN6I separate ahb reset control registers, custom pmic bus, new style watchdog, etc. @@ -368,7 +368,7 @@ choice prompt "Sunxi SoC Variant" optional -@@ -533,6 +532,14 @@ config VIDEO_LCD_PANEL_I2C_SCL +@@ -599,6 +598,14 @@ config VIDEO_LCD_PANEL_I2C_SCL Set the SCL pin for the LCD i2c interface. This takes a string in the format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H. -- cgit v1.2.3