Patchwork [U-Boot] Pull request - arm/zynq

login
register
mail settings
Submitter Michal Simek
Date Nov. 6, 2013, 8:28 a.m.
Message ID <5279FDA0.6070803@monstr.eu>
Download mbox
Permalink /patch/288788/
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Pull-request

git://www.denx.de/git/u-boot-microblaze.git zynq

Comments

Michal Simek - Nov. 6, 2013, 8:28 a.m.
Hi Albert,

please pull these two patches to your arm next branch.
It depends on "zynq: Use arch_cpu_init() instead of lowlevel_init()"
(sha1: 262f08d6ea18a62f827b8ccb60f355ca2eaf6e2b) patch
which you have in your branch that's why I have rebased them
on the top.

Thanks,
Michal


The following changes since commit c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d:

  Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master' (2013-11-05 20:50:39 +0100)

are available in the git repository at:


  git://www.denx.de/git/u-boot-microblaze.git zynq

for you to fetch changes up to b5f05b063413245e3d29186739fb5db98d137dfd:

  arm: zynq : Revert TZ_DDR_RAM to secure. (2013-11-06 09:24:06 +0100)

----------------------------------------------------------------
Michal Simek (1):
      arm: zynq: Do not remap OCM to high address

Radhey Shyam Pandey (1):
      arm: zynq : Revert TZ_DDR_RAM to secure.

 arch/arm/cpu/armv7/zynq/cpu.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
Albert ARIBAUD - Nov. 7, 2013, 9:50 a.m.
Hi Michal,

On Wed, 06 Nov 2013 09:28:16 +0100, Michal Simek <monstr@monstr.eu>
wrote:

> Hi Albert,
> 
> please pull these two patches to your arm next branch.
> It depends on "zynq: Use arch_cpu_init() instead of lowlevel_init()"
> (sha1: 262f08d6ea18a62f827b8ccb60f355ca2eaf6e2b) patch
> which you have in your branch that's why I have rebased them
> on the top.
> 
> Thanks,
> Michal

Is this really for 'next' and not 'master'? IOW, do you really mean it
*not* to go into 2014.01?

Amicalement,
Michal Simek - Nov. 7, 2013, 11:55 a.m.
Hi Albert,

On 11/07/2013 10:50 AM, Albert ARIBAUD wrote:
> Hi Michal,
> 
> On Wed, 06 Nov 2013 09:28:16 +0100, Michal Simek <monstr@monstr.eu>
> wrote:
> 
>> Hi Albert,
>>
>> please pull these two patches to your arm next branch.
>> It depends on "zynq: Use arch_cpu_init() instead of lowlevel_init()"
>> (sha1: 262f08d6ea18a62f827b8ccb60f355ca2eaf6e2b) patch
>> which you have in your branch that's why I have rebased them
>> on the top.
>>
>> Thanks,
>> Michal
> 
> Is this really for 'next' and not 'master'? IOW, do you really mean it
> *not* to go into 2014.01?

Every maintainer has different strategies for branches.
But anyway, I want to add these patches/fixes to the 2014.01.

Thanks,
Michal
Albert ARIBAUD - Nov. 24, 2013, 10:35 a.m.
Hi Michal,

On Wed, 06 Nov 2013 09:28:16 +0100, Michal Simek <monstr@monstr.eu>
wrote:

> Hi Albert,
> 
> please pull these two patches to your arm next branch.
> It depends on "zynq: Use arch_cpu_init() instead of lowlevel_init()"
> (sha1: 262f08d6ea18a62f827b8ccb60f355ca2eaf6e2b) patch
> which you have in your branch that's why I have rebased them
> on the top.
> 
> Thanks,
> Michal
> 
> 
> The following changes since commit c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d:
> 
>   Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master' (2013-11-05 20:50:39 +0100)
> 
> are available in the git repository at:
> 
> 
>   git://www.denx.de/git/u-boot-microblaze.git zynq
> 
> for you to fetch changes up to b5f05b063413245e3d29186739fb5db98d137dfd:
> 
>   arm: zynq : Revert TZ_DDR_RAM to secure. (2013-11-06 09:24:06 +0100)
> 
> ----------------------------------------------------------------
> Michal Simek (1):
>       arm: zynq: Do not remap OCM to high address
> 
> Radhey Shyam Pandey (1):
>       arm: zynq : Revert TZ_DDR_RAM to secure.
> 
>  arch/arm/cpu/armv7/zynq/cpu.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 

Applied to u-boot-arm/master, thanks!

Amicalement,