summaryrefslogtreecommitdiff
path: root/recipes-bsp
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 /recipes-bsp
parente2f2dce006439e3c7a35737b15ed7da03ba0bc2a (diff)
downloadmeta-multitech-64855ce2ad43f95dd268675fc7fdcd4cff30bd54.tar.gz
meta-multitech-64855ce2ad43f95dd268675fc7fdcd4cff30bd54.tar.bz2
meta-multitech-64855ce2ad43f95dd268675fc7fdcd4cff30bd54.zip
Merge in some Yocto 2.1 code.
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/u-boot/u-boot_2016.03.bb3
1 files changed, 0 insertions, 3 deletions
diff --git a/recipes-bsp/u-boot/u-boot_2016.03.bb b/recipes-bsp/u-boot/u-boot_2016.03.bb
index 77fce05..1f58b50 100644
--- a/recipes-bsp/u-boot/u-boot_2016.03.bb
+++ b/recipes-bsp/u-boot/u-boot_2016.03.bb
@@ -8,11 +8,8 @@ DEPENDS += "dtc-native"
SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
PV = "v2016.03+git${SRCPV}"
-<<<<<<< HEAD
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-2016.03:"
SRC_URI += "file://mtcdt.patch"
SRC_URI += "file://spl.patch"
SRC_URI += "file://i2c.patch"
-=======
->>>>>>> Initial commit of Yocto 2.1 changes