summaryrefslogtreecommitdiff
path: root/conf/machine/mtre.conf
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2022-05-24 14:21:43 -0500
committerJohn Klug <john.klug@multitech.com>2022-05-24 14:38:55 -0500
commit695ebddbf1a14400e59861bd2c09f298c419dbd7 (patch)
tree45ab0f8ce2d751c450d865b3d6816c37e7db7d2b /conf/machine/mtre.conf
parent3df2bfaac72985ef1673175f1861c61ec580983a (diff)
downloadmeta-multitech-atmel-695ebddbf1a14400e59861bd2c09f298c419dbd7.tar.gz
meta-multitech-atmel-695ebddbf1a14400e59861bd2c09f298c419dbd7.tar.bz2
meta-multitech-atmel-695ebddbf1a14400e59861bd2c09f298c419dbd7.zip
Setting default version of linux does not work, use linux-at91
Diffstat (limited to 'conf/machine/mtre.conf')
-rw-r--r--conf/machine/mtre.conf4
1 files changed, 4 insertions, 0 deletions
diff --git a/conf/machine/mtre.conf b/conf/machine/mtre.conf
index 8e588f8..8405351 100644
--- a/conf/machine/mtre.conf
+++ b/conf/machine/mtre.conf
@@ -6,7 +6,11 @@ require conf/machine/include/tune-arm926ejs.inc
MACHINE_FEATURES = "ext2 ext3 usbhost usbgadget ppp"
PREFERRED_PROVIDER_virtual/kernel = "linux-at91"
+<<<<<<< HEAD
PREFERRED_VERSION_linux = "4.9.%"
+=======
+PREFERRED_VERSION_linux-at91 = "5.4.81"
+>>>>>>> b5b1fc2... mLinux 6 current preferred kernel is 5.4.81
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "kernel-module-vizzini"
PREFERRED_VERSION_kernel-module-vizzini ?= "1.1"