Build fixes

eazrael · Jun 19, 2024 · b47f602 · b47f602
1 parent 90d42b9
commit b47f602
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 45 deletions.
diff --git a/dtb-fix/u-boot/a/arch/arm/dts/Makefile b/dtb-fix/u-boot/a/arch/arm/dts/Makefile
@@ -120,14 +120,11 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \
 
 dtb-$(CONFIG_ROCKCHIP_RK3308) += \
 	rk3308-evb.dtb \
-	rk3308-roc-cc.dtb \
-	rk3308-rock-pi-s.dtb
+	rk3308-roc-cc.dtb
 
 dtb-$(CONFIG_ROCKCHIP_RK3328) += \
 	rk3328-evb.dtb \
 	rk3328-nanopi-r2s.dtb \
-	rk3328-orangepi-r1-plus.dtb \
-	rk3328-orangepi-r1-plus-lts.dtb \
 	rk3328-roc-cc.dtb \
 	rk3328-rock64.dtb \
 	rk3328-rock-pi-e.dtb
@@ -139,13 +136,11 @@ dtb-$(CONFIG_ROCKCHIP_RK3368) += \
 	rk3368-px5-evb.dtb \
 
 dtb-$(CONFIG_ROCKCHIP_RK3399) += \
-	rk3399-clockworkpi-a06.dtb \
 	rk3399-evb.dtb \
 	rk3399-ficus.dtb \
 	rk3399-firefly.dtb \
 	rk3399-gru-bob.dtb \
 	rk3399-gru-kevin.dtb \
-	rk3399-kobol-helios64.dtb \
 	rk3399-khadas-edge.dtb \
 	rk3399-khadas-edge-captain.dtb \
 	rk3399-khadas-edge-v.dtb \
@@ -154,11 +149,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
 	rk3399-nanopi-m4.dtb \
 	rk3399-nanopi-m4-2gb.dtb \
 	rk3399-nanopi-m4b.dtb \
-	rk3399-nanopi-m4v2.dtb \
 	rk3399-nanopi-neo4.dtb \
 	rk3399-nanopi-r4s.dtb \
 	rk3399-orangepi.dtb \
-	rk3399-orangepi-4.dtb \
 	rk3399-pinebook-pro.dtb \
 	rk3399-puma-haikou.dtb \
 	rk3399-roc-pc.dtb \
@@ -168,9 +161,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
 	rk3399-rock-pi-4c.dtb \
 	rk3399-rock960.dtb \
 	rk3399-rockpro64.dtb \
-	rk3399pro-rock-pi-n10.dtb \
-	rk3399pro-tinker_edge_r.dtb \
-	rk3399-xiaobao-nas.dtb
+	rk3399pro-rock-pi-n10.dtb
 
 dtb-$(CONFIG_ROCKCHIP_RK3568) += \
 	rk3568-evb.dtb

diff --git a/dtb-fix/u-boot/b/arch/arm/dts/Makefile b/dtb-fix/u-boot/b/arch/arm/dts/Makefile
@@ -120,33 +120,28 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \
 
 dtb-$(CONFIG_ROCKCHIP_RK3308) += \
 	rk3308-evb.dtb \
-	rk3308-roc-cc.dtb \
-	rk3308-rock-pi-s.dtb
+	rk3308-roc-cc.dtb
 
 dtb-$(CONFIG_ROCKCHIP_RK3328) += \
 	rk3328-artillery-x4.dtb \
 	rk3328-evb.dtb \
 	rk3328-nanopi-r2s.dtb \
-	rk3328-orangepi-r1-plus.dtb \
-	rk3328-orangepi-r1-plus-lts.dtb \
 	rk3328-roc-cc.dtb \
 	rk3328-rock64.dtb \
 	rk3328-rock-pi-e.dtb
-	
+
 dtb-$(CONFIG_ROCKCHIP_RK3368) += \
 	rk3368-lion-haikou.dtb \
 	rk3368-sheep.dtb \
 	rk3368-geekbox.dtb \
 	rk3368-px5-evb.dtb \
 
 dtb-$(CONFIG_ROCKCHIP_RK3399) += \
