From fb250136faebf949aeab6d35326c7ec060666b3a Mon Sep 17 00:00:00 2001
From: Alex Bee <knaerzche@gmail.com>
Date: Sun, 17 Jan 2021 17:02:37 +0100
Subject: [PATCH] rockchip: align uboot_helper and READMEs for currently
 supported boards

---
 projects/Rockchip/devices/RK3328/README.md |  5 +----
 projects/Rockchip/devices/RK3399/README.md |  8 ++++++++
 scripts/uboot_helper                       | 16 ----------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/projects/Rockchip/devices/RK3328/README.md b/projects/Rockchip/devices/RK3328/README.md
index 685eca9b81..c06a8ff691 100644
--- a/projects/Rockchip/devices/RK3328/README.md
+++ b/projects/Rockchip/devices/RK3328/README.md
@@ -4,12 +4,9 @@ This is a SoC device for RK3328
 
 **Build**
 
-* `PROJECT=Rockchip DEVICE=RK3328 ARCH=arm UBOOT_SYSTEM=box make image`
-* `PROJECT=Rockchip DEVICE=RK3328 ARCH=arm UBOOT_SYSTEM=box-trn9 make image`
-* `PROJECT=Rockchip DEVICE=RK3328 ARCH=arm UBOOT_SYSTEM=box-z28 make image`
+* `PROJECT=Rockchip DEVICE=RK3328 ARCH=arm UBOOT_SYSTEM=a1 make image`
 * `PROJECT=Rockchip DEVICE=RK3328 ARCH=arm UBOOT_SYSTEM=roc-cc make image`
 * `PROJECT=Rockchip DEVICE=RK3328 ARCH=arm UBOOT_SYSTEM=rock64 make image`
-* `PROJECT=Rockchip DEVICE=RK3328 ARCH=arm UBOOT_SYSTEM=rockbox make image`
 
 **How to use on an Android device**
 - Flash image to a sd-card
diff --git a/projects/Rockchip/devices/RK3399/README.md b/projects/Rockchip/devices/RK3399/README.md
index 9cc3c7bd4d..72923919c1 100644
--- a/projects/Rockchip/devices/RK3399/README.md
+++ b/projects/Rockchip/devices/RK3399/README.md
@@ -4,10 +4,18 @@ This is a SoC device for RK3399
 
 **Build**
 
+* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=firefly make image`
+* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=hugsun-x99 make image`
 * `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=khadas-edge make image`
+* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=khadas-edge-v make image`
+* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=nanopc-t4 make image`
+* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=nanopi-m4 make image`
+* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=nanopi-neo4 make image`
+* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=orangepi make image`
 * `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=rock960 make image`
 * `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=rock-pi-4a make image`
 * `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=rock-pi-4b make image`
 * `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=rock-pi-4c make image`
 * `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=rockpro64 make image`
+* `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=roc-pc make image`
 * `PROJECT=Rockchip DEVICE=RK3399 ARCH=arm UBOOT_SYSTEM=sapphire make image`
diff --git a/scripts/uboot_helper b/scripts/uboot_helper
index ed275697c6..c9ba1a9f61 100755
--- a/scripts/uboot_helper
+++ b/scripts/uboot_helper
@@ -244,18 +244,6 @@ devices = \
         'dtb': 'rk3328-a1.dtb',
         'config': 'evb-rk3328_defconfig'
       },
-      'box': {
-        'dtb': 'rk3328-box.dtb',
-        'config': 'evb-rk3328_defconfig'
-      },
-      'box-trn9': {
-        'dtb': 'rk3328-box-trn9.dtb',
-        'config': 'evb-rk3328_defconfig'
-      },
-      'box-z28': {
-        'dtb': 'rk3328-box-z28.dtb',
-        'config': 'evb-rk3328_defconfig'
-      },
       'roc-cc': {
         'dtb': 'rk3328-roc-cc.dtb',
         'config': 'evb-rk3328_defconfig'
@@ -264,10 +252,6 @@ devices = \
         'dtb': 'rk3328-rock64.dtb',
         'config': 'evb-rk3328_defconfig'
       },
-      'rockbox': {
-        'dtb': 'rk3328-rockbox.dtb',
-        'config': 'evb-rk3328_defconfig'
-      },
     },
     'RK3399': {
       'firefly': {