Skip to contentSkip to conversation

Pull request - fpga

U-Boot Michal Simek 2 participants 3 messages May 6, 2013 – May 10, 2013

lore
Share & tools
lore
#0 lore raw

Hi Tom and Albert,

I have created fpga branch. It is based on zynq patches(and request) I sent last week.
The reason why it is based on it is that new zynq fpga driver and changes in zynq I have done.
Just talk to each other and be aware that this fpga patchset is based on zynq one.

Thanks,
Michal

The following changes since commit 8934f7846501070a5b01c1fab5db27559e9d70d1:

i2c: zynq: Add support for Xilinx Zynq (2013-04-30 11:39:28 +0200)

are available in the git repository at:

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

for you to fetch changes up to b03b25caea1ff3a501161f5bc1ad5e5b5b124e0c:

fpga: Remove all CONFIG_SYS_* fpga related options (2013-05-06 10:41:30 +0200)

----------------------------------------------------------------
Michal Simek (9):
fpga: Clean coding style
fpga: Fix debug message compilation error
cmd: fpga: Clean coding style
cmd: fpga: Move fpga_loadbitstream to fpga.c
fpga: Change the first parameter in fpga_loadbitstream
cmd: fpga: Do not include net.h
fpga: zynq: Add support for loading bitstream
fpga: Check device name against bitstream name
fpga: Remove all CONFIG_SYS_* fpga related options

 arch/arm/cpu/armv7/zynq/slcr.c             |  35 ++++++++++++
 arch/arm/include/asm/arch-zynq/hardware.h  |  10 +++-
 arch/arm/include/asm/arch-zynq/sys_proto.h |   3 +
 board/xilinx/zynq/board.c                  |  37 ++++++++++++
 common/cmd_fpga.c                          | 254 ++++++++++++++++++++++++++-------------------------------------------------------
 drivers/fpga/Makefile                      |   1 +
 drivers/fpga/fpga.c                        | 225 +++++++++++++++++++++++++++++++++++-------------------------------------
 drivers/fpga/xilinx.c                      | 146 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/fpga/zynqpl.c                      | 355 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/altera.h                           |  17 ------
 include/configs/M54455EVB.h                |   2 +-
 include/configs/MERGERBOX.h                |   2 +-
 include/configs/MVBC_P.h                   |   2 +-
 include/configs/MVBLM7.h                   |   2 +-
 include/configs/MVSMR.h                    |   2 +-
 include/configs/omap3_mvblx.h              |   2 +-
 include/configs/zynq.h                     |   6 ++
 include/fpga.h                             |  13 +----
 include/lattice.h                          |   3 -
 include/xilinx.h                           |  25 +-------
 include/zynqpl.h                           |  59 +++++++++++++++++++
 21 files changed, 848 insertions(+), 353 deletions(-)
 create mode 100644 drivers/fpga/zynqpl.c
 create mode 100644 include/zynqpl.h
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/20130506/028c0c81/attachment.pgp>
#1 lore raw

Hi Michal,

Quoted 11 lines · Michal Simek

Hi Tom and Albert,

I have created fpga branch. It is based on zynq patches(and request) I sent last week.
The reason why it is based on it is that new zynq fpga driver and changes in zynq I have done.
Just talk to each other and be aware that this fpga patchset is based on zynq one.

Thanks,
Michal

As this is related to the Zynq series and Tom has reviewed it too, I'll pull it in the ARM tree right after I pull the Zynq patches.

Amicalement,

Signature · 1 line
Albert.
#2 lore raw
In reply to Michal Simek

Hi Michal,

Quoted 54 lines · Michal Simek

Hi Tom and Albert,

I have created fpga branch. It is based on zynq patches(and request) I sent last week.
The reason why it is based on it is that new zynq fpga driver and changes in zynq I have done.
Just talk to each other and be aware that this fpga patchset is based on zynq one.

Thanks,
Michal

The following changes since commit 8934f7846501070a5b01c1fab5db27559e9d70d1:

i2c: zynq: Add support for Xilinx Zynq (2013-04-30 11:39:28 +0200)

are available in the git repository at:

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

for you to fetch changes up to b03b25caea1ff3a501161f5bc1ad5e5b5b124e0c:

fpga: Remove all CONFIG_SYS_* fpga related options (2013-05-06 10:41:30 +0200)

----------------------------------------------------------------
Michal Simek (9):
fpga: Clean coding style
fpga: Fix debug message compilation error
cmd: fpga: Clean coding style
cmd: fpga: Move fpga_loadbitstream to fpga.c
fpga: Change the first parameter in fpga_loadbitstream
cmd: fpga: Do not include net.h
fpga: zynq: Add support for loading bitstream
fpga: Check device name against bitstream name
fpga: Remove all CONFIG_SYS_* fpga related options

 arch/arm/cpu/armv7/zynq/slcr.c             |  35 ++++++++++++
 arch/arm/include/asm/arch-zynq/hardware.h  |  10 +++-
 arch/arm/include/asm/arch-zynq/sys_proto.h |   3 +
 board/xilinx/zynq/board.c                  |  37 ++++++++++++
 common/cmd_fpga.c                          | 254 ++++++++++++++++++++++++++-------------------------------------------------------
 drivers/fpga/Makefile                      |   1 +
 drivers/fpga/fpga.c                        | 225 +++++++++++++++++++++++++++++++++++-------------------------------------
 drivers/fpga/xilinx.c                      | 146 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/fpga/zynqpl.c                      | 355 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/altera.h                           |  17 ------
 include/configs/M54455EVB.h                |   2 +-
 include/configs/MERGERBOX.h                |   2 +-
 include/configs/MVBC_P.h                   |   2 +-
 include/configs/MVBLM7.h                   |   2 +-
 include/configs/MVSMR.h                    |   2 +-
 include/configs/omap3_mvblx.h              |   2 +-
Quoted 10 lines
 include/configs/zynq.h                     |   6 ++
 include/fpga.h                             |  13 +----
 include/lattice.h                          |   3 -
 include/xilinx.h                           |  25 +-------
 include/zynqpl.h                           |  59 +++++++++++++++++++
 21 files changed, 848 insertions(+), 353 deletions(-)
 create mode 100644 drivers/fpga/zynqpl.c
 create mode 100644 include/zynqpl.h

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

Amicalement,

Signature · 1 line
Albert.