diff options
| author | John Klug <john.klug@multitech.com> | 2017-05-12 18:26:28 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2017-06-09 09:09:19 -0500 |
| commit | e2f2dce006439e3c7a35737b15ed7da03ba0bc2a (patch) | |
| tree | 9f84c5fb98d6fea84e4c9878880298248e08a28a /conf | |
| parent | 06f304cec0ee3260ccd28bcc47d591eb1fca257d (diff) | |
| download | meta-multitech-e2f2dce006439e3c7a35737b15ed7da03ba0bc2a.tar.gz meta-multitech-e2f2dce006439e3c7a35737b15ed7da03ba0bc2a.tar.bz2 meta-multitech-e2f2dce006439e3c7a35737b15ed7da03ba0bc2a.zip | |
Merging morty with master (Daisy).
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/mtcdt.conf | 6 |
1 files changed, 5 insertions, 1 deletions
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" |