[PATCH 2/3] genericarm64: Use MACHINE_FEATURES_DEFAULT

In openembedded-core, MACHINE_FEATURES_BACKFILL will be replaced to
allow opting out of any default MACHINE_FEATURES. To adapt to this, we
need to use MACHINE_FEATURES_DEFAULT to pick up the features that were
previously added via backfill.

We can also drop rtc and qemu-usermode from our list as they are
included in the backfill list (before the change in openembedded-core)
and the new defaults (after the change).

Signed-off-by: Paul Barker <[email protected]>
---
 meta-yocto-bsp/conf/machine/genericarm64.conf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-yocto-bsp/conf/machine/genericarm64.conf b/meta-yocto-bsp/conf/machine/genericarm64.conf
index 2b1ce4bdd02b..02a2219ce5b5 100644
--- a/meta-yocto-bsp/conf/machine/genericarm64.conf
+++ b/meta-yocto-bsp/conf/machine/genericarm64.conf
@@ -8,7 +8,10 @@ require conf/machine/include/arm/arch-armv8a.inc
 # Arm Base System Architecture says v8.0+ is allowed, but FEAT_CRC32 is required
 DEFAULTTUNE = "armv8a-crc"
 
-MACHINE_FEATURES = "acpi alsa bluetooth efi keyboard pci qemu-usermode rtc screen usbhost vfat wifi"
+MACHINE_FEATURES = " \
+    ${MACHINE_FEATURES_DEFAULT} \
+    acpi alsa bluetooth efi keyboard pci screen usbhost vfat wifi \
+    "
 
 KERNEL_IMAGETYPE = "Image"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"

-- 
2.43.0