From 50336190c4998cf9f42c49013ad7f114ff51767a Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 27 Feb 2021 19:56:01 +0100 Subject: [PATCH] Rockchip: reduce number of images In order to reduce the number of images, I trimed to build only the most basic version which allows to boot all revsions and has all capabilities we need. (People can replace dtb from /usr/share/bootloader) I also dropped some boards where I found shortcomings in the device tree which might be easy to solve but I can't test and they were not supported in earlier releases. --- projects/Rockchip/README.md | 8 ++++++-- projects/Rockchip/devices/RK3399/README.md | 7 +------ scripts/uboot_helper | 22 +--------------------- 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/projects/Rockchip/README.md b/projects/Rockchip/README.md index 183eb4f695..b2ba7614cb 100644 --- a/projects/Rockchip/README.md +++ b/projects/Rockchip/README.md @@ -9,16 +9,21 @@ This project is for Rockchip SoC devices * [mqmaker MiQi](devices/RK3288) **RK3328** +* [Beelink A1 TV BOX](devices/RK3328) * [PINE64 ROCK64](devices/RK3328) -* [Popcorn Hour RockBox](devices/RK3328) * [Popcorn Hour Transformer](devices/RK3328) * [Firefly ROC-RK3328-CC](devices/RK3328) **RK3399** * [96rocks ROCK960](devices/RK3399) +* [Hugsun X99 TV BOX](devices/RK3399) * [Khadas Edge](devices/RK3399) +* [FriendlyARM NanoPC-T4](devices/RK3399) +* [FriendlyARM NanoPi M4](devices/RK3399) +* [Orange Pi RK3399](devices/RK3399) * [PINE64 RockPro64](devices/RK3399) * [Radxa ROCK Pi 4](devices/RK3399) +* [ROC-RK3399-PC](devices/RK3399) * [Rockchip Sapphire Board](devices/RK3399) **My single-board computer is not listed, will it be added in the future?**
@@ -29,7 +34,6 @@ You may have luck if your device vendor is open source friendly, otherwise keep ## Links -* https://github.com/rockchip-linux * http://opensource.rock-chips.com ## Useful debug commands diff --git a/projects/Rockchip/devices/RK3399/README.md b/projects/Rockchip/devices/RK3399/README.md index 72923919c1..3c767523bf 100644 --- a/projects/Rockchip/devices/RK3399/README.md +++ b/projects/Rockchip/devices/RK3399/README.md @@ -4,18 +4,13 @@ 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=rock-pi-4 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 15a11803c4..d19fdfa29f 100755 --- a/scripts/uboot_helper +++ b/scripts/uboot_helper @@ -263,10 +263,6 @@ devices = \ }, }, 'RK3399': { - 'firefly': { - 'dtb': 'rk3399-firefly.dtb', - 'config': 'evb-rk3399_defconfig' - }, 'hugsun-x99': { 'dtb': 'rk3399-hugsun-x99.dtb', 'config': 'evb-rk3399_defconfig' @@ -275,10 +271,6 @@ devices = \ 'dtb': 'rk3399-khadas-edge.dtb', 'config': 'evb-rk3399_defconfig' }, - 'khadas-edge-v': { - 'dtb': 'rk3399-khadas-edge-v.dtb', - 'config': 'evb-rk3399_defconfig' - }, 'nanopc-t4': { 'dtb': 'rk3399-nanopc-t4.dtb', 'config': 'evb-rk3399_defconfig' @@ -287,10 +279,6 @@ devices = \ 'dtb': 'rk3399-nanopi-m4.dtb', 'config': 'evb-rk3399_defconfig' }, - 'nanopi-neo4': { - 'dtb': 'rk3399-nanopi-neo4.dtb', - 'config': 'evb-rk3399_defconfig' - }, 'orangepi': { 'dtb': 'rk3399-orangepi.dtb', 'config': 'evb-rk3399_defconfig' @@ -299,18 +287,10 @@ devices = \ 'dtb': 'rk3399-rock960.dtb', 'config': 'evb-rk3399_defconfig' }, - 'rock-pi-4a': { + 'rock-pi-4': { 'dtb': 'rk3399-rock-pi-4a.dtb', 'config': 'evb-rk3399_defconfig' }, - 'rock-pi-4b': { - 'dtb': 'rk3399-rock-pi-4b.dtb', - 'config': 'evb-rk3399_defconfig' - }, - 'rock-pi-4c': { - 'dtb': 'rk3399-rock-pi-4c.dtb', - 'config': 'evb-rk3399_defconfig' - }, 'rockpro64': { 'dtb': 'rk3399-rockpro64.dtb', 'config': 'evb-rk3399_defconfig'