4 files changed, 9 insertions, 11 deletions
diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb
index 8090f57..78ffcf3 100644
--- a/recipes-core/images/mlinux-minimal-image.bb
+++ b/recipes-core/images/mlinux-minimal-image.bb
@@ -16,10 +16,10 @@ CORE_FEATURES = "packagegroup-core-boot packagegroup-distro-base \
                  openssh-sftp-server \
                  util-linux-mount util-linux-umount \
                  start-stop-daemon \
-		 sudo \
+		         sudo \
                  ${CORE_IMAGE_EXTRA_INSTALL} \
                  mlinux-feed-configs \
-		 useradd \
+		         useradd \
                  get-eeprom-device-config \
                  "
 
@@ -44,10 +44,11 @@ MULTITECH_FEATURES = "kernel-module-mts-io \
 			config \
 			mts-id-eeprom \
 			set-rs485 \
-			radio-reset"
+			radio-reset \
+            upgrade-reboot"
 
-
-MULTITECH_MTAC = "kernel-module-mtac \
+MULTITECH_MTAC = ""
+MULTITECH_MTAC_mtcdt += "kernel-module-mtac \
 			kernel-module-mtac-eth \
 			kernel-module-mtac-gpiob \
 			kernel-module-mtac-lora \
@@ -55,7 +56,9 @@ MULTITECH_MTAC = "kernel-module-mtac \
 			kernel-module-mtac-pulse \
 			kernel-module-mtac-xdot"
 
-UPGRADE_FEATURES = "upgrade-reboot mtd-utils-static"
+# BSP SPECIFIC UPGRADE FEATURES
+UPGRADE_FEATURES = ""
+UPGRADE_FEATURES_mtbsp-at91 = "mtd-utils-static"
 
 IMAGE_INSTALL = "${CORE_FEATURES} \
                  ${NETWORKING_FEATURES} \
diff --git a/recipes-core/images/mlinux-mtcap-image.bb b/recipes-core/images/mlinux-mtcap-image.bb
index ec161bd..d3b6f65 100644
--- a/recipes-core/images/mlinux-mtcap-image.bb
+++ b/recipes-core/images/mlinux-mtcap-image.bb
@@ -25,9 +25,6 @@ NETWORKING_FEATURES += "bridge-utils \
                        busybox-ifplugd \
                        "
 
-# No accessory cards for MTAC
-MULTITECH_MTAC = ""
-
 TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
                  tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
                  tzdata-misc \
diff --git a/recipes-core/images/mlinux-mtr-image.bb b/recipes-core/images/mlinux-mtr-image.bb
index bf56719..3a99d8e 100644
--- a/recipes-core/images/mlinux-mtr-image.bb
+++ b/recipes-core/images/mlinux-mtr-image.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "mLinux base mtr image"
 LICENSE = "MIT"
 
 require mlinux-minimal-image.bb
-MULTITECH_MTAC = ""
 
 FILESYSTEM_FEATURES = "dosfstools \
                  cifs-utils \
diff --git a/recipes-core/images/mlinux-mtrv1-image.bb b/recipes-core/images/mlinux-mtrv1-image.bb
index 3c10593..2e5ad58 100644
--- a/recipes-core/images/mlinux-mtrv1-image.bb
+++ b/recipes-core/images/mlinux-mtrv1-image.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "mLinux base mtr image"
 LICENSE = "MIT"
 
 require mlinux-minimal-image.bb
-MULTITECH_MTAC = ""
 
 FILESYSTEM_FEATURES = "dosfstools \
                  cifs-utils \