Skip to contentSkip to conversation

Pull request - arm/zynq v3

U-Boot Michal Simek 2 participants 7 messages Aug 19, 2013 – Nov 24, 2013

lore
Share & tools
lore
#0 lore raw

Hi Albert,

please pull these 3 zynq patches to your arm tree.
I have rebased the tree on the 2013.07 to remove that new nds32 patches.

There is still pending the arm: lds: Remove libgcc eabi exception handling tables patch. Have you considered to also add it?

v3:
- Rebase on the v2013.07 because Albert didn't want to nds32 stuff

v2:
- Changed email address,
- There was incorrect rebase which I have fixed - correct sha1 now

Thanks.
Michal

The following changes since commit 62c175fbb8a0f9a926c88294ea9f7e88eb898f6c:

Prepare v2013.07 (2013-07-23 07:58:13 -0400)

are available in the git repository at:

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

for you to fetch changes up to 037e0d25c6ee6367beca3062759993d10759dff2:

zynq: Enable axi ethernet and emaclite driver initialization (2013-08-19 09:32:00 +0200)

----------------------------------------------------------------
Michal Simek (3):
zynq: Add new ddrc driver for ECC support
zynq: slcr: Wait 100ms till clk is properly setup
zynq: Enable axi ethernet and emaclite driver initialization

 arch/arm/cpu/armv7/zynq/Makefile           |  1 +
 arch/arm/cpu/armv7/zynq/ddrc.c             | 50 ++++++++++++++++++++++++++++++
 arch/arm/cpu/armv7/zynq/slcr.c             |  2 +-
 arch/arm/include/asm/arch-zynq/hardware.h  |  8 +++++
 arch/arm/include/asm/arch-zynq/sys_proto.h |  1 +
 board/xilinx/zynq/board.c                  | 19 ++++++++++++
 6 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/cpu/armv7/zynq/ddrc.c
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130819/514970c3/attachment.pgp>
#1 lore raw

Hi Michal,

Quoted 37 lines · Michal Simek

Hi Albert,

please pull these 3 zynq patches to your arm tree.
I have rebased the tree on the 2013.07 to remove that new nds32 patches.

There is still pending the arm: lds: Remove libgcc eabi exception handling tables patch. Have you considered to also add it?

v3:
- Rebase on the v2013.07 because Albert didn't want to nds32 stuff

v2:
- Changed email address,
- There was incorrect rebase which I have fixed - correct sha1 now

Thanks.
Michal

The following changes since commit 62c175fbb8a0f9a926c88294ea9f7e88eb898f6c:

Prepare v2013.07 (2013-07-23 07:58:13 -0400)

are available in the git repository at:

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

for you to fetch changes up to 037e0d25c6ee6367beca3062759993d10759dff2:

zynq: Enable axi ethernet and emaclite driver initialization (2013-08-19 09:32:00 +0200)

----------------------------------------------------------------
Michal Simek (3):
zynq: Add new ddrc driver for ECC support
zynq: slcr: Wait 100ms till clk is properly setup
zynq: Enable axi ethernet and emaclite driver initialization

Quoted 10 lines
 arch/arm/cpu/armv7/zynq/Makefile           |  1 +
 arch/arm/cpu/armv7/zynq/ddrc.c             | 50 ++++++++++++++++++++++++++++++
 arch/arm/cpu/armv7/zynq/slcr.c             |  2 +-
 arch/arm/include/asm/arch-zynq/hardware.h  |  8 +++++
 arch/arm/include/asm/arch-zynq/sys_proto.h |  1 +
 board/xilinx/zynq/board.c                  | 19 ++++++++++++
 6 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/cpu/armv7/zynq/ddrc.c

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

Amicalement,

Signature · 1 line
Albert.
#2 lore raw
Quoted 53 lines · Albert ARIBAUD

Hi Michal,

Quoted 37 lines · Michal Simek

Hi Albert,

please pull these 3 zynq patches to your arm tree.
I have rebased the tree on the 2013.07 to remove that new nds32 patches.

There is still pending the arm: lds: Remove libgcc eabi exception handling tables patch. Have you considered to also add it?

v3:
- Rebase on the v2013.07 because Albert didn't want to nds32 stuff

v2:
- Changed email address,
- There was incorrect rebase which I have fixed - correct sha1 now

Thanks.
Michal

The following changes since commit 62c175fbb8a0f9a926c88294ea9f7e88eb898f6c:

Prepare v2013.07 (2013-07-23 07:58:13 -0400)

are available in the git repository at:

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

for you to fetch changes up to 037e0d25c6ee6367beca3062759993d10759dff2:

zynq: Enable axi ethernet and emaclite driver initialization (2013-08-19 09:32:00 +0200)

----------------------------------------------------------------
Michal Simek (3):
zynq: Add new ddrc driver for ECC support
zynq: slcr: Wait 100ms till clk is properly setup
zynq: Enable axi ethernet and emaclite driver initialization

Quoted 10 lines
 arch/arm/cpu/armv7/zynq/Makefile           |  1 +
 arch/arm/cpu/armv7/zynq/ddrc.c             | 50 ++++++++++++++++++++++++++++++
 arch/arm/cpu/armv7/zynq/slcr.c             |  2 +-
 arch/arm/include/asm/arch-zynq/hardware.h  |  8 +++++
 arch/arm/include/asm/arch-zynq/sys_proto.h |  1 +
 board/xilinx/zynq/board.c                  | 19 ++++++++++++
 6 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/cpu/armv7/zynq/ddrc.c
Quoted 2 lines

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

Thanks.

What about this patch "arm: lds: Remove libgcc eabi exception handling tables"?

Thanks,
Michal

Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130904/dccd4edd/attachment.pgp>
#3 lore raw

[U-Boot] Pull request - arm/zynq

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(-)
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131106/483c5ecd/attachment.pgp>
#4 lore raw

[U-Boot] Pull request - arm/zynq

Hi Michal,

Quoted 10 lines · Michal Simek

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,

Signature · 1 line
Albert.
#5 lore raw

[U-Boot] Pull request - arm/zynq

Hi Albert,

Quoted 13 lines · Albert ARIBAUD

Hi Michal,

Quoted 8 lines · Michal Simek

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.

Quoted 5 lines
Quoted 2 lines

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

Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131107/7f189bff/attachment.pgp>
#6 lore raw

[U-Boot] Pull request - arm/zynq

In reply to Michal Simek

Hi Michal,

Quoted 29 lines · Michal Simek

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

Quoted 6 lines

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,

Signature · 1 line
Albert.