diff --git a/dtbs/0001-arm-dts-sunxi-NanoPi-Neo-status-LED-without-defaulte.patch b/dtbs/0001-arm-dts-sunxi-NanoPi-Neo-status-LED-without-defaulte.patch
index 91adf26..2b3e5c5 100644
--- a/dtbs/0001-arm-dts-sunxi-NanoPi-Neo-status-LED-without-defaulte.patch
+++ b/dtbs/0001-arm-dts-sunxi-NanoPi-Neo-status-LED-without-defaulte.patch
@@ -1,4 +1,4 @@
-From b0846dc73a711fdf9886423cd3502a44b3a0efc6 Mon Sep 17 00:00:00 2001
+From 7afe5547780ce494e7ba02a156f633612facd65c Mon Sep 17 00:00:00 2001
 From: Edmunt Pienkowsky <roed@onet.eu>
 Date: Sun, 21 Jan 2018 14:15:10 +0000
 Subject: [PATCH 1/9] arm: dts: sunxi: NanoPi Neo - status LED without
@@ -19,5 +19,5 @@ index 4df29a65316d..3ac0b6555461 100644
  
  		pwr {
 -- 
-2.23.0
+2.24.0
 
diff --git a/dtbs/0002-arm-dts-sunxi-Orange-Pi-Zero-simplification.patch b/dtbs/0002-arm-dts-sunxi-Orange-Pi-Zero-simplification.patch
index 09cbef0..2614be2 100644
--- a/dtbs/0002-arm-dts-sunxi-Orange-Pi-Zero-simplification.patch
+++ b/dtbs/0002-arm-dts-sunxi-Orange-Pi-Zero-simplification.patch
@@ -1,4 +1,4 @@
-From 2e6936fc161e719afde3d2d9c6d52c34b97a48fe Mon Sep 17 00:00:00 2001
+From 9b5b72d38d71ca1733adee6e84e5ab44f3e63439 Mon Sep 17 00:00:00 2001
 From: Edmunt Pienkowsky <roed@onet.eu>
 Date: Sun, 29 Sep 2019 08:55:20 +0200
 Subject: [PATCH 2/9] arm: dts: sunxi: Orange Pi Zero - simplification
@@ -77,5 +77,5 @@ index f19ed981da9d..8d43826c1c27 100644
  	dr_mode = "peripheral";
  	status = "okay";
 -- 
-2.23.0
+2.24.0
 
diff --git a/dtbs/0003-ARM-dts-sun4i-Correct-pinctrl-nodes.patch b/dtbs/0003-ARM-dts-sun4i-Correct-pinctrl-nodes.patch
index 699c647..a428a48 100644
--- a/dtbs/0003-ARM-dts-sun4i-Correct-pinctrl-nodes.patch
+++ b/dtbs/0003-ARM-dts-sun4i-Correct-pinctrl-nodes.patch
@@ -1,4 +1,4 @@
-From ceac51446669c9efa49f4f85f73283b635aabcb7 Mon Sep 17 00:00:00 2001
+From 495f0e93ccd704f41deab17ff215f13a4a9ef1d2 Mon Sep 17 00:00:00 2001
 From: Edmunt Pienkowsky <roed@onet.eu>
 Date: Tue, 23 Jan 2018 11:52:20 +0100
 Subject: [PATCH 3/9] ARM: dts: sun4i: Correct pinctrl nodes
@@ -8,10 +8,10 @@ spi2_cs0_pc_pins -> spi2_cs0_pc_pin
 Signed-off-by: Edmunt Pienkowsky <roed@onet.eu>
 
 diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
-index e88daa4ef1af..2450498eacfc 100644
+index 4c268b70b735..f3fd0779d346 100644
 --- a/arch/arm/boot/dts/sun4i-a10.dtsi
 +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
-@@ -779,7 +779,7 @@
+@@ -783,7 +783,7 @@
  				function = "spi2";
  			};
  
@@ -21,5 +21,5 @@ index e88daa4ef1af..2450498eacfc 100644
  				function = "spi2";
  			};
 -- 
-2.23.0
+2.24.0
 
