From e2f2dce006439e3c7a35737b15ed7da03ba0bc2a Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 12 May 2017 18:26:28 -0500
Subject: Merging morty with master (Daisy).

---
 conf/machine/mtcdt.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/machine/mtcdt.conf b/conf/machine/mtcdt.conf
index 58339dd..0fef766 100644
--- a/conf/machine/mtcdt.conf
+++ b/conf/machine/mtcdt.conf
@@ -14,7 +14,10 @@ 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"
@@ -31,7 +34,8 @@ KERNEL_IMAGETYPE = "uImage"
 # remove kernel-image from rootfs by overriding kernel-base DEPS
 RDEPENDS_kernel-base = ""
 
-EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
+#EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
+EXTRA_IMAGEDEPENDS += "u-boot"
 
 IMAGE_FSTYPES =+ "jffs2 tar.gz"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 -n"
-- 
cgit v1.2.3