[U-Boot] [GIT PULL] Fpga changes - next round

Tom Rini trini at ti.com
Thu May 22 21:12:25 CEST 2014


On Tue, May 20, 2014 at 03:54:22PM +0200, Michal Simek wrote:

> Hi Tom,
> 
> here is the next round of fpga patches.
> Please pull them to your tree.
> 
> Thanks,
> Michal
> 
> 
> [u-boot]$ ./tools/buildman/buildman -b fpga zynq x600 omap3_mvblx mt_ventoux iocon grsim grsim_leon2 coreboot balloon3 astro_mcf5373l alpr MVSMR MVBLM7 MVBC_P GEN860T matrix_vision -sSed
> Summary of 8 commits for 22 boards (4 threads, 1 job per thread)
> 01: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
>       m68k: +   astro_mcf5373l
>    powerpc: +   alpr iocon
> +/mnt/disk/fpga/.bm-work/00/arch/m68k/cpu/mcf532x/cpu_init.c: In function 'cpu_init_f':
> +/mnt/disk/fpga/.bm-work/00/arch/m68k/cpu/mcf532x/cpu_init.c:211:10: warning: unused variable 'wdog' [-Wunused-variable]
> +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c: In function 'do_bootm_linux':
> +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c:53:8: warning: unused variable 'rd_len' [-Wunused-variable]
> +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c:99:12: warning: 'initrd_start' may be used uninitialized in this function [-Wuninitialized]
> +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c:99:12: warning: 'initrd_end' may be used uninitialized in this function [-Wuninitialized]
> +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c:99:12: warning: 'cmd_start' may be used uninitialized in this function [-Wuninitialized]
> +/mnt/disk/fpga/.bm-work/00/arch/m68k/lib/bootm.c:99:12: warning: 'cmd_end' may be used uninitialized in this function [-Wuninitialized]
> +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/mcf5373l.c: In function 'initdram':
> +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/mcf5373l.c:83:5: warning: pointer targets in passing argument 1 of 'get_ram_size' differ in signedness [-Wpointer-sign]
> +/mnt/disk/fpga/.bm-work/00/include/common.h:470:6: note: expected 'long int *' but argument is of type 'long unsigned int *'
> +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/fpga.c:168:2: warning: initialization from incompatible pointer type [enabled by default]
> +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/fpga.c:168:2: warning: (near initialization for 'altera_fns.write') [enabled by default]
> +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/fpga.c: In function 'astro5373l_altera_load':
> +/mnt/disk/fpga/.bm-work/00/board/astro/mcf5373l/fpga.c:196:20: warning: assignment from incompatible pointer type [enabled by default]
> +powerpc-unknown-linux-gnu-ld: section .bootpg [fffff000 -> fffff27f] overlaps section .reloc [ffffc600 -> fffff02b]
> +powerpc-unknown-linux-gnu-ld: u-boot: section .text vma 0xfffc0000 overlaps previous sections
> +powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff14b8 overlaps previous sections
> +powerpc-unknown-linux-gnu-ld: u-boot: section .reloc vma 0xffffc600 overlaps previous sections
> +powerpc-unknown-linux-gnu-ld: u-boot: section .bootpg vma 0xfffff000 overlaps previous sections
> +powerpc-unknown-linux-gnu-ld: u-boot: section .data vma 0xfffff02c overlaps previous sections
> +powerpc-unknown-linux-gnu-ld: u-boot: section .resetvec vma 0xfffffffc overlaps previous sections
> +powerpc-unknown-linux-gnu-ld: u-boot: section `.text' can't be allocated in segment 0
> +LOAD: .u_boot_list .text .rodata .reloc .bootpg .data .resetvec
> +powerpc-unknown-linux-gnu-ld: final link failed: Bad value
> +make[1]: *** [u-boot] Error 1
> +make: *** [sub-make] Error 2
> +powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff6ed0 overlaps previous sections
> +LOAD: .reloc .data .u_boot_list .text .rodata .resetvec
> 02: configs: iocom: Fix typo on CMD_FPGA command
> -powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff6ed0 overlaps previous sections
> +powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff6dac overlaps previous sections
> 03: fpga: Guard the LOADMK functionality with CMD_FPGA_LOADMK
>    powerpc: (for 6/8 boards)  all -94.7  data -5.3  text -89.3
>             MERGERBOX      :  all -568  data -32  text -536
> 04: fpga: Define bitstream type based on command selection
> -powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff14b8 overlaps previous sections
> +powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff14c0 overlaps previous sections
>    powerpc: (for 6/8 boards)  all +21.3  text +21.3
>             MVSMR          :  all +32  text +32
>             GEN860T        :  all +32  text +32
>             GEN860T_SC     :  all +32  text +32
>             MVBC_P         :  all +16  text +16
>             MVBLM7         :  all +16  text +16
>       m68k: (for 1/1 boards)  all +40.0  text +40.0
>             astro_mcf5373l :  all +40  text +40
>        arm: (for 10/10 boards)  all +33.2  bss +0.8  text +32.4
>             mt_ventoux     :  all +68  bss +32  text +36
>             zynq_microzed  :  all +64  bss +28  text +36
>             zynq_zc770_xm013:  all +36  text +36
>             zynq_zc770_xm012:  all +36  text +36
>             zynq_zc770_xm010:  all +32  bss -4  text +36
>             x600           :  all +32  text +32
>             zynq_zed       :  all +32  bss -4  text +36
>             zynq_zc70x     :  all +32  bss -4  text +36
>             omap3_mvblx    :  bss -8  text +8
>             balloon3       :  bss -32  text +32
> 05: fpga: Add support to load partial bitstreams
> -powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff14c0 overlaps previous sections
> +powerpc-unknown-linux-gnu-ld: u-boot: section .rodata vma 0xffff14c8 overlaps previous sections
>    powerpc: (for 6/8 boards)  all +5.3  text +5.3
>             MERGERBOX      :  all +16  text +16
>             GEN860T        :  all +8  text +8
>             GEN860T_SC     :  all +8  text +8
>        arm: (for 10/10 boards)  all +12.0  bss +4.0  text +8.0
>             omap3_mvblx    :  all +64  bss +56  text +8
>             zynq_zed       :  all +32  bss +24  text +8
>             zynq_zc770_xm013:  all +8  text +8
>             zynq_zc770_xm012:  all +8  text +8
>             x600           :  all +8  text +8
>             zynq_zc770_xm010:  bss -8  text +8
>             zynq_microzed  :  bss -8  text +8
>             mt_ventoux     :  bss -8  text +8
>             zynq_zc70x     :  bss -8  text +8
>             balloon3       :  bss -8  text +8
> 06: fpga: zynqpl: Clean partial bitstream handling
>        arm: (for 10/10 boards)  all -43.2  rodata -21.6  text -21.6
>             zynq_zc770_xm010:  all -72  rodata -36  text -36
>             zynq_zc770_xm013:  all -72  rodata -36  text -36
>             zynq_microzed  :  all -72  rodata -36  text -36
>             zynq_zc770_xm012:  all -72  rodata -36  text -36
>             zynq_zed       :  all -72  rodata -36  text -36
>             zynq_zc70x     :  all -72  rodata -36  text -36
> 07: zynq: Enable fpga loadp and loadbp commands
>        arm: (for 10/10 boards)  all +201.6  rodata +120.0  text +81.6
>             zynq_zc770_xm010:  all +352  bss +16  rodata +200  text +136
>             zynq_zc70x     :  all +352  bss +16  rodata +200  text +136
>             zynq_zc770_xm013:  all +336  rodata +200  text +136
>             zynq_zc770_xm012:  all +336  rodata +200  text +136
>             zynq_microzed  :  all +320  bss -16  rodata +200  text +136
>             zynq_zed       :  all +320  bss -16  rodata +200  text +136
> 08: fpga: Added support to load bit stream from SD/MMC
>    powerpc: (for 6/8 boards)  all +2.0  data +2.0
>             MVSMR          :  all +4  data +4
>             GEN860T        :  all +4  data +4
>             GEN860T_SC     :  all +4  data +4
>       m68k: (for 1/1 boards)  all +4.0  data +4.0
>             astro_mcf5373l :  all +4  data +4
>        arm: (for 10/10 boards)  all +776.0  bss -1.2  data +3.6  rodata +120.0  text +653.6
>             zynq_zc770_xm013:  all +1368  data +4  rodata +200  text +1164
>             zynq_zc770_xm012:  all +1368  data +4  rodata +200  text +1164
>             zynq_zc770_xm010:  all +1256  data +4  rodata +200  text +1052
>             zynq_microzed  :  all +1256  data +4  rodata +200  text +1052
>             zynq_zed       :  all +1256  data +4  rodata +200  text +1052
>             zynq_zc70x     :  all +1256  data +4  rodata +200  text +1052
>             x600           :  bss -4  data +4
>             mt_ventoux     :  bss -4  data +4
>             balloon3       :  bss -4  data +4
> 
> 
> 
> 
> The following changes since commit d7782d06534fe4fa47a49fa7c106de5ba85a9687:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2014-05-16 18:30:33 -0400)
> 
> are available in the git repository at:
> 
> 
>   git://www.denx.de/git/u-boot-microblaze.git fpga
> 
> for you to fetch changes up to 1a897668ac33c57ca76f47cb940ec32b405e90dd:
> 
>   fpga: Added support to load bit stream from SD/MMC (2014-05-20 15:23:46 +0200)
> 
> ----------------------------------------------------------------
> Michal Simek (5):
>       configs: iocom: Fix typo on CMD_FPGA command
>       fpga: Define bitstream type based on command selection
>       fpga: Add support to load partial bitstreams
>       fpga: zynqpl: Clean partial bitstream handling
>       zynq: Enable fpga loadp and loadbp commands
> 
> Siva Durga Prasad Paladugu (2):
>       fpga: Guard the LOADMK functionality with CMD_FPGA_LOADMK
>       fpga: Added support to load bit stream from SD/MMC
> 
>  README                                 |  13 +++++++++++++
>  board/matrix_vision/common/mv_common.c |   2 +-
>  common/cmd_fpga.c                      |  91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
>  drivers/fpga/fpga.c                    |  36 +++++++++++++++++++++++++++++++++---
>  drivers/fpga/spartan2.c                |   3 ++-
>  drivers/fpga/spartan3.c                |   3 ++-
>  drivers/fpga/virtex2.c                 |   3 ++-
>  drivers/fpga/xilinx.c                  |  26 ++++++++++++++++++++++----
>  drivers/fpga/zynqpl.c                  | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
>  include/configs/GEN860T.h              |   1 +
>  include/configs/MVBC_P.h               |   1 +
>  include/configs/MVBLM7.h               |   1 +
>  include/configs/MVSMR.h                |   1 +
>  include/configs/alpr.h                 |   1 +
>  include/configs/astro_mcf5373l.h       |   1 +
>  include/configs/balloon3.h             |   1 +
>  include/configs/coreboot.h             |   1 +
>  include/configs/grsim.h                |   1 +
>  include/configs/grsim_leon2.h          |   1 +
>  include/configs/iocon.h                |   3 ++-
>  include/configs/mt_ventoux.h           |   1 +
>  include/configs/omap3_mvblx.h          |   1 +
>  include/configs/x600.h                 |   1 +
>  include/configs/zynq-common.h          |   4 ++++
>  include/fpga.h                         |  20 ++++++++++++++++++--
>  include/xilinx.h                       |   8 ++++++--
>  26 files changed, 297 insertions(+), 33 deletions(-)

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140522/25f6ff0b/attachment.pgp>


More information about the U-Boot mailing list