From 8d87ef9f77f2d17828b287ba2bf6872bc0dcd858 Mon Sep 17 00:00:00 2001
From: Alex Bee <knaerzche@gmail.com>
Date: Wed, 2 Jun 2021 09:53:17 +0200
Subject: [PATCH] Rockchip: exchange devicetrees for RK3399-ROC-PC and Rock Pi
 4

---
 projects/Rockchip/bootloader/update.sh | 2 +-
 scripts/uboot_helper                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/Rockchip/bootloader/update.sh b/projects/Rockchip/bootloader/update.sh
index 7b4f8f5fd1..bf86df98ee 100644
--- a/projects/Rockchip/bootloader/update.sh
+++ b/projects/Rockchip/bootloader/update.sh
@@ -31,7 +31,7 @@ fi
         new_dtb=rk3328-a1.dtb
         ;;
       rk3399-rock-pi-4.dtb)
-        new_dtb=rk3399-rock-pi-4a.dtb
+        new_dtb=rk3399-rock-pi-4b.dtb
         ;;
       *)
         new_dtb="${dtb}"
diff --git a/scripts/uboot_helper b/scripts/uboot_helper
index da3b7dbb5b..6eb71406ff 100755
--- a/scripts/uboot_helper
+++ b/scripts/uboot_helper
@@ -289,7 +289,7 @@ devices = \
         'config': 'evb-rk3399_defconfig'
       },
       'rock-pi-4': {
-        'dtb': 'rk3399-rock-pi-4a.dtb',
+        'dtb': 'rk3399-rock-pi-4b.dtb',
         'config': 'evb-rk3399_defconfig'
       },
       'rock-pi-n10': {
@@ -301,7 +301,7 @@ devices = \
         'config': 'evb-rk3399_defconfig'
       },
       'roc-pc': {
-        'dtb': 'rk3399-roc-pc.dtb',
+        'dtb': 'rk3399-roc-pc-mezzanine.dtb',
         'config': 'evb-rk3399_defconfig'
       },
       'sapphire': {