The last kernel to not split the rock-pi-4[abc] MACHINEs into separate
device trees was 5.10. The linux-yocto kernels supported in this release
are all after 5.10. Therefore remove the rock-pi-4 MACHINE. By now, on master,
everyone should be selecting specific MACHINEs from one of the variants and
not using "rock-pi-4".

NOTE: this layer will continue to use "rock-pi-4" as a MACHINEOVERRIDE when
the specific variant doesn't matter

Signed-off-by: Trevor Woerner <twoerner@...>
---
conf/machine/rock-pi-4.conf | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 conf/machine/rock-pi-4.conf

diff --git a/conf/machine/rock-pi-4.conf b/conf/machine/rock-pi-4.conf
deleted file mode 100644
index 23bbfc3bfcf8..000000000000
--- a/conf/machine/rock-pi-4.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2020 Garmin Ltd. or its subsidaries
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-#@TYPE: Machine
-#@NAME: Rock Pi 4 RK3399
-#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor.
-#
-# NOTE: This machine is for Kernels before 5.10. If you are using an newer kernel
-# see rock-pi-4{a,b,c}.conf
-
-require conf/machine/include/rock-pi-4.inc
-
-KERNEL_DEVICETREE = "rockchip/rk3399-rock-pi-4.dtb"
-UBOOT_MACHINE = "rock-pi-4-rk3399_defconfig"
-
--
2.36.0.rc2.17.g4027e30c53