From 6fa868f2d401effc22cac8d5f09207d2ff437769 Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Mon, 14 Nov 2022 15:40:40 +0100
Subject: [PATCH] machines.conf: Add new machine hw26-vcupro

This is the new VCU pro based on HW26 but which includes the user
module.
Because of this change, we cannot reuse HW21 nor HW26 machines.

BugzID: 81969
---
 conf/machine/am335x-hw26-vcupro.conf | 9 +++++++++
 conf/machine/am335x-hw26.conf        | 5 ++++-
 conf/machine/am335x-nmhw21.conf      | 4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 conf/machine/am335x-hw26-vcupro.conf

diff --git a/conf/machine/am335x-hw26-vcupro.conf b/conf/machine/am335x-hw26-vcupro.conf
new file mode 100644
index 0000000..6e84a86
--- /dev/null
+++ b/conf/machine/am335x-hw26-vcupro.conf
@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: NetModule HW 26 with user module
+#@DESCRIPTION: NG800 (hw26) was based on VCU1 (hw21), but later on,
+# the new VCU pro was based on the changes done on NG800
+
+require am335x-hw26.conf
+MACHINEOVERRIDES .= ":am335x-hw26"
+
+USER_MODULE_MACHINE_FEATURE = "user-module"
diff --git a/conf/machine/am335x-hw26.conf b/conf/machine/am335x-hw26.conf
index 86fc745..d50b1cc 100644
--- a/conf/machine/am335x-hw26.conf
+++ b/conf/machine/am335x-hw26.conf
@@ -6,5 +6,8 @@
 require am335x-nmhw21.conf
 KERNEL_DEVICETREE_TO_USE = "${HW26_DT}"
 MACHINEOVERRIDES .= ":am335x-nmhw21"
+
 MACHINE_FEATURES += "pps"
-MACHINE_FEATURES_remove = "user-module"
+
+# Remove usermodule
+USER_MODULE_MACHINE_FEATURE = ""
diff --git a/conf/machine/am335x-nmhw21.conf b/conf/machine/am335x-nmhw21.conf
index 5c79c79..f41435f 100644
--- a/conf/machine/am335x-nmhw21.conf
+++ b/conf/machine/am335x-nmhw21.conf
@@ -30,7 +30,9 @@ MACHINE_FEATURES += " \
 	neo-m8l \
 	wifi \
 	ti-wifi \
-	user-module \
 	da9063-ignition \
 "
 
+USER_MODULE_MACHINE_FEATURE = "user-module"
+MACHINE_FEATURES_append = " ${USER_MODULE_MACHINE_FEATURE}"
+