diff --git a/config/boards/nanopim1plus2.eos b/config/boards/nanopim1plus2.eos
deleted file mode 100644
index 80b04835b3..0000000000
--- a/config/boards/nanopim1plus2.eos
+++ /dev/null
@@ -1,15 +0,0 @@
-# H5 quad core 1GB RAM eMMC WiFi
-BOARD_NAME="Nanopi M1 Plus 2"
-BOARDFAMILY="sun50iw2"
-BOOTCONFIG="nanopi_m1_plus2_defconfig"
-MODULES=""
-MODULES_NEXT=""
-CPUMIN="408000"
-CPUMAX="1296000"
-#
-KERNEL_TARGET="next,dev"
-CLI_TARGET=""
-DESKTOP_TARGET=""
-#
-CLI_BETA_TARGET=""
-DESKTOP_BETA_TARGET=""
diff --git a/config/sources/sunxi64_common.inc b/config/sources/sunxi64_common.inc
index a23441f38d..fea13225e5 100644
--- a/config/sources/sunxi64_common.inc
+++ b/config/sources/sunxi64_common.inc
@@ -4,7 +4,7 @@ BOOTDELAY=1
 
 BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
 BOOTDIR=$MAINLINE_UBOOT_DIR
-BOOTBRANCH='tag:v2019.01'
+BOOTBRANCH='tag:v2019.04'
 BOOTPATCHDIR='u-boot-sunxi'
 UBOOT_USE_GCC='> 7.0'
 UBOOT_TARGET_MAP=';;spl/sunxi-spl.bin u-boot.itb'
diff --git a/config/sources/sunxi_common.inc b/config/sources/sunxi_common.inc
index 38ee398fa5..26f8602ddf 100644
--- a/config/sources/sunxi_common.inc
+++ b/config/sources/sunxi_common.inc
@@ -1,6 +1,6 @@
 BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
 BOOTDIR=$MAINLINE_UBOOT_DIR
-BOOTBRANCH='tag:v2019.01'
+BOOTBRANCH='tag:v2019.04'
 BOOTSCRIPT="boot-sunxi.cmd:boot.cmd"
 BOOTENV_FILE='sunxi-default.txt'
 BOOTPATCHDIR='u-boot-sunxi'
diff --git a/patch/u-boot/u-boot-sunxi/4kfix-limit-screen-to-full-hd.patch b/patch/u-boot/u-boot-sunxi/4kfix-limit-screen-to-full-hd.patch.disabled
similarity index 100%
rename from patch/u-boot/u-boot-sunxi/4kfix-limit-screen-to-full-hd.patch
rename to patch/u-boot/u-boot-sunxi/4kfix-limit-screen-to-full-hd.patch.disabled
diff --git a/patch/u-boot/u-boot-sunxi/add-a20-olinuxino-micro-emmc-support.patch b/patch/u-boot/u-boot-sunxi/add-a20-olinuxino-micro-emmc-support.patch
deleted file mode 100644
index eeed273e53..0000000000
--- a/patch/u-boot/u-boot-sunxi/add-a20-olinuxino-micro-emmc-support.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 9cc5c1e..7ed687e 100644
---- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -281,6 +281,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
- 	sun7i-a20-olinuxino-lime2.dtb \
- 	sun7i-a20-olinuxino-lime2-emmc.dtb \
- 	sun7i-a20-olinuxino-micro.dtb \
-+	sun7i-a20-olinuxino-micro-emmc.dtb \
- 	sun7i-a20-orangepi.dtb \
- 	sun7i-a20-orangepi-mini.dtb \
- 	sun7i-a20-pcduino3.dtb \
-diff --git a/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts b/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts
-new file mode 100644
-index 0000000..a39247a
---- /dev/null
-+++ b/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts
-@@ -0,0 +1,83 @@
-+ /*
-+ * Copyright 2017 Olimex Ltd.
-+ * Stefan Mavrodiev <stefan@olimex.com>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#include "sun7i-a20-olinuxino-micro.dts"
-+
-+/ {
-+	model = "Olimex A20-OLinuXino-MICRO-eMMC";
-+	compatible = "olimex,a20-olinuxino-micro-emmc", "allwinner,sun7i-a20";
-+
-+	mmc2_pwrseq: pwrseq {
-+                pinctrl-0 = <&mmc2_pins_nrst>;
-+                pinctrl-names = "default";
-+                compatible = "mmc-pwrseq-emmc";
-+                reset-gpios = <&pio 2 16 GPIO_ACTIVE_LOW>;
-+        };
-+};
-+
-+&pio {
-+        mmc2_pins_nrst: mmc2@0 {
-+                allwinner,pins = "PC16";
-+                allwinner,function = "gpio_out";
-+                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-+                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-+        };
-+};
-+
-+&mmc2 {
-+        pinctrl-names = "default";
-+        pinctrl-0 = <&mmc2_pins_a>;
-+        vmmc-supply = <&reg_vcc3v3>;
-+        vqmmc-supply = <&reg_vcc3v3>;
-+        bus-width = <4>;
-+        non-removable;
-+        mmc-pwrseq = <&mmc2_pwrseq>;
-+        status = "okay";
-+
-+        emmc: emmc@0 {
-+                reg = <0>;
-+                compatible = "mmc-card";
-+                broken-hpi;
-+        };
-+};
-+
-diff --git a/configs/A20-OLinuXino_MICRO_eMMC_defconfig b/configs/A20-OLinuXino_MICRO_eMMC_defconfig
-new file mode 100644
-index 0000000..1ec93e4
---- /dev/null
-+++ b/configs/A20-OLinuXino_MICRO_eMMC_defconfig
-@@ -0,0 +1,29 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_SYS_TEXT_BASE=0x4a000000
-+CONFIG_MACH_SUN7I=y
-+CONFIG_DRAM_CLK=384
-+CONFIG_MMC0_CD_PIN="PH1"
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-+CONFIG_I2C1_ENABLE=y
-+CONFIG_VIDEO_VGA=y
-+CONFIG_SATAPWR="PB8"
-+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro-emmc"
-+CONFIG_AHCI=y
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SPL=y
-+CONFIG_SPL_I2C_SUPPORT=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_SCSI_AHCI=y
-+CONFIG_ETH_DESIGNWARE=y
-+CONFIG_SUN7I_GMAC=y
-+CONFIG_AXP_ALDO3_VOLT=2800
-+CONFIG_AXP_ALDO4_VOLT=2800
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-+CONFIG_SCSI=y
diff --git a/patch/u-boot/u-boot-sunxi/enable-DT-overlays-support.patch b/patch/u-boot/u-boot-sunxi/enable-DT-overlays-support.patch
deleted file mode 100644
index f4d971b643..0000000000
--- a/patch/u-boot/u-boot-sunxi/enable-DT-overlays-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 0ed36cded..822ebb812 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -578,6 +578,8 @@ config ARCH_SUNXI
- 	select CMD_GPIO
- 	select CMD_MMC if MMC
- 	select CMD_USB if DISTRO_DEFAULTS
-+	select OF_LIBFDT
-+	select OF_LIBFDT_OVERLAY
- 	select DM
- 	select DM_ETH
- 	select DM_GPIO