diff --git a/dtbs/0004-arm-dts-sunxi-NanoPi-Neo-add-missing-ethernet0-alias.patch b/dtbs/0004-arm-dts-sunxi-NanoPi-Neo-add-missing-ethernet0-alias.patch
index 795c2aa..23d2216 100644
--- a/dtbs/0004-arm-dts-sunxi-NanoPi-Neo-add-missing-ethernet0-alias.patch
+++ b/dtbs/0004-arm-dts-sunxi-NanoPi-Neo-add-missing-ethernet0-alias.patch
@@ -1,4 +1,4 @@
-From 54f7e94aa3c1ce11b4d460b520152156ae1a48b1 Mon Sep 17 00:00:00 2001
+From 59c1a0788aa085b5ac0bb815310b24314ab4076d Mon Sep 17 00:00:00 2001
 From: Edmunt Pienkowsky <roed@onet.eu>
 Date: Thu, 1 Nov 2018 11:43:41 +0000
 Subject: [PATCH 4/9] arm: dts: sunxi: NanoPi (Neo) - add missing ethernet0
@@ -19,5 +19,5 @@ index 3ac0b6555461..8d03e3340e18 100644
  
  	chosen {
 -- 
-2.23.0
+2.24.0
 
diff --git a/dtbs/0005-arm-dts-sunxi-BananaPi-M2-Zero-update-emac.patch b/dtbs/0005-arm-dts-sunxi-BananaPi-M2-Zero-update-emac.patch
index 913293a..7b00911 100644
--- a/dtbs/0005-arm-dts-sunxi-BananaPi-M2-Zero-update-emac.patch
+++ b/dtbs/0005-arm-dts-sunxi-BananaPi-M2-Zero-update-emac.patch
@@ -1,4 +1,4 @@
-From 4128d497f91a28c312ca2cbe006f399361ee689e Mon Sep 17 00:00:00 2001
+From 79ea6d6207cfe6df3974893fbd53c3945687574a Mon Sep 17 00:00:00 2001
 From: Edmunt Pienkowsky <roed@onet.eu>
 Date: Thu, 1 Nov 2018 11:39:47 +0000
 Subject: [PATCH 5/9] arm: dts: sunxi: BananaPi M2 Zero - update emac
@@ -31,5 +31,5 @@ index d277d043031b..75cb5091bda2 100644
  	vmmc-supply = <&reg_vcc3v3>;
  	bus-width = <4>;
 -- 
-2.23.0
+2.24.0
 
diff --git a/dtbs/0006-ARM-dts-sun8i-Enable-HDMI-on-Banana-Pi-M2-Zero-board.patch b/dtbs/0006-ARM-dts-sun8i-Enable-HDMI-on-Banana-Pi-M2-Zero-board.patch
index 15bd3bb..3577ce3 100644
--- a/dtbs/0006-ARM-dts-sun8i-Enable-HDMI-on-Banana-Pi-M2-Zero-board.patch
+++ b/dtbs/0006-ARM-dts-sun8i-Enable-HDMI-on-Banana-Pi-M2-Zero-board.patch
@@ -1,4 +1,4 @@
-From f9e082e6432b0deadce4efced5038e3a2713092b Mon Sep 17 00:00:00 2001
+From 9c475d956b628d5ba0d66f6b884d0c7da8737f7a Mon Sep 17 00:00:00 2001
 From: Edmunt Pienkowsky <roed@onet.eu>
 Date: Sun, 4 Nov 2018 08:45:38 +0000
 Subject: [PATCH 6/9] ARM: dts: sun8i: Enable HDMI on Banana Pi M2 Zero board
@@ -56,5 +56,5 @@ index 75cb5091bda2..de7baeeee5cc 100644
  	vmmc-supply = <&reg_vcc3v3>;
  	bus-width = <4>;
 -- 
-2.23.0
+2.24.0
 
diff --git a/dtbs/0007-arm-dts-sunxi-Add-Banana-Pi-P2-Zero-board.patch b/dtbs/0007-arm-dts-sunxi-Add-Banana-Pi-P2-Zero-board.patch
index 0d34140..42ec69a 100644
--- a/dtbs/0007-arm-dts-sunxi-Add-Banana-Pi-P2-Zero-board.patch
+++ b/dtbs/0007-arm-dts-sunxi-Add-Banana-Pi-P2-Zero-board.patch
@@ -1,4 +1,4 @@
-From dbe9e3fd05b88c74e550e5d1f17475dfbfbc4b33 Mon Sep 17 00:00:00 2001
+From eb4ac147703ffbb6d36bedecdff1d98be4656b44 Mon Sep 17 00:00:00 2001
 From: Edmunt Pienkowsky <roed@onet.eu>
 Date: Sun, 29 Sep 2019 09:33:22 +0200
 Subject: [PATCH 7/9] arm: dts: sunxi: Add Banana Pi P2 Zero board
@@ -6,10 +6,10 @@ Subject: [PATCH 7/9] arm: dts: sunxi: Add Banana Pi P2 Zero board
 Signed-off-by: Edmunt Pienkowsky <roed@onet.eu>
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 9159fa2cea90..289e2d0e97a1 100644
+index b21b3a64641a..2b031b2539a6 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1088,6 +1088,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
+@@ -1097,6 +1097,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
  	sun8i-a83t-cubietruck-plus.dtb \
  	sun8i-a83t-tbs-a711.dtb \
  	sun8i-h2-plus-bananapi-m2-zero.dtb \
@@ -205,5 +205,5 @@ index 000000000000..bcc5ab3535b0
 +	status = "okay";
 +};
 -- 
