From: Denys Dmytriyenko <de...@ti.com>
Signed-off-by: Denys Dmytriyenko <de...@ti.com>
---
meta-arago-distro/conf/distro/include/arago-prefs.inc | 6 ++++++
.../recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend | 14 +-------------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc
b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index ac8cbf8..94bb9da 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -83,6 +83,12 @@ PREFERRED_PROVIDER_u-boot_omap-a15 = "u-boot-ti-staging"
PREFERRED_VERSION_u-boot-ti-staging = "2014.07%"
+# Point am57xx-evm to latest mainline
+PREFERRED_PROVIDER_virtual/bootloader_am57xx-evm = "u-boot"
+PREFERRED_PROVIDER_u-boot_am57xx-evm = "u-boot"
+
+PREFERRED_VERSION_u-boot_am57xx-evm = "2014.10+2015.01%"
+
# Pin down udev version from oe-core, as meta-oe pulls in newer
systemd-enhanced version
PREFERRED_VERSION_udev = "182"
PREFERRED_PROVIDER_udev = "udev"
diff --git
a/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend
b/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend
index 35ad282..6bea43f 100644
--- a/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend
+++ b/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend
@@ -1,17 +1,5 @@
FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-PR_append = "-arago6"
+PR_append = "-arago7"
UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
-
-# AM57x EVM is currently on a seperate git tree/branch.
-# Once the software has been integrated to the u-boot-ti-staging
-# repository these lines can be removed.
-
-OLD_BRANCH := "${BRANCH}"
-SRC_URI_am57xx-evm :=
"${@oe_filter_out('git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${OLD_BRANCH}','${SRC_URI}',
d)}"
-
-BRANCH_am57xx-evm = "beaglex15"
-
-SRC_URI_am57xx-evm +=
"git://github.com/felipebalbi/u-boot.git;protocol=git;branch=${BRANCH}"
-SRC_URI_am57xx-evm += "file://0001-omap5-Add-netargs-and-netboot-option.patch"
--
2.2.0
_______________________________________________
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
