summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2017-05-15 09:35:36 -0500
committerJohn Klug <john.klug@multitech.com>2017-06-09 09:09:19 -0500
commit64855ce2ad43f95dd268675fc7fdcd4cff30bd54 (patch)
tree55666279de5d967f98834deb78a6d7495539aa54 /conf/machine
parente2f2dce006439e3c7a35737b15ed7da03ba0bc2a (diff)
downloadmeta-multitech-atmel-64855ce2ad43f95dd268675fc7fdcd4cff30bd54.tar.gz
meta-multitech-atmel-64855ce2ad43f95dd268675fc7fdcd4cff30bd54.tar.bz2
meta-multitech-atmel-64855ce2ad43f95dd268675fc7fdcd4cff30bd54.zip
Merge in some Yocto 2.1 code.
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/mtcdt.conf3
1 files changed, 0 insertions, 3 deletions
diff --git a/conf/machine/mtcdt.conf b/conf/machine/mtcdt.conf
index 0fef766..953f698 100644
--- a/conf/machine/mtcdt.conf
+++ b/conf/machine/mtcdt.conf
@@ -14,10 +14,7 @@ PREFERRED_VERSION_kernel-module-vizzini ?= "1.1"
DEFAULTTUNE = "arm926ejs"
TUNE_CCARGS = " -march=armv5te -marm -mthumb-interwork -mtune=arm926ej-s"
TUNE_FEATURES = "arm armv5 thumb dsp arm926ejs"
-<<<<<<< HEAD
ARMPKGSFX_THUMB="t"
-=======
->>>>>>> Initial commit of Yocto 2.1 changes
# used by sysvinit_2
SERIAL_CONSOLES = "115200;ttyS0"