From 9141451583ea0085845ab76b1f9c66ee645ad997 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 5 May 2023 10:51:14 +0200
Subject: [PATCH] meta-digi: cosmetic, delete machine variants dead code

We removed machine variants support years ago.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/conf/machine/include/digi-defaults.inc |  4 ----
 sdk/mkproject.sh                                     | 10 ++--------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 9410a4ab4..48750f190 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -59,10 +59,6 @@ IMAGE_CLASSES = "image_types_digi"
 # Do not enable console on VT (see sysvinit-inittab recipe)
 USE_VT ?= "0"
 
-# Add the machine variant to the valid machine override
-MACHINE_VARIANT ?= ""
-MACHINEOVERRIDES .= "${@['', ':${MACHINE_VARIANT}']['${MACHINE_VARIANT}' != '']}"
-
 # Extra RDEPENDS
 OPTEE_PKGS ??= ""
 MACHINE_EXTRA_RDEPENDS += " \
diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh
index a9768a192..c201767de 100755
--- a/sdk/mkproject.sh
+++ b/sdk/mkproject.sh
@@ -151,10 +151,6 @@ do_mkproject() {
 		# Customize project
 		chmod 644 ${MKP_PROJECTPATH}/conf/bblayers.conf ${MKP_PROJECTPATH}/conf/local.conf
 		sed -i -e "s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf
-		if [ -n "${MKP_VARIANT+x}" ]; then
-			sed -i -e "/^MACHINE_VARIANT =/cMACHINE_VARIANT = \"${MKP_VARIANT}\"" \
-				${MKP_PROJECTPATH}/conf/local.conf
-		fi
 		# At this point the user has accepted all the licenses, so enable the vendor EULA
 		sed -i -e "s,^#\(ACCEPT.*EULA\),\1,g" ${MKP_PROJECTPATH}/conf/local.conf
 		# Create dey-setup-environment script
@@ -178,11 +174,10 @@ fi
 # The script needs to be sourced (not executed) so make sure to
 # initialize OPTIND variable for getopts.
 OPTIND=1
-while getopts "lp:v:m:" c; do
+while getopts "lp:m:" c; do
 	case "${c}" in
 		l) MKP_LIST_PLATFORMS="y";;
 		p) MKP_PLATFORM="${OPTARG}";;
-		v) MKP_VARIANT="${OPTARG}";;
 		m) MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/${OPTARG}/sdk/config";;
 	esac
 done
@@ -219,5 +214,4 @@ unset MKP_AVAILABLE_PLATFORMS \
       MKP_RED \
       MKP_SCRIPTNAME \
       MKP_SCRIPTPATH \
-      MKP_SETUP_ENVIRONMENT \
-      MKP_VARIANT
+      MKP_SETUP_ENVIRONMENT