-2.23.0
+2.24.0
 
diff --git a/dtbs/0008-arm-dts-sunxi-OrangePi-Zero-improve-WiFi-bindings.patch b/dtbs/0008-arm-dts-sunxi-OrangePi-Zero-improve-WiFi-bindings.patch
index 26482e6..443956b 100644
--- a/dtbs/0008-arm-dts-sunxi-OrangePi-Zero-improve-WiFi-bindings.patch
+++ b/dtbs/0008-arm-dts-sunxi-OrangePi-Zero-improve-WiFi-bindings.patch
@@ -1,4 +1,4 @@
-From 65e9cc26f34f9d111d0c79eaf67c10bf3d56f4f5 Mon Sep 17 00:00:00 2001
+From cbf4bfe49fda57d5cd0edd37c55bee8ad55ef64a Mon Sep 17 00:00:00 2001
 From: Edmunt Pienkowsky <roed@onet.eu>
 Date: Wed, 21 Nov 2018 14:37:19 +0100
 Subject: [PATCH 8/9] arm: dts: sunxi: OrangePi Zero - improve WiFi bindings
@@ -80,5 +80,5 @@ index 8d43826c1c27..f37ca6a01bd9 100644
  };
  
 -- 
-2.23.0
+2.24.0
 
diff --git a/dtbs/0009-arm-dts-sunxi-OrangePi-R1-remove-correct-node.patch b/dtbs/0009-arm-dts-sunxi-OrangePi-R1-remove-correct-node.patch
index 86ebfb3..e87dba9 100644
--- a/dtbs/0009-arm-dts-sunxi-OrangePi-R1-remove-correct-node.patch
+++ b/dtbs/0009-arm-dts-sunxi-OrangePi-R1-remove-correct-node.patch
@@ -1,4 +1,4 @@
-From 5272968828e679fb64f652098e15a3342d21d805 Mon Sep 17 00:00:00 2001
+From 82710498890ba9e8f75ddc954a8399ec6c344dd6 Mon Sep 17 00:00:00 2001
 From: Edmunt Pienkowsky <roed@onet.eu>
 Date: Sun, 20 Jan 2019 09:17:34 +0000
 Subject: [PATCH 9/9] arm: dts: sunxi: OrangePi R1 - remove correct node
@@ -33,5 +33,5 @@ index 3356f4210d45..32a79c49eba7 100644
  };
  
 -- 
-2.23.0
+2.24.0
 
