WIP: Update mainline u-boot to v2017.05

config/boards/bananapim2plus.conf

@@ -1,7 +1,7 @@
 # H3 quad core 1Gb SoC Wifi
 BOARD_NAME="Banana Pi M2+"
 LINUXFAMILY="sun8i"
-BOOTCONFIG="Sinovoip_BPI_M2_plus_defconfig"
+BOOTCONFIG="Sinovoip_BPI_M2_Plus_defconfig"
 #
 MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir dhd hci_uart rfcomm hidp"
 MODULES_NEXT="brcmfmac"

config/boards/nanopiair.conf

@@ -1,7 +1,7 @@
 # H3 quad core 512MB SoC Headless WiFi/BT eMMC
 BOARD_NAME="NanoPi Air"
 LINUXFAMILY="sun8i"
-BOOTCONFIG="nanopi_air_defconfig"
+BOOTCONFIG="nanopi_neo_air_defconfig"
 #
 MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_serial"
 MODULES_NEXT="brcmfmac g_serial"

configuration.sh

@@ -48,7 +48,7 @@ if [[ $USE_GITHUB_UBOOT_MIRROR == yes ]]; then
 else
 	MAINLINE_UBOOT_SOURCE='git://git.denx.de/u-boot.git'
 fi
-MAINLINE_UBOOT_BRANCH='tag:v2017.03'
+MAINLINE_UBOOT_BRANCH='tag:v2017.05'
 MAINLINE_UBOOT_DIR='u-boot'
 
 # Let's set default data if not defined in board configuration above

patch/u-boot/u-boot-sunxi/4kfix-limit-screen-to-full-hd.patch

