[meta-rockchip][scarthgap][PATCH 2/2] remove radxa-zero-3{e|w}

[Trevor Woerner <twoerner@gmail.com>]

Remove these devices from the scarthgap branch. In the scarthgap era they were
only supported using non-upstream forks and branches of the kernel and u-boot,
branches that continuously move, change names, and disappear.

Branches after scrathgap have upstream support for these devices and are a
better choice.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 conf/machine/include/radxa-zero-3.inc   |  8 --------
 conf/machine/include/rk3566.inc         | 23 -----------------------
 conf/machine/radxa-zero-3e.conf         |  7 -------
 conf/machine/radxa-zero-3w.conf         |  7 -------
 recipes-bsp/rkbin/rockchip-rkbin_git.bb | 15 ---------------
 recipes-graphics/mesa/mesa_%.bbappend   |  1 -
 6 files changed, 61 deletions(-)
 delete mode 100644 conf/machine/include/radxa-zero-3.inc
 delete mode 100644 conf/machine/include/rk3566.inc
 delete mode 100644 conf/machine/radxa-zero-3e.conf
 delete mode 100644 conf/machine/radxa-zero-3w.conf

diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc
deleted file mode 100644
index 1c6f972c1e31..000000000000
--- a/conf/machine/include/radxa-zero-3.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-MACHINEOVERRIDES =. "radxa-zero-3:"
-
-require conf/machine/include/rk3566.inc
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next"
-MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
-
-UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
diff --git a/conf/machine/include/rk3566.inc b/conf/machine/include/rk3566.inc
deleted file mode 100644
index 2522851fa392..000000000000
--- a/conf/machine/include/rk3566.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SOC_FAMILY = "rk3566"
-
-DEFAULTTUNE ?= "cortexa55"
-
-ROCKCHIP_CLOSED_TPL ?= "1"
-
-require conf/machine/include/soc-family.inc
-require conf/machine/include/rockchip-defaults.inc
-require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
-require conf/machine/include/rockchip-wic.inc
-
-KBUILD_DEFCONFIG ?= "defconfig"
-KERNEL_FEATURES:append:rk3566 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc"
-KERNEL_CLASSES = "kernel-fitimage"
-KERNEL_IMAGETYPE ?= "fitImage"
-
-PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin"
-PREFERRED_PROVIDER_optee-os = "rockchip-rkbin"
-
-UBOOT_SUFFIX ?= "itb"
-UBOOT_ENTRYPOINT ?= "0x06000000"
-
-ENABLE_STATELESS_VPU_GST ?= "1"
diff --git a/conf/machine/radxa-zero-3e.conf b/conf/machine/radxa-zero-3e.conf
deleted file mode 100644
index 37792cbf36a5..000000000000
--- a/conf/machine/radxa-zero-3e.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: Radxa Zero 3E
-#@DESCRIPTION: The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces.
-#http://radxa.com/products/zeros/zero3e/
-
-require conf/machine/include/radxa-zero-3.inc
-KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3e.dtb"
diff --git a/conf/machine/radxa-zero-3w.conf b/conf/machine/radxa-zero-3w.conf
deleted file mode 100644
index 5193d45e1f69..000000000000
--- a/conf/machine/radxa-zero-3w.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: Radxa Zero 3W
-#@DESCRIPTION: The Radxa ZERO 3w is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces.
-#http://radxa.com/products/zeros/zero3w/
-
-require conf/machine/include/radxa-zero-3.inc
-KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3w.dtb"
diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
index e555dcdac355..7e0bf813d27a 100644
--- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb
+++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
@@ -16,7 +16,6 @@ S = "${WORKDIR}/git"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:rk3308 = "rk3308"
-COMPATIBLE_MACHINE:rk3566 = "rk3566"
 COMPATIBLE_MACHINE:rk3568 = "rk3568"
 COMPATIBLE_MACHINE:rk3588s = "rk3588s"
 
@@ -42,20 +41,6 @@ do_deploy:rk3308() {
 	install -m 644 ${S}/bin/rk33/${DDRBIN_FILE} ${DEPLOYDIR}/ddr-rk3308.bin
 }
 
-DDRBIN_VERS:rk3566 ?= "v1.23"
-DDRBIN_FILE:rk3566 ?= "rk3566_ddr_1056MHz_${DDRBIN_VERS}.bin"
-
-# NOTE: the following are not typos
-#       the rk3566 uses the same bl31/2 as the rk3568
-do_deploy:rk3566() {
-	# Prebuilt TF-A
-	install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3566.elf
-	# Prebuilt OPTEE-OS
-	install -m 644 ${S}/bin/rk35/rk3568_bl32_v*.bin ${DEPLOYDIR}/tee-rk3566.bin
-	# Prebuilt U-Boot TPL (DDR init)
-	install -m 644 ${S}/bin/rk35/${DDRBIN_FILE} ${DEPLOYDIR}/ddr-rk3566.bin
-}
-
 DDRBIN_VERS:rk3568 ?= "v1.23"
 DDRBIN_FILE:rk3568 ?= "rk3568_ddr_1560MHz_${DDRBIN_VERS}.bin"
 
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 00cc15c6221c..2d9ec2e676f7 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,6 +1,5 @@
 PACKAGECONFIG:append:rk3288 = " kmsro panfrost"
 PACKAGECONFIG:append:rk3328 = " kmsro lima"
 PACKAGECONFIG:append:rk3399 = " kmsro panfrost"
-PACKAGECONFIG:append:rk3566 = " kmsro panfrost"
 PACKAGECONFIG:append:rk3568 = " kmsro panfrost"
 PACKAGECONFIG:append:px30 = " kmsro panfrost"
-- 
2.44.0.478.g7774cfed6261