diff --git a/dtbs/PKGBUILD b/dtbs/PKGBUILD
index 5a19501..8594b89 100644
--- a/dtbs/PKGBUILD
+++ b/dtbs/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Edmunt Pienkowsky <roed@onet.eu>
 
 pkgname='sunxi-dtbs'
-_srcname=linux-5.3
+_srcname=linux-5.4
 pkgdesc='Additional DTBs for Allwinder-based boards'
 conflicts=('orangepi-dtbs' 'nanopi-dtbs' 'olinuxino-lime-dtbs' 'bananapi-dtbs')
 replaces=('orangepi-dtbs' 'nanopi-dtbs' 'olinuxino-lime-dtbs' 'bananapi-dtbs')
-pkgver=5.3.p1
+pkgver=5.4.p1
 pkgrel=1
 arch=('armv7h')
 url="http://www.kernel.org/"
@@ -13,7 +13,7 @@ license=('GPL2')
 depends=('linux>5.1')
 makedepends=('bc' 'git')
 options=('!strip')
-_cfgrel=82827b2007864d911596542324e992f1cf8817ed
+_cfgrel=e09abb00ffa3451f6c6a5845254bf23a211d6a1f
 _patches=(
 	'0001-arm-dts-sunxi-NanoPi-Neo-status-LED-without-defaulte.patch'
 	'0002-arm-dts-sunxi-Orange-Pi-Zero-simplification.patch'
@@ -28,17 +28,17 @@ _patches=(
 source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
 	${_patches[@]}
 	"config-${pkgver}::http://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/${_cfgrel}/core/linux-armv7/config")
-md5sums=('c99feaade8047339528fb066ec5f8a49'
-         '3bc2a85a61beb63fc22dcca5168df39d'
-         '8c64ebebaff7fa23db8bef3aa54fce9f'
-         '4df100e21d454c7241e1d8cd02ccfed6'
-         'b20d89547474d4add85158e7bc1ac30e'
-         '2112afa616b83fae3c467bd9f36a6577'
-         '38a3bd74f6def65d65e1031aed2f6132'
-         '366b1007ecc5e72324ead3d53abe6d7f'
-         'ad1625291f5831927a066446eb7d6497'
-         '7d22d05163027d5a35039ffc426a746d'
-         '98eb2eada163f86923622b9fdc260779')
+md5sums=('ce9b2d974d27408a61c53a30d3f98fb9'
+         '4131800ef3acba2ba3e007a195c3c36f'
+         '5d3c8c812626860fff857844fb14753a'
+         '3d21077f81bc4cd3216fd17b8ab03ebc'
+         'a3208ac0ab9a956bcd04f59822b945da'
+         '394804969ae8d0aa6f020e23df8792e7'
+         '0840896dc77277329f9d812667bdeced'
+         '678a6ed87164d7e1943e03f9a2c37114'
+         '1018536df680ab71afab86313126b721'
+         '06595d1cbdfc8db166ac517033e6fa9b'
+         '38953deeb5f01372bb6b6ed14d8660a9')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/uboot/PKGBUILD b/uboot/PKGBUILD
index e1d6460..73eea07 100644
--- a/uboot/PKGBUILD
+++ b/uboot/PKGBUILD
@@ -3,13 +3,13 @@
 pkgbase='uboot-sunxi-dto'
 pkgname=('uboot-orangepi-zero' 'uboot-orangepi-one' 'uboot-orangepi-r1' 'uboot-nanopi-neo' 'uboot-a10-olinuxino-lime-dto' 'uboot-a20-olinuxino-lime-dto' 'uboot-bananapi-m2-zero' 'uboot-bananapi-p2-zero')
 pkgver=2019.10
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 _baserel=62ceb441bfe96eba0aa467c07516df8c5947aeeb
 url='http://git.denx.de/u-boot.git/'
 license=('GPL')
 options=('!strip')
-makedepends=('bc' 'python2' 'swig' 'dtc' 'sunxi-dtbs=5.3.p1')
+makedepends=('bc' 'python2' 'swig' 'dtc' 'sunxi-dtbs=5.4.p1')
 backup=('boot/boot.txt'
 	'boot/boot.scr')
 _patches=(