From 64855ce2ad43f95dd268675fc7fdcd4cff30bd54 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 15 May 2017 09:35:36 -0500 Subject: Merge in some Yocto 2.1 code. --- conf/machine/mtcdt.conf | 3 --- 1 file changed, 3 deletions(-) (limited to 'conf') 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" -- cgit v1.2.3