diff options
Diffstat (limited to 'recipes-bsp/u-boot')
| -rw-r--r-- | recipes-bsp/u-boot/u-boot_2016.03.bb | 3 |
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 |