[meta-fsl-arm-extra][PATCH 1/2] u-boot-toradex: update to Toradex V2.5 Beta 2 release

[meta-fsl-arm-extra][PATCH 1/2] u-boot-toradex: update to Toradex V2.5 Beta 2 release

[Stefan Agner]

From: Stefan Agner <stefan.agner@toradex.com>

Update git revision to match the latest Toradex BSP release V2.5
Beta 2. The release is still based on upstream U-Boot 2015.04
with some new fixes and improvements such as updated NAND flash
controller driver and fixed delays when using the global timer as
time source.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
---
 recipes-bsp/u-boot/u-boot-toradex_2015.04.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
index 56516ed..f39af17 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
@@ -1,7 +1,7 @@
 include u-boot-toradex.inc
 
-PV = "v2015.04+git${SRCPV}"
+PV = "v2015.04-v2.5b1+git${SRCPV}"
 
-SRCREV = "f9e7649338178f823e291386dde5086ad636b703"
+SRCREV = "1ef4a29e8cea0239411dde64f9617ad76248fd02"
 SRCBRANCH = "2015.04-toradex"
 COMPATIBLE_MACHINE = "(vf)"
-- 
2.6.2

[meta-fsl-arm-extra][PATCH 2/2] linux-toradex: update to Toradex V2.5 Beta 2 release

[Stefan Agner]

From: Stefan Agner <stefan.agner@toradex.com>

Update git revision to match the latest Toradex BSP release V2.5
Beta 2. The kernel is based on the 4.1.12 release of the upstream
kernel with some new updates and fixes. The NAND flash controller
driver has been synchronized with the latest upstream version,
which also needed a incompatible device tree change. Besides that,
automatic USB host/device change for the Colibri USBC-Port is
supported now and the UART's DMA mode has been disabled by default
due to instability issues. Refer to the Toradex release notes for
the full list of changes.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
---
 recipes-kernel/linux/linux-toradex_4.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-toradex_4.1.bb b/recipes-kernel/linux/linux-toradex_4.1.bb
index 141cf35..2295d0e 100644
--- a/recipes-kernel/linux/linux-toradex_4.1.bb
+++ b/recipes-kernel/linux/linux-toradex_4.1.bb
@@ -6,8 +6,8 @@ SUMMARY = "Linux kernel for Toradex Colibri VFxx Computer on Modules"
 SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH} \
            file://defconfig"
 
-LOCALVERSION = "-v2.5b1.1"
+LOCALVERSION = "-v2.5b2"
 SRCBRANCH = "toradex_vf_4.1"
-SRCREV = "326879dda277c0b85f64bf66e071745b63c0f658"
+SRCREV = "559570ccdc6555d2228a4e4e9e589e3145d7c2e4"
 DEPENDS += "lzop-native bc-native"
 COMPATIBLE_MACHINE = "(vf)"
-- 
2.6.2

Re: [meta-fsl-arm-extra][PATCH 1/2] u-boot-toradex: update to Toradex V2.5 Beta 2 release

[Stefan Agner]

Hi Otavio,

Is it possible to apply this two patches (along with the typo fix) also
to the fido branch? I think they should apply cleanly...

--
Stefan

On 2015-11-24 16:55, Stefan Agner wrote:
> From: Stefan Agner <stefan.agner@toradex.com>
> 
> Update git revision to match the latest Toradex BSP release V2.5
> Beta 2. The release is still based on upstream U-Boot 2015.04
> with some new fixes and improvements such as updated NAND flash
> controller driver and fixed delays when using the global timer as
> time source.
> 
> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
> ---
>  recipes-bsp/u-boot/u-boot-toradex_2015.04.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
> b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
> index 56516ed..f39af17 100644
> --- a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
> +++ b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bb
> @@ -1,7 +1,7 @@
>  include u-boot-toradex.inc
>  
> -PV = "v2015.04+git${SRCPV}"
> +PV = "v2015.04-v2.5b1+git${SRCPV}"
>  
> -SRCREV = "f9e7649338178f823e291386dde5086ad636b703"
> +SRCREV = "1ef4a29e8cea0239411dde64f9617ad76248fd02"
>  SRCBRANCH = "2015.04-toradex"
>  COMPATIBLE_MACHINE = "(vf)"
> -- 
> 2.6.2

Re: [meta-fsl-arm-extra][PATCH 1/2] u-boot-toradex: update to Toradex V2.5 Beta 2 release

[Otavio Salvador]

On Wed, Dec 9, 2015 at 4:27 AM, Stefan Agner <stefan@agner.ch> wrote:
> Is it possible to apply this two patches (along with the typo fix) also
> to the fido branch? I think they should apply cleanly...

I would prefer if you could prepare a patchset on top of fido,
backporting the changes you wish. This way we avoid any mistakes from
my side.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-arm-extra][PATCH 1/2] u-boot-toradex: update to Toradex V2.5 Beta 2 release

[Otavio Salvador]

On Fri, Dec 11, 2015 at 10:33 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Wed, Dec 9, 2015 at 4:27 AM, Stefan Agner <stefan@agner.ch> wrote:
>> Is it possible to apply this two patches (along with the typo fix) also
>> to the fido branch? I think they should apply cleanly...
>
> I would prefer if you could prepare a patchset on top of fido,
> backporting the changes you wish. This way we avoid any mistakes from
> my side.

I was expecting you to cherry-pick the need patches, not to squash them.

I ended doing this. Please double check if I did it right.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-arm-extra][PATCH 1/2] u-boot-toradex: update to Toradex V2.5 Beta 2 release

[Stefan Agner]

On 2015-12-11 09:43, Otavio Salvador wrote:
> On Fri, Dec 11, 2015 at 10:33 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> On Wed, Dec 9, 2015 at 4:27 AM, Stefan Agner <stefan@agner.ch> wrote:
>>> Is it possible to apply this two patches (along with the typo fix) also
>>> to the fido branch? I think they should apply cleanly...
>>
>> I would prefer if you could prepare a patchset on top of fido,
>> backporting the changes you wish. This way we avoid any mistakes from
>> my side.
> 
> I was expecting you to cherry-pick the need patches, not to squash them.
> 
> I ended doing this. Please double check if I did it right.

I did both, cherry pick & squash! :-) Sorry understood that wrong...

Looks good, thx!

--
Stefan