@@ -1,15 +1,15 @@
-diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c
-index 6f8ee01..7c12a66 100644
---- a/drivers/video/sunxi_display.c
-+++ b/drivers/video/sunxi_display.c
-@@ -1406,8 +1406,12 @@ void *video_hw_init(void)
+diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
+index 92c9d06054..cd16d69e30 100644
+--- a/drivers/video/sunxi/sunxi_display.c
++++ b/drivers/video/sunxi/sunxi_display.c
+@@ -1274,8 +1274,12 @@ void *video_hw_init(void)
  		ret = sunxi_hdmi_hpd_detect(hpd_delay);
  		if (ret) {
  			printf("HDMI connected: ");
 -			if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0)
 -				mode = &custom;
 +			if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0) {
-+				if((custom.xres <= 1920) && (custom.yres <= 1080))
++				if ((custom.xres <= 1920) && (custom.yres <= 1080))
 +					mode = &custom;
 +				else
 +					mode = &res_mode_init[RES_MODE_1920x1080];
@@ -17,4 +17,3 @@ index 6f8ee01..7c12a66 100644
  		} else if (hpd) {
  			sunxi_hdmi_shutdown();
  			sunxi_display.monitor = sunxi_get_default_mon(false);
-

patch/u-boot/u-boot-sunxi/a10-a20-lower-dram-clk.patch

@@ -1,18 +1,31 @@
-diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
-index 8cb7ac7..8b6c1bd 100644
---- a/configs/A10-OLinuXino-Lime_defconfig
-+++ b/configs/A10-OLinuXino-Lime_defconfig
+diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
+index fe75eef513..74bcfc64af 100644
+--- a/configs/Bananapi_defconfig
++++ b/configs/Bananapi_defconfig
 @@ -1,7 +1,7 @@
  CONFIG_ARM=y
  CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN4I=y
--CONFIG_DRAM_CLK=480
+ CONFIG_MACH_SUN7I=y
+-CONFIG_DRAM_CLK=432
 +CONFIG_DRAM_CLK=384
- CONFIG_DRAM_EMR1=4
- CONFIG_SYS_CLK_FREQ=912000000
- CONFIG_MMC0_CD_PIN="PH1"
+ CONFIG_MACPWR="PH23"
+ CONFIG_VIDEO_COMPOSITE=y
+ CONFIG_GMAC_TX_DELAY=3
+diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
+index df65922e83..80a45fde6f 100644
+--- a/configs/Bananapro_defconfig
++++ b/configs/Bananapro_defconfig
+@@ -1,7 +1,7 @@
+ CONFIG_ARM=y
+ CONFIG_ARCH_SUNXI=y
+ CONFIG_MACH_SUN7I=y
+-CONFIG_DRAM_CLK=432
++CONFIG_DRAM_CLK=384
+ CONFIG_MACPWR="PH23"
+ CONFIG_USB1_VBUS_PIN="PH0"
+ CONFIG_USB2_VBUS_PIN="PH1"
 diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
-index 4b9d722..0ed969f 100644
+index 02c503f672..cf9c16351d 100644
 --- a/configs/Cubieboard2_defconfig
 +++ b/configs/Cubieboard2_defconfig
 @@ -1,7 +1,7 @@
@@ -22,10 +35,10 @@ index 4b9d722..0ed969f 100644
 -CONFIG_DRAM_CLK=480
 +CONFIG_DRAM_CLK=432
  CONFIG_MMC0_CD_PIN="PH1"
+ CONFIG_SATAPWR="PB8"
  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
-index c884115..1380aba
+index a8e9c988d5..9d892d6343 100644
 --- a/configs/Cubieboard_defconfig
 +++ b/configs/Cubieboard_defconfig
 @@ -1,7 +1,7 @@
@@ -35,49 +48,10 @@ index c884115..1380aba
 -CONFIG_DRAM_CLK=480
 +CONFIG_DRAM_CLK=432
  CONFIG_MMC0_CD_PIN="PH1"
+ CONFIG_SATAPWR="PB8"
  CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
-index c3f0421..d45e160 100644
---- a/configs/Linksprite_pcDuino3_defconfig
-+++ b/configs/Linksprite_pcDuino3_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
--CONFIG_DRAM_CLK=480
-+CONFIG_DRAM_CLK=408
- CONFIG_DRAM_ZQ=122
- CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
-index d9b1bd6..21428c9
---- a/configs/Bananapi_defconfig
-+++ b/configs/Bananapi_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
--CONFIG_DRAM_CLK=432
-+CONFIG_DRAM_CLK=384
- CONFIG_VIDEO_COMPOSITE=y
- CONFIG_GMAC_TX_DELAY=3
- CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
-diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
-index 496c20e..46cff9d
---- a/configs/Bananapro_defconfig
-+++ b/configs/Bananapro_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
--CONFIG_DRAM_CLK=432
-+CONFIG_DRAM_CLK=384
- CONFIG_USB1_VBUS_PIN="PH0"
- CONFIG_USB2_VBUS_PIN="PH1"
- CONFIG_VIDEO_COMPOSITE=y
 diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
-index 4e25392..7e6437f
+index f9d56c8f9d..5d42b59e57 100644
 --- a/configs/Cubietruck_defconfig
 +++ b/configs/Cubietruck_defconfig
 @@ -1,7 +1,7 @@
@@ -90,7 +64,7 @@ index 4e25392..7e6437f
  CONFIG_USB0_VBUS_PIN="PH17"
  CONFIG_USB0_VBUS_DET="PH22"
 diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
-index d2111c6..3cad09d
+index cc29d606a9..dbbdfcc529 100644
 --- a/configs/Lamobo_R1_defconfig
 +++ b/configs/Lamobo_R1_defconfig
 @@ -1,7 +1,7 @@
@@ -99,11 +73,24 @@ index d2111c6..3cad09d
  CONFIG_MACH_SUN7I=y
 -CONFIG_DRAM_CLK=432
 +CONFIG_DRAM_CLK=384
+ CONFIG_MACPWR="PH23"
  CONFIG_MMC0_CD_PIN="PH10"
- CONFIG_GMAC_TX_DELAY=4
- CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1"
+ CONFIG_SATAPWR="PB3"
+diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
+index b9f89a013e..6a42c4b500 100644
+--- a/configs/Linksprite_pcDuino3_defconfig
++++ b/configs/Linksprite_pcDuino3_defconfig
+@@ -1,7 +1,7 @@
+ CONFIG_ARM=y
+ CONFIG_ARCH_SUNXI=y
+ CONFIG_MACH_SUN7I=y
+-CONFIG_DRAM_CLK=480
++CONFIG_DRAM_CLK=408
+ CONFIG_DRAM_ZQ=122
+ CONFIG_SATAPWR="PH2"
+ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
 diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
-index 00c671b..ccf97db
+index b8c1ea4d7c..b4b20372aa 100644
 --- a/configs/Orangepi_defconfig
 +++ b/configs/Orangepi_defconfig
 @@ -1,7 +1,7 @@
@@ -112,11 +99,11 @@ index 00c671b..ccf97db
  CONFIG_MACH_SUN7I=y
 -CONFIG_DRAM_CLK=432
 +CONFIG_DRAM_CLK=384
+ CONFIG_MACPWR="PH23"
  CONFIG_USB1_VBUS_PIN="PH26"
  CONFIG_USB2_VBUS_PIN="PH22"
- CONFIG_VIDEO_VGA=y
 diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
-index a865255..84b4b39
+index 19c35ef103..80404ab377 100644
 --- a/configs/Orangepi_mini_defconfig
 +++ b/configs/Orangepi_mini_defconfig
 @@ -1,7 +1,7 @@
@@ -125,6 +112,6 @@ index a865255..84b4b39
  CONFIG_MACH_SUN7I=y
 -CONFIG_DRAM_CLK=432
 +CONFIG_DRAM_CLK=384
+ CONFIG_MACPWR="PH23"
  CONFIG_MMC0_CD_PIN="PH10"
  CONFIG_MMC3_CD_PIN="PH11"
- CONFIG_MMC_SUNXI_SLOT_EXTRA=3

patch/u-boot/u-boot-sunxi/add-bpi-m2plus-defconfig.patch

@@ -1,22 +1,26 @@
-diff --git a/configs/Sinovoip_BPI_M2_plus_defconfig b/configs/Sinovoip_BPI_M2_plus_defconfig
+diff --git a/configs/Sinovoip_BPI_M2_Plus_defconfig b/configs/Sinovoip_BPI_M2_Plus_defconfig
 new file mode 100644
-index 0000000..e9a7ada
+index 0000000000..e8cd4fb9ec
 --- /dev/null
-+++ b/configs/Sinovoip_BPI_M2_plus_defconfig
-@@ -0,0 +1,16 @@
++++ b/configs/Sinovoip_BPI_M2_Plus_defconfig
+@@ -0,0 +1,20 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_SUNXI=y
 +CONFIG_MACH_SUN8I_H3=y
-+CONFIG_DRAM_CLK=624
++CONFIG_DRAM_CLK=672
 +CONFIG_DRAM_ZQ=3881979
 +CONFIG_DRAM_ODT_EN=y
++CONFIG_MACPWR="PD6"
++CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus"
 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_CONSOLE_MUX=y
 +CONFIG_SPL=y
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
 +# CONFIG_CMD_FPGA is not set
++# CONFIG_SPL_DOS_PARTITION is not set
++# CONFIG_SPL_ISO_PARTITION is not set
++# CONFIG_SPL_EFI_PARTITION is not set
 +CONFIG_SUN8I_EMAC=y
 +CONFIG_USB_EHCI_HCD=y
-+CONFIG_SYS_CLK_FREQ=816000000
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2

patch/u-boot/u-boot-sunxi/add-cubieboard2-emmc.patch

@@ -1,12 +1,9 @@
 diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
-old mode 100644
-new mode 100755
-index 2667fc6..15331a1
+index 02c503f672..f28f3803a1 100644
 --- a/configs/Cubieboard2_defconfig
 +++ b/configs/Cubieboard2_defconfig
-@@ -17,3 +17,4 @@ CONFIG_SPL_I2C_SUPPORT=y
- # CONFIG_SPL_EFI_PARTITION is not set
+@@ -18,3 +18,4 @@ CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_ETH_DESIGNWARE=y
+ CONFIG_SUN7I_GMAC=y
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-\ No newline at end of file

patch/u-boot/u-boot-sunxi/add-nanopi-air-emmc.patch

@@ -0,0 +1,9 @@
+diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
+index 9598bd5cd5..a2d79af6e9 100644
+--- a/configs/nanopi_neo_air_defconfig
++++ b/configs/nanopi_neo_air_defconfig
+@@ -15,3 +15,4 @@ CONFIG_SPL=y
+ # CONFIG_SPL_ISO_PARTITION is not set
+ # CONFIG_SPL_EFI_PARTITION is not set
+ CONFIG_USB_EHCI_HCD=y
++CONFIG_MMC_SUNXI_SLOT_EXTRA=2

patch/u-boot/u-boot-sunxi/add-nanopi-air.patch

@@ -1,23 +0,0 @@
-diff --git a/configs/nanopi_air_defconfig b/configs/nanopi_air_defconfig
-new file mode 100644
-index 0000000..61fe8c6
---- /dev/null
-+++ b/configs/nanopi_air_defconfig
-@@ -0,0 +1,17 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_MACH_SUN8I_H3=y
-+CONFIG_DRAM_CLK=408
-+CONFIG_DRAM_ZQ=3881979
-+CONFIG_DRAM_ODT_EN=y
-+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo"
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_CONSOLE_MUX=y
-+CONFIG_SPL=y
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_FLASH is not set
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_SUN8I_EMAC=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_SYS_CLK_FREQ=480000000
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2

patch/u-boot/u-boot-sunxi/add-orangepi-plus2-emmc.patch

@@ -0,0 +1,9 @@
+diff --git a/configs/orangepi_2_defconfig b/configs/orangepi_2_defconfig
+index 201771ee8f..e48bfae0d7 100644
+--- a/configs/orangepi_2_defconfig
++++ b/configs/orangepi_2_defconfig
+@@ -20,3 +20,4 @@ CONFIG_SPL_I2C_SUPPORT=y
+ CONFIG_SUN8I_EMAC=y
+ CONFIG_SY8106A_POWER=y
+ CONFIG_USB_EHCI_HCD=y
++CONFIG_MMC_SUNXI_SLOT_EXTRA=2

patch/u-boot/u-boot-sunxi/add-orangepi-plus2.patch

@@ -1,12 +0,0 @@
-diff --git a/configs/orangepi_2_defconfig b/configs/orangepi_2_defconfig
-index 4727aca4..b5193769 100644
---- a/configs/orangepi_2_defconfig
-+++ b/configs/orangepi_2_defconfig
-@@ -9,6 +9,7 @@ CONFIG_USB1_VBUS_PIN="PG13"
- CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-2"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
- CONFIG_CONSOLE_MUX=y
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
- CONFIG_SPL=y
- # CONFIG_CMD_IMLS is not set
- # CONFIG_CMD_FLASH is not set

patch/u-boot/u-boot-sunxi/branch_default/enable-old-kernel-compat.patch

@@ -1,8 +1,8 @@
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 0ed36cded..c4f93ee83 100644
+index 513a35fc4e..77bc949cb7 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -575,6 +575,7 @@ config TARGET_CM_T43
+@@ -623,6 +623,7 @@ config ARCH_SOCFPGA
  
  config ARCH_SUNXI
  	bool "Support sunxi (Allwinner) SoCs"