[U-Boot] [GIT PULL] Zynq patches v2
Albert ARIBAUD
albert.u.boot at aribaud.net
Sat May 24 10:38:51 CEST 2014
Hi Michal,
On Tue, 20 May 2014 15:21:55 +0200, Michal Simek <monstr at monstr.eu>
wrote:
> Hi Albert,
>
> based on your pull request to Tom here
> http://lists.denx.de/pipermail/u-boot/2014-May/179841.html
> and our IRC last week I am sending updated pull request
> where I have added 5 more patches from Masahiro which
> are bug fixes.
> Please pull them to your tree when you do merge with Tom's tree.
>
> Thanks,
> Michal
>
> [u-boot]$ ./tools/buildman/buildman -b zynq zynq -sSed
> Summary of 26 commits for 6 boards (4 threads, 1 job per thread)
> 01: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
> 02: ARM: zynq: Fix sparse warnings in slcr.c
> 03: ARM: zynq: Fix sparse warning in ddrc.c
> 04: ARM: zynq: Remove sparse warnings
> arm: (for 6/6 boards) data -168.0 rodata +168.0
> zynq_zc770_xm010: data -168 rodata +168
> zynq_zc770_xm013: data -168 rodata +168
> zynq_zc770_xm012: data -168 rodata +168
> zynq_zed : data -168 rodata +168
> zynq_zc70x : data -168 rodata +168
> zynq_microzed : data -168 rodata +168
> 05: ARM: zynq: Added efuse status register base address
> 06: ARM: zynq: Do not use half memory size for ECC case
> arm: (for 6/6 boards) all -32.0 text -32.0
> zynq_zc770_xm010: all -32 text -32
> zynq_zc770_xm013: all -32 text -32
> zynq_zc770_xm012: all -32 text -32
> zynq_zed : all -32 text -32
> zynq_zc70x : all -32 text -32
> zynq_microzed : all -32 text -32
> 07: ARM: zynq: Call zynq board_init() in SPL
> arm: (for 6/6 boards) spl/u-boot-spl:all +16.0 spl/u-boot-spl:text +16.0
> zynq_zc770_xm010: spl/u-boot-spl:all +16 spl/u-boot-spl:text +16
> zynq_zc770_xm013: spl/u-boot-spl:all +16 spl/u-boot-spl:text +16
> zynq_zc770_xm012: spl/u-boot-spl:all +16 spl/u-boot-spl:text +16
> zynq_zed : spl/u-boot-spl:all +16 spl/u-boot-spl:text +16
> zynq_zc70x : spl/u-boot-spl:all +16 spl/u-boot-spl:text +16
> zynq_microzed : spl/u-boot-spl:all +16 spl/u-boot-spl:text +16
> 08: ARM: zynq: slcr: Fix incorrect commentary
> 09: ARM: zynq: Setup correct slcr_lock value
> arm: (for 6/6 boards) all +102.0 bss +2.7 data +4.0 spl/u-boot-spl:all +72.0 spl/u-boot-spl:data +4.0 spl/u-boot-spl:text +68.0 text +95.3
> zynq_zc770_xm010: all +112 bss +12 data +4 spl/u-boot-spl:all +72 spl/u-boot-spl:data +4 spl/u-boot-spl:text +68 text +96
> zynq_zed : all +112 bss +12 data +4 spl/u-boot-spl:all +72 spl/u-boot-spl:data +4 spl/u-boot-spl:text +68 text +96
> zynq_microzed : all +112 bss +12 data +4 spl/u-boot-spl:all +72 spl/u-boot-spl:data +4 spl/u-boot-spl:text +68 text +96
> zynq_zc770_xm013: all +100 data +4 spl/u-boot-spl:all +72 spl/u-boot-spl:data +4 spl/u-boot-spl:text +68 text +96
> zynq_zc770_xm012: all +96 data +4 spl/u-boot-spl:all +72 spl/u-boot-spl:data +4 spl/u-boot-spl:text +68 text +92
> zynq_zc70x : all +80 bss -20 data +4 spl/u-boot-spl:all +72 spl/u-boot-spl:data +4 spl/u-boot-spl:text +68 text +96
> 10: ARM: zynq: Fix bootmode mask
> 11: ARM: zynq: Fix building SPL without FPGA support
> 12: ARM: zynq: Extend kernel image size to 60MB
> 13: ARM: zynq: Add MIO detection code
> 14: ARM: zynq: ehci: Added USB host driver support
> arm: (for 6/6 boards) all +9.3 bss -0.7 rodata +10.0 spl/u-boot-spl:all +10.0 spl/u-boot-spl:rodata +10.0
> zynq_zc70x : all +34 bss +24 rodata +10 spl/u-boot-spl:all +10 spl/u-boot-spl:rodata +10
> zynq_zc770_xm013: all +10 rodata +10 spl/u-boot-spl:all +10 spl/u-boot-spl:rodata +10
> zynq_zc770_xm012: all +10 rodata +10 spl/u-boot-spl:all +10 spl/u-boot-spl:rodata +10
> zynq_zc770_xm010: all +2 bss -8 rodata +10 spl/u-boot-spl:all +10 spl/u-boot-spl:rodata +10
> zynq_microzed : all +2 bss -8 rodata +10 spl/u-boot-spl:all +10 spl/u-boot-spl:rodata +10
> zynq_zed : all -2 bss -12 rodata +10 spl/u-boot-spl:all +10 spl/u-boot-spl:rodata +10
> 15: ARM: zynq: Added USB host support for zynq boards
> arm: (for 6/6 boards) all +36453.7 bss +26203.3 data +38.7 rodata +2047.7 spl/u-boot-spl:all +1.3 spl/u-boot-spl:rodata +1.3 text +8164.0
> zynq_zed : all +109121 bss +78632 data +116 rodata +5881 spl/u-boot-spl:all +4 spl/u-boot-spl:rodata +4 text +24492
> zynq_zc70x : all +109085 bss +78596 data +116 rodata +5881 spl/u-boot-spl:all +4 spl/u-boot-spl:rodata +4 text +24492
> zynq_zc770_xm013: all +131 rodata +131
> zynq_zc770_xm012: all +131 rodata +131
> zynq_zc770_xm010: all +127 bss -4 rodata +131
> zynq_microzed : all +127 bss -4 rodata +131
> 16: ARM: zynq: Enable the FAT write capability
> arm: (for 6/6 boards) all +4133.3 bss -2.0 data +18.7 rodata +386.0 text +3730.7
> zynq_microzed : all +6223 bss +20 data +28 rodata +579 text +5596
> zynq_zc70x : all +6195 bss -8 data +28 rodata +579 text +5596
> zynq_zc770_xm010: all +6191 bss -12 data +28 rodata +579 text +5596
> zynq_zed : all +6191 bss -12 data +28 rodata +579 text +5596
> 17: ARM: zynq: Move USB/SD/MMC common FAT configs
> 18: ARM: zynq: Enable EXT4 configs
> arm: (for 6/6 boards) all +14302.0 bss +562.0 data +74.7 rodata +1142.7 text +12522.7
> zynq_zc770_xm010: all +21462 bss +852 data +112 rodata +1714 text +18784
> zynq_zed : all +21462 bss +852 data +112 rodata +1714 text +18784
> zynq_zc70x : all +21458 bss +848 data +112 rodata +1714 text +18784
> zynq_microzed : all +21430 bss +820 data +112 rodata +1714 text +18784
> 19: ARM: zynq: Extend maximum number of command arguments
> 20: zynq: add empty xil_io.h to avoid compile error
> 21: zynq: treat ps7_init.c/h as external files to ignore them
> arm: (for 6/6 boards) spl/u-boot-spl:all -83.0 spl/u-boot-spl:rodata -75.0 spl/u-boot-spl:text -8.0
> zynq_zc770_xm010: spl/u-boot-spl:all -83 spl/u-boot-spl:rodata -75 spl/u-boot-spl:text -8
> zynq_zc770_xm013: spl/u-boot-spl:all -83 spl/u-boot-spl:rodata -75 spl/u-boot-spl:text -8
> zynq_zc770_xm012: spl/u-boot-spl:all -83 spl/u-boot-spl:rodata -75 spl/u-boot-spl:text -8
> zynq_zed : spl/u-boot-spl:all -83 spl/u-boot-spl:rodata -75 spl/u-boot-spl:text -8
> zynq_zc70x : spl/u-boot-spl:all -83 spl/u-boot-spl:rodata -75 spl/u-boot-spl:text -8
> zynq_microzed : spl/u-boot-spl:all -83 spl/u-boot-spl:rodata -75 spl/u-boot-spl:text -8
> 22: build: support a new image u-boot-dtb.img
> 23: zynq: load u-boot-dtb.img if CONFIG_OF_SEPARATE is defined
> arm: (for 6/6 boards) spl/u-boot-spl:all +2.7 spl/u-boot-spl:rodata +2.7
> zynq_zc770_xm010: spl/u-boot-spl:all +4 spl/u-boot-spl:rodata +4
> zynq_zed : spl/u-boot-spl:all +4 spl/u-boot-spl:rodata +4
> zynq_zc70x : spl/u-boot-spl:all +4 spl/u-boot-spl:rodata +4
> zynq_microzed : spl/u-boot-spl:all +4 spl/u-boot-spl:rodata +4
> 24: zynq: import zynq-7000.dtsi from Linux Kernel
> 25: zynq: add memory nodes to device tree to initialize DRAM with OF
> 26: zynq: add UART nodes to device tree to initialize UART with OF
>
>
>
>
> The following changes since commit 27b4e4b9913f65b52d20485dff3f8800bf78f3d7:
>
> Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze (2014-05-13 07:34:08 -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 9f9d41bad16efe0674257b4efe4db1a399f93643:
>
> zynq: add UART nodes to device tree to initialize UART with OF (2014-05-15 13:57:31 +0200)
>
> ----------------------------------------------------------------
> Masahiro Yamada (7):
> zynq: add empty xil_io.h to avoid compile error
> zynq: treat ps7_init.c/h as external files to ignore them
> build: support a new image u-boot-dtb.img
> zynq: load u-boot-dtb.img if CONFIG_OF_SEPARATE is defined
> zynq: import zynq-7000.dtsi from Linux Kernel
> zynq: add memory nodes to device tree to initialize DRAM with OF
> zynq: add UART nodes to device tree to initialize UART with OF
>
> Michal Simek (12):
> ARM: zynq: Fix sparse warnings in slcr.c
> ARM: zynq: Fix sparse warning in ddrc.c
> ARM: zynq: Remove sparse warnings
> ARM: zynq: Do not use half memory size for ECC case
> ARM: zynq: Call zynq board_init() in SPL
> ARM: zynq: slcr: Fix incorrect commentary
> ARM: zynq: Setup correct slcr_lock value
> ARM: zynq: Fix building SPL without FPGA support
> ARM: zynq: Extend kernel image size to 60MB
> ARM: zynq: Add MIO detection code
> ARM: zynq: ehci: Added USB host driver support
> ARM: zynq: Extend maximum number of command arguments
>
> Mike Looijmans (1):
> ARM: zynq: Fix bootmode mask
>
> Siva Durga Prasad Paladugu (5):
> ARM: zynq: Added efuse status register base address
> ARM: zynq: Added USB host support for zynq boards
> ARM: zynq: Enable the FAT write capability
> ARM: zynq: Move USB/SD/MMC common FAT configs
> ARM: zynq: Enable EXT4 configs
>
> Makefile | 8 ++++++++
> arch/arm/cpu/armv7/zynq/cpu.c | 13 +++++++++++++
> arch/arm/cpu/armv7/zynq/ddrc.c | 5 +----
> arch/arm/cpu/armv7/zynq/slcr.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
> arch/arm/cpu/armv7/zynq/spl.c | 15 +++++++++++++++
> arch/arm/dts/zynq-7000.dtsi | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> arch/arm/dts/zynq-microzed.dts | 9 +++++++++
> arch/arm/dts/zynq-zc702.dts | 9 +++++++++
> arch/arm/dts/zynq-zc706.dts | 9 +++++++++
> arch/arm/dts/zynq-zc770-xm010.dts | 9 +++++++++
> arch/arm/dts/zynq-zc770-xm012.dts | 9 +++++++++
> arch/arm/dts/zynq-zc770-xm013.dts | 9 +++++++++
> arch/arm/dts/zynq-zed.dts | 9 +++++++++
> arch/arm/include/asm/arch-zynq/hardware.h | 13 ++++++++++++-
> arch/arm/include/asm/arch-zynq/sys_proto.h | 2 ++
> board/xilinx/zynq/.gitignore | 1 +
> board/xilinx/zynq/Makefile | 5 ++++-
> board/xilinx/zynq/board.c | 25 ++++++++++++++----------
> board/xilinx/zynq/ps7_init.c | 12 ------------
> board/xilinx/zynq/xil_io.h | 13 +++++++++++++
> drivers/usb/host/Makefile | 1 +
> drivers/usb/host/ehci-zynq.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> include/configs/zynq-common.h | 52 ++++++++++++++++++++++++++++++++++++++------------
> include/configs/zynq_zc70x.h | 1 +
> include/configs/zynq_zed.h | 1 +
> 25 files changed, 571 insertions(+), 44 deletions(-)
> create mode 100644 board/xilinx/zynq/.gitignore
> delete mode 100644 board/xilinx/zynq/ps7_init.c
> create mode 100644 board/xilinx/zynq/xil_io.h
> create mode 100644 drivers/usb/host/ehci-zynq.c
>
>
Applied to u-boot-arm/master, thanks!
Amicalement,
--
Albert.
More information about the U-Boot
mailing list