From eb2644d09af43969cb611620b38b36c214714286 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Thu, 24 Feb 2022 23:16:02 +0800
Subject: [PATCH] rockchip: disable unsupported devices by default

Since users only want to use the latest test kernel,
disable unverifiable devices to compile properly.

Closed: #8934
---
 target/linux/rockchip/image/armv8.mk          |  8 +--
 ...328-Add-support-for-OrangePi-R1-Plus.patch | 52 +++++++++++++++++++
 ...k3399-add-support-for-GuangMiao-G4C.patch} |  2 +-
 3 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 target/linux/rockchip/patches-5.15/202-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus.patch
 rename target/linux/rockchip/patches-5.15/{202-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch => 203-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch} (89%)

diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
index 30d186fa9..a8cb2126d 100644
--- a/target/linux/rockchip/image/armv8.mk
+++ b/target/linux/rockchip/image/armv8.mk
@@ -10,7 +10,7 @@ define Device/embedfire_doornet1
   IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata
   DEVICE_PACKAGES := kmod-usb-net-rtl8152 kmod-rtl8821cu
 endef
-TARGET_DEVICES += embedfire_doornet1
+#TARGET_DEVICES += embedfire_doornet1
 
 define Device/embedfire_doornet2
   DEVICE_VENDOR := EmbedFire
@@ -20,7 +20,7 @@ define Device/embedfire_doornet2
   IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-bin | gzip | append-metadata
   DEVICE_PACKAGES := kmod-r8168 kmod-rtl8821cu -urngd
 endef
-TARGET_DEVICES += embedfire_doornet2
+#TARGET_DEVICES += embedfire_doornet2
 
 define Device/friendlyarm_nanopi-r2c
   DEVICE_VENDOR := FriendlyARM
@@ -30,7 +30,7 @@ define Device/friendlyarm_nanopi-r2c
   IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata
   DEVICE_PACKAGES := kmod-usb-net-rtl8152
 endef
-TARGET_DEVICES += friendlyarm_nanopi-r2c
+#TARGET_DEVICES += friendlyarm_nanopi-r2c
 
 define Device/friendlyarm_nanopi-r2s
   DEVICE_VENDOR := FriendlyARM
@@ -101,4 +101,4 @@ define Device/xunlong_orangepi-r1-plus-lts
   IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata
   DEVICE_PACKAGES := kmod-usb-net-rtl8152
 endef
-TARGET_DEVICES += xunlong_orangepi-r1-plus-lts
+#TARGET_DEVICES += xunlong_orangepi-r1-plus-lts
diff --git a/target/linux/rockchip/patches-5.15/202-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus.patch b/target/linux/rockchip/patches-5.15/202-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus.patch
new file mode 100644
index 000000000..dc62c5b97
--- /dev/null
+++ b/target/linux/rockchip/patches-5.15/202-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus.patch
@@ -0,0 +1,52 @@
+--- a/arch/arm64/boot/dts/rockchip/Makefile
++++ b/arch/arm64/boot/dts/rockchip/Makefile
+@@ -10,6 +10,7 @@
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb
++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts
+@@ -0,0 +1,39 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++#include "rk3328-nanopi-r2s.dts"
++
++/ {
++	model = "Xunlong Orange Pi R1 Plus";
++	compatible = "xunlong,orangepi-r1-plus", "rockchip,rk3328";
++};
++
++&lan_led {
++	label = "orangepi-r1-plus:green:lan";
++};
++
++&spi0 {
++	max-freq = <48000000>;
++	status = "okay";
++
++	flash@0 {
++		compatible = "jedec,spi-nor";
++		reg = <0>;
++		spi-max-frequency = <10000000>;
++	};
++};
++
++&sys_led {
++	gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
++	label = "orangepi-r1-plus:red:sys";
++};
++
++&sys_led_pin {
++	rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
++};
++
++&uart1 {
++	status = "okay";
++};
++
++&wan_led {
++	label = "orangepi-r1-plus:green:wan";
++};
diff --git a/target/linux/rockchip/patches-5.15/202-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch b/target/linux/rockchip/patches-5.15/203-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch
similarity index 89%
rename from target/linux/rockchip/patches-5.15/202-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch
rename to target/linux/rockchip/patches-5.15/203-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch
index c0fc688a4..73ecc2f78 100644
--- a/target/linux/rockchip/patches-5.15/202-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch
+++ b/target/linux/rockchip/patches-5.15/203-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm64/boot/dts/rockchip/Makefile
 +++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -26,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a9
+@@ -27,6 +27,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a9
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb