From 6dc6ddc79ccae376d3bcff217bb8bc3a944926b9 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Mon, 13 Feb 2023 13:33:39 +0100 Subject: [PATCH] hw26/hw21: Fix order of machine overrides For most of the overrides the order is not important since all overrides are used. But when using a file specific to a machine, only one override is used and in this case the order is important: the last override matching is used. So we must keep more specific overrides at the end. id:366284 --- conf/machine/am335x-hw26-vcupro.conf | 2 +- conf/machine/am335x-hw26.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/am335x-hw26-vcupro.conf b/conf/machine/am335x-hw26-vcupro.conf index 6e84a86..69b6cd1 100644 --- a/conf/machine/am335x-hw26-vcupro.conf +++ b/conf/machine/am335x-hw26-vcupro.conf @@ -4,6 +4,6 @@ # the new VCU pro was based on the changes done on NG800 require am335x-hw26.conf -MACHINEOVERRIDES .= ":am335x-hw26" +MACHINEOVERRIDES =. "am335x-hw26:" USER_MODULE_MACHINE_FEATURE = "user-module" diff --git a/conf/machine/am335x-hw26.conf b/conf/machine/am335x-hw26.conf index d50b1cc..68c243a 100644 --- a/conf/machine/am335x-hw26.conf +++ b/conf/machine/am335x-hw26.conf @@ -5,7 +5,7 @@ #require conf/machine/include/ti33x.inc require am335x-nmhw21.conf KERNEL_DEVICETREE_TO_USE = "${HW26_DT}" -MACHINEOVERRIDES .= ":am335x-nmhw21" +MACHINEOVERRIDES =. "am335x-nmhw21:" MACHINE_FEATURES += "pps"