[U-Boot] [GIT PULL] fpga changes
Hi Tom, [cc: Albert]
please pull these fpga changes to your tree. On Friday I have sent the next set of fpga changes which we have in our tree but I want to give more time to review them.
And also I have based Xilinx ARM Zynq changes based on these patches that's why I would like to add these patches to your tree and then talk to Albert regarding zynq changes.
Thanks, Michal
The following changes since commit 52fded7b94d98c73a824e4a9d90596a33a1cbb8a:
Merge branch 'next' of git://git.denx.de/u-boot-sh (2014-05-02 11:48:07 -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 eeaf3aa5d3ac84015e0999ec437198682d1a776d:
fpga: zynq: Use helper function zynq_validate_bitstream (2014-05-06 14:22:16 +0200)
---------------------------------------------------------------- Michal Simek (7): fpga: spartan2: Avoid CamelCase fpga: spartan3: Avoid CamelCase fpga: virtex2: Avoid CamelCase fpga: xilinx: Avoid CamelCase for in Xilinx_desc fpga: xilinx: Fix the rest of CamelCases fpga: xilinx: Simplify load/dump/info function handling fpga: zynq: Remove sparse warnings
Siva Durga Prasad Paladugu (2): fpga: zynq: Use helper functions for zynq dma fpga: zynq: Use helper function zynq_validate_bitstream
board/armadeus/apf27/fpga.c | 6 +-- board/astro/mcf5373l/fpga.c | 6 +-- board/balloon3/balloon3.c | 4 +- board/esd/pmc440/fpga.c | 8 +-- board/gen860t/fpga.c | 6 +-- board/matrix_vision/mvsmr/fpga.c | 6 +-- board/spear/x600/fpga.c | 4 +- board/teejet/mt_ventoux/mt_ventoux.c | 4 +- board/xilinx/zynq/board.c | 14 +++--- drivers/fpga/spartan2.c | 46 +++++++++-------- drivers/fpga/spartan3.c | 46 +++++++++-------- drivers/fpga/virtex2.c | 40 ++++++++------- drivers/fpga/xilinx.c | 179 +++++++----------------------------------------------------------- drivers/fpga/zynqpl.c | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------- include/spartan2.h | 72 +++++++++++++-------------- include/spartan3.h | 84 +++++++++++++++---------------- include/virtex2.h | 66 ++++++++++++------------ include/xilinx.h | 65 +++++++++++++----------- include/zynqpl.h | 16 +++--- 19 files changed, 416 insertions(+), 490 deletions(-)
On Tue, May 06, 2014 at 02:28:15PM +0200, Michal Simek wrote:
Hi Tom, [cc: Albert]
please pull these fpga changes to your tree. On Friday I have sent the next set of fpga changes which we have in our tree but I want to give more time to review them.
And also I have based Xilinx ARM Zynq changes based on these patches that's why I would like to add these patches to your tree and then talk to Albert regarding zynq changes.
Thanks, Michal
The following changes since commit 52fded7b94d98c73a824e4a9d90596a33a1cbb8a:
Merge branch 'next' of git://git.denx.de/u-boot-sh (2014-05-02 11:48:07 -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 eeaf3aa5d3ac84015e0999ec437198682d1a776d:
fpga: zynq: Use helper function zynq_validate_bitstream (2014-05-06 14:22:16 +0200)
Michal Simek (7): fpga: spartan2: Avoid CamelCase fpga: spartan3: Avoid CamelCase fpga: virtex2: Avoid CamelCase fpga: xilinx: Avoid CamelCase for in Xilinx_desc fpga: xilinx: Fix the rest of CamelCases fpga: xilinx: Simplify load/dump/info function handling fpga: zynq: Remove sparse warnings
Siva Durga Prasad Paladugu (2): fpga: zynq: Use helper functions for zynq dma fpga: zynq: Use helper function zynq_validate_bitstream
board/armadeus/apf27/fpga.c | 6 +-- board/astro/mcf5373l/fpga.c | 6 +-- board/balloon3/balloon3.c | 4 +- board/esd/pmc440/fpga.c | 8 +-- board/gen860t/fpga.c | 6 +-- board/matrix_vision/mvsmr/fpga.c | 6 +-- board/spear/x600/fpga.c | 4 +- board/teejet/mt_ventoux/mt_ventoux.c | 4 +- board/xilinx/zynq/board.c | 14 +++--- drivers/fpga/spartan2.c | 46 +++++++++-------- drivers/fpga/spartan3.c | 46 +++++++++-------- drivers/fpga/virtex2.c | 40 ++++++++------- drivers/fpga/xilinx.c | 179 +++++++----------------------------------------------------------- drivers/fpga/zynqpl.c | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------- include/spartan2.h | 72 +++++++++++++-------------- include/spartan3.h | 84 +++++++++++++++---------------- include/virtex2.h | 66 ++++++++++++------------ include/xilinx.h | 65 +++++++++++++----------- include/zynqpl.h | 16 +++--- 19 files changed, 416 insertions(+), 490 deletions(-)
This introduces: board/spear/x600/fpga.c:177:2: warning: initialization from incompatible pointer type [enabled by default] board/spear/x600/fpga.c:177:2: warning: (near initialization for ‘fpga[0].name’) [enabled by default]
Please fix and re-submit, thanks!
Hi Tom, [cc: Albert]
please pull these fpga changes to your tree. I have run buildman to ensure that there are no new compilation warnings. As you see from log below there are some warnings for m68k and astro board but they are there before my first commit.
When this is in the tree I will send pull request to Albert to get our Zynq changes to ARM tree.
Thanks, Michal
[u-boot]$ ./tools/buildman/buildman -b fpga apf27 zynq spear astro balloon3 pmc440 gen860t mvsmr mt_ventoux -sSed Summary of 10 commits for 35 boards (4 threads, 1 job per thread) 01: kbuild: Fix trailing whitespaces m68k: + astro_mcf5373l +/mnt/disk/fpga/.bm-work/01/arch/m68k/cpu/mcf532x/cpu_init.c: In function 'cpu_init_f': +/mnt/disk/fpga/.bm-work/01/arch/m68k/cpu/mcf532x/cpu_init.c:211:10: warning: unused variable 'wdog' [-Wunused-variable] +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c: In function 'do_bootm_linux': +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c:53:8: warning: unused variable 'rd_len' [-Wunused-variable] +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c:99:12: warning: 'initrd_start' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c:99:12: warning: 'initrd_end' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c:99:12: warning: 'cmd_start' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c:99:12: warning: 'cmd_end' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/01/board/astro/mcf5373l/mcf5373l.c: In function 'initdram': +/mnt/disk/fpga/.bm-work/01/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/01/include/common.h:470:6: note: expected 'long int *' but argument is of type 'long unsigned int *' +/mnt/disk/fpga/.bm-work/01/board/astro/mcf5373l/fpga.c:168:2: warning: initialization from incompatible pointer type [enabled by default] +/mnt/disk/fpga/.bm-work/01/board/astro/mcf5373l/fpga.c:168:2: warning: (near initialization for 'altera_fns.write') [enabled by default] +/mnt/disk/fpga/.bm-work/01/board/astro/mcf5373l/fpga.c: In function 'astro5373l_altera_load': +/mnt/disk/fpga/.bm-work/01/board/astro/mcf5373l/fpga.c:196:20: warning: assignment from incompatible pointer type [enabled by default] 02: fpga: spartan2: Avoid CamelCase 03: fpga: spartan3: Avoid CamelCase 04: fpga: virtex2: Avoid CamelCase 05: fpga: xilinx: Avoid CamelCase for in Xilinx_desc 06: fpga: xilinx: Fix the rest of CamelCases 07: fpga: xilinx: Simplify load/dump/info function handling arm: (for 30/30 boards) all -191.0 bss -1.7 data +9.3 rodata -54.9 text -143.7 zynq_zed : all -489 bss +24 data +36 rodata -153 text -396 zynq_zc770_xm013: all -509 bss +4 data +36 rodata -153 text -396 zynq_zc770_xm012: all -509 bss +4 data +36 rodata -153 text -396 zynq_zc70x : all -517 bss -4 data +36 rodata -153 text -396 zynq_zc770_xm010: all -521 bss -8 data +36 rodata -153 text -396 zynq_microzed : all -521 bss -8 data +36 rodata -153 text -396 x600 : all -646 bss +4 data +16 rodata -182 text -484 apf27 : all -650 data +16 rodata -182 text -484 mt_ventoux : all -654 bss -4 data +16 rodata -182 text -484 balloon3 : all -714 bss -64 data +16 rodata -182 text -484 m68k: (for 1/1 boards) all -389.0 data -24.0 rodata -149.0 text -216.0 astro_mcf5373l : all -389 data -24 rodata -149 text -216 powerpc: (for 4/4 boards) all -431.0 data +10.0 rodata -133.0 text -308.0 PMC440 : all -364 data +40 rodata -148 text -256 MVSMR : all -448 text -448 GEN860T : all -456 rodata -192 text -264 GEN860T_SC : all -456 rodata -192 text -264 08: fpga: zynq: Remove sparse warnings 09: fpga: zynq: Use helper functions for zynq dma arm: (for 30/30 boards) all +22.2 rodata +11.8 text +10.4 zynq_zc770_xm010: all +119 bss +8 rodata +59 text +52 zynq_microzed : all +119 bss +8 rodata +59 text +52 zynq_zc70x : all +119 bss +8 rodata +59 text +52 zynq_zc770_xm013: all +111 rodata +59 text +52 zynq_zc770_xm012: all +111 rodata +59 text +52 zynq_zed : all +87 bss -24 rodata +59 text +52 10: fpga: zynq: Use helper function zynq_validate_bitstream arm: (for 30/30 boards) all +6.4 rodata +4.8 text +1.6 zynq_zc770_xm010: all +40 bss +8 rodata +24 text +8 zynq_microzed : all +40 bss +8 rodata +24 text +8 zynq_zed : all +40 bss +8 rodata +24 text +8 zynq_zc770_xm013: all +32 rodata +24 text +8 zynq_zc770_xm012: all +32 rodata +24 text +8 zynq_zc70x : all +8 bss -24 rodata +24 text +8
The following changes since commit 69c0d323e325f48f3124fb0696de3d68fcbcae8e:
kbuild: Fix trailing whitespaces (2014-05-12 16:31:51 -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 31081859855e606ca06131c3a14e099e043d39f0:
fpga: zynq: Use helper function zynq_validate_bitstream (2014-05-13 09:14:05 +0200)
---------------------------------------------------------------- Michal Simek (7): fpga: spartan2: Avoid CamelCase fpga: spartan3: Avoid CamelCase fpga: virtex2: Avoid CamelCase fpga: xilinx: Avoid CamelCase for in Xilinx_desc fpga: xilinx: Fix the rest of CamelCases fpga: xilinx: Simplify load/dump/info function handling fpga: zynq: Remove sparse warnings
Siva Durga Prasad Paladugu (2): fpga: zynq: Use helper functions for zynq dma fpga: zynq: Use helper function zynq_validate_bitstream
board/armadeus/apf27/fpga.c | 7 +++--- board/astro/mcf5373l/fpga.c | 47 +++++++++++++++++++------------------ board/balloon3/balloon3.c | 4 ++-- board/esd/pmc440/fpga.c | 8 +++---- board/gen860t/fpga.c | 6 ++--- board/matrix_vision/mvsmr/fpga.c | 6 ++--- board/spear/x600/fpga.c | 4 ++-- board/teejet/mt_ventoux/mt_ventoux.c | 4 ++-- board/xilinx/zynq/board.c | 14 +++++------ drivers/fpga/spartan2.c | 46 ++++++++++++++++++++---------------- drivers/fpga/spartan3.c | 46 ++++++++++++++++++++---------------- drivers/fpga/virtex2.c | 40 ++++++++++++++++++-------------- drivers/fpga/xilinx.c | 179 ++++++++++++++------------------------------------------------------------------------------------------------------------------------------ drivers/fpga/zynqpl.c | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- include/spartan2.h | 72 ++++++++++++++++++++++++++++----------------------------- include/spartan3.h | 84 +++++++++++++++++++++++++++++++++--------------------------------- include/virtex2.h | 66 +++++++++++++++++++++++++--------------------------- include/xilinx.h | 65 ++++++++++++++++++++++++++++----------------------- include/zynqpl.h | 16 ++++++------- 19 files changed, 438 insertions(+), 510 deletions(-)
On Tue, May 13, 2014 at 09:48:07AM +0200, Michal Simek wrote:
Hi Tom, [cc: Albert]
please pull these fpga changes to your tree. I have run buildman to ensure that there are no new compilation warnings. As you see from log below there are some warnings for m68k and astro board but they are there before my first commit.
When this is in the tree I will send pull request to Albert to get our Zynq changes to ARM tree.
Thanks, Michal
[u-boot]$ ./tools/buildman/buildman -b fpga apf27 zynq spear astro balloon3 pmc440 gen860t mvsmr mt_ventoux -sSed Summary of 10 commits for 35 boards (4 threads, 1 job per thread) 01: kbuild: Fix trailing whitespaces m68k: + astro_mcf5373l +/mnt/disk/fpga/.bm-work/01/arch/m68k/cpu/mcf532x/cpu_init.c: In function 'cpu_init_f': +/mnt/disk/fpga/.bm-work/01/arch/m68k/cpu/mcf532x/cpu_init.c:211:10: warning: unused variable 'wdog' [-Wunused-variable] +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c: In function 'do_bootm_linux': +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c:53:8: warning: unused variable 'rd_len' [-Wunused-variable] +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c:99:12: warning: 'initrd_start' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c:99:12: warning: 'initrd_end' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c:99:12: warning: 'cmd_start' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/01/arch/m68k/lib/bootm.c:99:12: warning: 'cmd_end' may be used uninitialized in this function [-Wuninitialized] +/mnt/disk/fpga/.bm-work/01/board/astro/mcf5373l/mcf5373l.c: In function 'initdram': +/mnt/disk/fpga/.bm-work/01/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/01/include/common.h:470:6: note: expected 'long int *' but argument is of type 'long unsigned int *' +/mnt/disk/fpga/.bm-work/01/board/astro/mcf5373l/fpga.c:168:2: warning: initialization from incompatible pointer type [enabled by default] +/mnt/disk/fpga/.bm-work/01/board/astro/mcf5373l/fpga.c:168:2: warning: (near initialization for 'altera_fns.write') [enabled by default] +/mnt/disk/fpga/.bm-work/01/board/astro/mcf5373l/fpga.c: In function 'astro5373l_altera_load': +/mnt/disk/fpga/.bm-work/01/board/astro/mcf5373l/fpga.c:196:20: warning: assignment from incompatible pointer type [enabled by default] 02: fpga: spartan2: Avoid CamelCase 03: fpga: spartan3: Avoid CamelCase 04: fpga: virtex2: Avoid CamelCase 05: fpga: xilinx: Avoid CamelCase for in Xilinx_desc 06: fpga: xilinx: Fix the rest of CamelCases 07: fpga: xilinx: Simplify load/dump/info function handling arm: (for 30/30 boards) all -191.0 bss -1.7 data +9.3 rodata -54.9 text -143.7 zynq_zed : all -489 bss +24 data +36 rodata -153 text -396 zynq_zc770_xm013: all -509 bss +4 data +36 rodata -153 text -396 zynq_zc770_xm012: all -509 bss +4 data +36 rodata -153 text -396 zynq_zc70x : all -517 bss -4 data +36 rodata -153 text -396 zynq_zc770_xm010: all -521 bss -8 data +36 rodata -153 text -396 zynq_microzed : all -521 bss -8 data +36 rodata -153 text -396 x600 : all -646 bss +4 data +16 rodata -182 text -484 apf27 : all -650 data +16 rodata -182 text -484 mt_ventoux : all -654 bss -4 data +16 rodata -182 text -484 balloon3 : all -714 bss -64 data +16 rodata -182 text -484 m68k: (for 1/1 boards) all -389.0 data -24.0 rodata -149.0 text -216.0 astro_mcf5373l : all -389 data -24 rodata -149 text -216 powerpc: (for 4/4 boards) all -431.0 data +10.0 rodata -133.0 text -308.0 PMC440 : all -364 data +40 rodata -148 text -256 MVSMR : all -448 text -448 GEN860T : all -456 rodata -192 text -264 GEN860T_SC : all -456 rodata -192 text -264 08: fpga: zynq: Remove sparse warnings 09: fpga: zynq: Use helper functions for zynq dma arm: (for 30/30 boards) all +22.2 rodata +11.8 text +10.4 zynq_zc770_xm010: all +119 bss +8 rodata +59 text +52 zynq_microzed : all +119 bss +8 rodata +59 text +52 zynq_zc70x : all +119 bss +8 rodata +59 text +52 zynq_zc770_xm013: all +111 rodata +59 text +52 zynq_zc770_xm012: all +111 rodata +59 text +52 zynq_zed : all +87 bss -24 rodata +59 text +52 10: fpga: zynq: Use helper function zynq_validate_bitstream arm: (for 30/30 boards) all +6.4 rodata +4.8 text +1.6 zynq_zc770_xm010: all +40 bss +8 rodata +24 text +8 zynq_microzed : all +40 bss +8 rodata +24 text +8 zynq_zed : all +40 bss +8 rodata +24 text +8 zynq_zc770_xm013: all +32 rodata +24 text +8 zynq_zc770_xm012: all +32 rodata +24 text +8 zynq_zc70x : all +8 bss -24 rodata +24 text +8
The following changes since commit 69c0d323e325f48f3124fb0696de3d68fcbcae8e:
kbuild: Fix trailing whitespaces (2014-05-12 16:31:51 -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 31081859855e606ca06131c3a14e099e043d39f0:
fpga: zynq: Use helper function zynq_validate_bitstream (2014-05-13 09:14:05 +0200)
Michal Simek (7): fpga: spartan2: Avoid CamelCase fpga: spartan3: Avoid CamelCase fpga: virtex2: Avoid CamelCase fpga: xilinx: Avoid CamelCase for in Xilinx_desc fpga: xilinx: Fix the rest of CamelCases fpga: xilinx: Simplify load/dump/info function handling fpga: zynq: Remove sparse warnings
Siva Durga Prasad Paladugu (2): fpga: zynq: Use helper functions for zynq dma fpga: zynq: Use helper function zynq_validate_bitstream
board/armadeus/apf27/fpga.c | 7 +++--- board/astro/mcf5373l/fpga.c | 47 +++++++++++++++++++------------------ board/balloon3/balloon3.c | 4 ++-- board/esd/pmc440/fpga.c | 8 +++---- board/gen860t/fpga.c | 6 ++--- board/matrix_vision/mvsmr/fpga.c | 6 ++--- board/spear/x600/fpga.c | 4 ++-- board/teejet/mt_ventoux/mt_ventoux.c | 4 ++-- board/xilinx/zynq/board.c | 14 +++++------ drivers/fpga/spartan2.c | 46 ++++++++++++++++++++---------------- drivers/fpga/spartan3.c | 46 ++++++++++++++++++++---------------- drivers/fpga/virtex2.c | 40 ++++++++++++++++++-------------- drivers/fpga/xilinx.c | 179 ++++++++++++++------------------------------------------------------------------------------------------------------------------------------ drivers/fpga/zynqpl.c | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- include/spartan2.h | 72 ++++++++++++++++++++++++++++----------------------------- include/spartan3.h | 84 +++++++++++++++++++++++++++++++++--------------------------------- include/virtex2.h | 66 +++++++++++++++++++++++++--------------------------- include/xilinx.h | 65 ++++++++++++++++++++++++++++----------------------- include/zynqpl.h | 16 ++++++------- 19 files changed, 438 insertions(+), 510 deletions(-)
Applied to u-boot/master, thanks!
participants (2)
-
Michal Simek -
Tom Rini