-	rk3399-clockworkpi-a06.dtb \
 	rk3399-evb.dtb \
 	rk3399-ficus.dtb \
 	rk3399-firefly.dtb \
 	rk3399-gru-bob.dtb \
 	rk3399-gru-kevin.dtb \
-	rk3399-kobol-helios64.dtb \
 	rk3399-khadas-edge.dtb \
 	rk3399-khadas-edge-captain.dtb \
 	rk3399-khadas-edge-v.dtb \
@@ -155,11 +150,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
 	rk3399-nanopi-m4.dtb \
 	rk3399-nanopi-m4-2gb.dtb \
 	rk3399-nanopi-m4b.dtb \
-	rk3399-nanopi-m4v2.dtb \
 	rk3399-nanopi-neo4.dtb \
 	rk3399-nanopi-r4s.dtb \
 	rk3399-orangepi.dtb \
-	rk3399-orangepi-4.dtb \
 	rk3399-pinebook-pro.dtb \
 	rk3399-puma-haikou.dtb \
 	rk3399-roc-pc.dtb \
@@ -169,8 +162,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
 	rk3399-rock-pi-4c.dtb \
 	rk3399-rock960.dtb \
 	rk3399-rockpro64.dtb \
-	rk3399pro-rock-pi-n10.dtb \
-	rk3399pro-tinker_edge_r.dtb 
+	rk3399pro-rock-pi-n10.dtb
 
 dtb-$(CONFIG_ROCKCHIP_RK3568) += \
 	rk3568-evb.dtb

diff --git a/patch/u-boot/u-boot-rockchip64/add-board-artillery-x4.patch b/patch/u-boot/u-boot-rockchip64/add-board-artillery-x4.patch
@@ -1,33 +1,14 @@
 diff -Nurp a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
---- a/arch/arm/dts/Makefile	2024-06-16 01:59:29.791790678 +0200
-+++ b/arch/arm/dts/Makefile	2024-06-16 03:23:17.916606832 +0200
-@@ -124,6 +124,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
- 	rk3308-rock-pi-s.dtb
+--- a/arch/arm/dts/Makefile	2024-06-16 16:11:18.354633381 +0200
++++ b/arch/arm/dts/Makefile	2024-06-16 16:12:50.224701565 +0200
+@@ -123,6 +123,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
+ 	rk3308-roc-cc.dtb
 
  dtb-$(CONFIG_ROCKCHIP_RK3328) += \
 +	rk3328-artillery-x4.dtb \
  	rk3328-evb.dtb \
  	rk3328-nanopi-r2s.dtb \
- 	rk3328-orangepi-r1-plus.dtb \
-@@ -131,7 +132,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3328) += \
  	rk3328-roc-cc.dtb \
- 	rk3328-rock64.dtb \
- 	rk3328-rock-pi-e.dtb
--
-+	
- dtb-$(CONFIG_ROCKCHIP_RK3368) += \
- 	rk3368-lion-haikou.dtb \
- 	rk3368-sheep.dtb \
-@@ -169,8 +170,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
- 	rk3399-rock960.dtb \
- 	rk3399-rockpro64.dtb \
- 	rk3399pro-rock-pi-n10.dtb \
--	rk3399pro-tinker_edge_r.dtb \
--	rk3399-xiaobao-nas.dtb
-+	rk3399pro-tinker_edge_r.dtb 
-
- dtb-$(CONFIG_ROCKCHIP_RK3568) += \
- 	rk3568-evb.dtb
 diff -Nurp a/arch/arm/dts/rk3328-artillery-x4.dts b/arch/arm/dts/rk3328-artillery-x4.dts
 --- a/arch/arm/dts/rk3328-artillery-x4.dts	1970-01-01 01:00:00.000000000 +0100
 +++ b/arch/arm/dts/rk3328-artillery-x4.dts	2024-06-16 02:03:16.848858789 +0200