diff --git a/uboot/A10-OLinuXino-Lime_defconfig b/uboot/A10-OLinuXino-Lime_defconfig
deleted file mode 100644
index 94166e2..0000000
--- a/uboot/A10-OLinuXino-Lime_defconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_SYS_TEXT_BASE=0x4a000000
-CONFIG_MACH_SUN4I=y
-CONFIG_DRAM_CLK=480
-CONFIG_DRAM_EMR1=4
-CONFIG_SYS_CLK_FREQ=912000000
-CONFIG_MMC0_CD_PIN="PH1"
-CONFIG_I2C1_ENABLE=y
-CONFIG_SATAPWR="PC3"
-CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
-CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL=y
-CONFIG_SPL_I2C_SUPPORT=y
-# CONFIG_CMD_FLASH is not set
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_SCSI_AHCI=y
-CONFIG_SUN4I_EMAC=y
-CONFIG_AXP_ALDO3_VOLT=2800
-CONFIG_AXP_ALDO4_VOLT=2800
-CONFIG_SCSI=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
diff --git a/uboot/A20-OLinuXino-Lime_defconfig b/uboot/A20-OLinuXino-Lime_defconfig
deleted file mode 100644
index 8e7e2cb..0000000
--- a/uboot/A20-OLinuXino-Lime_defconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_MACH_SUN7I=y
-CONFIG_DRAM_CLK=384
-CONFIG_MMC0_CD_PIN="PH1"
-CONFIG_I2C1_ENABLE=y
-CONFIG_SATAPWR="PC3"
-CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
-CONFIG_AHCI=y
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL=y
-CONFIG_SPL_I2C_SUPPORT=y
-# CONFIG_CMD_FLASH is not set
-# CONFIG_SPL_DOS_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_SCSI=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
diff --git a/uboot/PKGBUILD b/uboot/PKGBUILD
index c6a17e7..e2f6b89 100644
--- a/uboot/PKGBUILD
+++ b/uboot/PKGBUILD
@@ -2,35 +2,28 @@
 
 pkgbase='uboot-sunxi-dto'
 pkgname=('uboot-orangepi-zero' 'uboot-nanopi-neo' 'uboot-a10-olinuxino-lime-dto' 'uboot-a20-olinuxino-lime-dto')
-pkgver=2018.05
-pkgrel=5
+pkgver=2018.09
+pkgrel=1
 arch=('armv7h')
 _baserel=62ceb441bfe96eba0aa467c07516df8c5947aeeb
 url='http://git.denx.de/u-boot.git/'
 license=('GPL')
 options=('!strip')
 makedepends=('bc' 'python2' 'swig' 'dtc')
-backup=(
-	'boot/boot.txt'
+backup=('boot/boot.txt'
 	'boot/boot.scr')
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
 	'boot.txt'
 	'flash-uboot.sh'
 	'config-fragment'
 	"http://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/${_baserel}/alarm/uboot-sunxi/mkscr"
-	'orangepi_zero_defconfig'
-	'nanopi_neo_defconfig'
-	'A10-OLinuXino-Lime_defconfig'
-	'A20-OLinuXino-Lime_defconfig')
-sha1sums=('605543501f7450ffa4e9c7fd98d2f36dbc0657b0'
+	'orangepi_zero_defconfig')
+sha1sums=('e43d4fc09395f8cde29d655d35b2bb773e89b444'
           '4088ae725c22b5468deece9c72eff6b0470a3128'
           'a49a8c18e1b0f920a430cf57990c0c42dc864f59'
           '41bbf43f35b4cb41a2ea4bcf18d0f6bb75819c40'
           '008b9ce4fcf64c939868148ca387fa733c8b7e69'
-          'd6f8cd8040d5edd55062485ac4f3500aae3ccdb7'
-          'd2b99f2e991b59b619c4e4da7378cc69446b1207'
-          'c003e7cf72864b9447052c42aec287766b6cbd39'
-          '92bb20006b7b7a3396dd29bb93b4326151c35def')
+          'c89b2738dd66097f088693834901dd771e5d7413')
 
 _boards=('orangepi_zero' 'nanopi_neo' 'A10-OLinuXino-Lime' 'A20-OLinuXino-Lime')
 
@@ -38,15 +31,13 @@ prepare() {
   cd u-boot-${pkgver}
 
   cp ${srcdir}/orangepi_zero_defconfig configs
-  cp ${srcdir}/nanopi_neo_defconfig configs
-  cp ${srcdir}/A10-OLinuXino-Lime_defconfig configs
-  cp ${srcdir}/A20-OLinuXino-Lime_defconfig configs
 }
 
 build() {
   cd u-boot-${pkgver}
 
   for i in ${_boards[@]}; do
+    msg2 ${i}
     mkdir ../bin_${i} || true
     make distclean
     make ${i}_config
diff --git a/uboot/nanopi_neo_defconfig b/uboot/nanopi_neo_defconfig
deleted file mode 100644
index f30507c..0000000
--- a/uboot/nanopi_neo_defconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-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_VIDEO_DE2 is not set
-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_FLASH is not set
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_SUN8I_EMAC=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
diff --git a/uboot/orangepi_zero_defconfig b/uboot/orangepi_zero_defconfig
index c09e7cd..c0d501e 100644
--- a/uboot/orangepi_zero_defconfig
+++ b/uboot/orangepi_zero_defconfig
@@ -1,16 +1,17 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
+CONFIG_SPL=y
 CONFIG_MACH_SUN8I_H3=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_ZQ=3881979
 CONFIG_DRAM_ODT_EN=y
 # CONFIG_VIDEO_DE2 is not set
-CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero"
+CONFIG_SPL_SPI_SUNXI=y
+CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_CONSOLE_MUX=y
-CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
-CONFIG_SPL_SPI_SUNXI=y
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero"
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y