[PATCH 1/2] u-boot-ti-staging: Use AM57x branch/git tree

[PATCH 1/2] u-boot-ti-staging: Use AM57x branch/git tree

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

* Currently AM57x support is hosted on a separate branch and git tree that is
  based on the latest u-boot-ti-staging integration tree.
* Point to this branch and git tree for am57xx-evm until it is merged.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../u-boot/u-boot-ti-staging_2014.07.bbappend      |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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 5b6ab64..1243058 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,6 +1,17 @@
 # Append the base 2014.07 u-boot mainline recipe to AUTOREV for now so that
 # we can test the latest mainline
 
-PR_append = "-arago1+gitr${SRCPV}"
+PR_append = "-arago2+gitr${SRCPV}"
+
+# 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=https;branch=${BRANCH}"
 
 SRCREV = "${AUTOREV}"
-- 
1.7.9.5

[PATCH 2/2] linux-ti-staging: Use AM57x branch/git tree

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

* Currently AM57x support is hosted on a separate branch and git tree that is
  based on the latest u-boot-ti-staging integration tree.
* Point to this branch and git tree for am57xx-evm until it is merged.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../linux/linux-ti-staging_3.14.bbappend           |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_3.14.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_3.14.bbappend
index b178b5e..523a088 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_3.14.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_3.14.bbappend
@@ -1,4 +1,12 @@
-MACHINE_KERNEL_PR_append = "-arago1"
+MACHINE_KERNEL_PR_append = "-arago2"
+
+OLD_BRANCH := "${BRANCH}"
+SRC_URI_am57xx-evm := "${@oe_filter_out('git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${OLD_BRANCH}','${SRC_URI}', d)}"
+
+BRANCH_am57xx-evm = "beagle-x15-v3.14"
+
+SRC_URI_am57xx-evm += "git://git.ti.com/~nmenon/ti-linux-kernel/ti-linux-x15-validate.git;protocol=git;branch=${BRANCH}"
+
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-- 
1.7.9.5

Re: [PATCH 1/2] u-boot-ti-staging: Use AM57x branch/git tree

[Cooper Jr., Franklin]

Ignore these two patches I need to send updated versions plus an additional patch.

> -----Original Message-----
> From: Cooper Jr., Franklin
> Sent: Wednesday, August 06, 2014 5:09 PM
> To: meta-arago@arago-project.org
> Cc: Cooper Jr., Franklin
> Subject: [PATCH 1/2] u-boot-ti-staging: Use AM57x branch/git tree
> 
> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
> 
> * Currently AM57x support is hosted on a separate branch and git tree that is
>   based on the latest u-boot-ti-staging integration tree.
> * Point to this branch and git tree for am57xx-evm until it is merged.
> 
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  .../u-boot/u-boot-ti-staging_2014.07.bbappend      |   13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> 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 5b6ab64..1243058 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.bba
> +++ ppend
> @@ -1,6 +1,17 @@
>  # Append the base 2014.07 u-boot mainline recipe to AUTOREV for now so
> that  # we can test the latest mainline
> 
> -PR_append = "-arago1+gitr${SRCPV}"
> +PR_append = "-arago2+gitr${SRCPV}"
> +
> +# 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=https;branch=${BRANCH}"
> 
>  SRCREV = "${AUTOREV}"
> --
> 1.7.9.5