Skip to contentSkip to conversation

Pull request - microblaze

U-Boot Michal Simek 2 participants 5 messages Nov 9, 2012 – Feb 4, 2013

lore
Share & tools
lore
#0 lore raw

Hi Tom,

please add these 5 patches to u-boot.
Currently microblaze can't be compiled and this patch "microblaze: Remove asm/bitops.h from asm/posix_types.h" fixed it.

Thanks,
Michal

The following changes since commit 1cc619be8b73abbee2fd6faf2cd4ade27b516531:
Tom Rini (1):
Merge branch 'master' of git://git.denx.de/u-boot-avr32

are available in the git repository at:

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

Michal Simek (5):
microblaze: Fix compilation warning in ext2_find_next_zero_bit
microblaze: Fix byteorder for microblaze
microblaze: Flush caches before enabling them
microblaze: Remove asm/bitops.h from asm/posix_types.h
microblaze: Fix compilation failure because of missing libdts

  arch/microblaze/cpu/cache.c               |    5 -----
  arch/microblaze/cpu/start.S               |    6 ++++++
  arch/microblaze/cpu/u-boot.lds            |    2 ++
  arch/microblaze/include/asm/bitops.h      |    3 ++-
  arch/microblaze/include/asm/byteorder.h   |   23 -----------------------
  arch/microblaze/include/asm/posix_types.h |    3 ---
  arch/microblaze/lib/bootm.c               |    5 -----
  include/configs/microblaze-generic.h      |    4 ++++
  8 files changed, 14 insertions(+), 37 deletions(-)
Signature · 4 lines
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
#1 lore raw
Quoted 26 lines · Michal Simek

Hi Tom,

please add these 5 patches to u-boot.
Currently microblaze can't be compiled and this patch "microblaze: Remove asm/bitops.h from asm/posix_types.h" fixed it.

Thanks,
Michal

The following changes since commit 1cc619be8b73abbee2fd6faf2cd4ade27b516531:
Tom Rini (1):
Merge branch 'master' of git://git.denx.de/u-boot-avr32

are available in the git repository at:

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

Michal Simek (5):
microblaze: Fix compilation warning in ext2_find_next_zero_bit
microblaze: Fix byteorder for microblaze
microblaze: Flush caches before enabling them
microblaze: Remove asm/bitops.h from asm/posix_types.h
microblaze: Fix compilation failure because of missing libdts

Quoted 9 lines
 arch/microblaze/cpu/cache.c               |    5 -----
 arch/microblaze/cpu/start.S               |    6 ++++++
 arch/microblaze/cpu/u-boot.lds            |    2 ++
 arch/microblaze/include/asm/bitops.h      |    3 ++-
 arch/microblaze/include/asm/byteorder.h   |   23 -----------------------
 arch/microblaze/include/asm/posix_types.h |    3 ---
 arch/microblaze/lib/bootm.c               |    5 -----
 include/configs/microblaze-generic.h      |    4 ++++
 8 files changed, 14 insertions(+), 37 deletions(-)

Applied to u-boot/master, thanks!

Signature · 8 lines
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/20121109/abf46990/attachment.pgp>
#2 lore raw
In reply to Michal Simek

Hi Tom,

please pull all these changes to your tree.
The major change is remove really ancient i2c driver + helper files for this driver.

Thanks,
Michal

The following changes since commit 6ad77d88e57f6ab815ec7e85c5ac329054318c73:
Marek Vasut (1):
vfat: Fix mkcksum argument sizes

are available in the git repository at:

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

Alexey Brodkin (1):
block: systemace: Added missing "else" in "ace_writew"

David Holsgrove (1):
microblaze: Add muldi3.c which contains routines for _muldi3

Jason Wu (1):
spi: xilinx_spi: Perform software reset during slave setup

Michal Simek (5):
common: cmd_bdinfo: Fix bdinfo to show all MACs for Microblaze and ARM
board: xilinx: Remove unused ancient i2c driver
board: xilinx: Remove common folder
common: cmd_bdinfo: Fix compilation warning for microblaze
microblaze: Remove FSL support from generic board

  arch/microblaze/lib/Makefile                       |    1 +
  arch/microblaze/lib/muldi3.c                       |   91 ++
  board/xilinx/common/xbasic_types.c                 |  165 ---
  board/xilinx/common/xbasic_types.h                 |  283 -----
  board/xilinx/common/xbuf_descriptor.h              |  252 ----
  board/xilinx/common/xdma_channel.c                 |  738 -----------
  board/xilinx/common/xdma_channel.h                 |  291 -----
  board/xilinx/common/xdma_channel_i.h               |  110 --
  board/xilinx/common/xdma_channel_sg.c              | 1317 --------------------
  board/xilinx/common/xio.h                          |   81 --
  board/xilinx/common/xipif_v1_23_b.c                |  331 -----
  board/xilinx/common/xipif_v1_23_b.h                |  746 -----------
  board/xilinx/common/xpacket_fifo_v1_00_b.c         |  448 -------
  board/xilinx/common/xpacket_fifo_v1_00_b.h         |  306 -----
  board/xilinx/common/xstatus.h                      |  347 -----
  board/xilinx/common/xversion.c                     |  350 ------
  board/xilinx/common/xversion.h                     |   97 --
  .../xilinx/microblaze-generic/microblaze-generic.c |   20 -
  board/xilinx/xilinx_iic/xiic_l.c                   |  484 -------
  board/xilinx/xilinx_iic/xiic_l.h                   |  150 ---
  board/xilinx/zynq/Makefile                         |    3 -
  common/cmd_bdinfo.c                                |   27 +-
  drivers/block/systemace.c                          |    4 +-
  drivers/spi/xilinx_spi.c                           |    2 +
  drivers/spi/xilinx_spi.h                           |    3 +
  include/configs/microblaze-generic.h               |    4 -
  26 files changed, 121 insertions(+), 6530 deletions(-)

create mode 100644 arch/microblaze/lib/muldi3.c delete mode 100644 board/xilinx/common/xbasic_types.c delete mode 100644 board/xilinx/common/xbasic_types.h delete mode 100644 board/xilinx/common/xbuf_descriptor.h delete mode 100644 board/xilinx/common/xdma_channel.c delete mode 100644 board/xilinx/common/xdma_channel.h delete mode 100644 board/xilinx/common/xdma_channel_i.h delete mode 100644 board/xilinx/common/xdma_channel_sg.c delete mode 100644 board/xilinx/common/xio.h
delete mode 100644 board/xilinx/common/xipif_v1_23_b.c delete mode 100644 board/xilinx/common/xipif_v1_23_b.h delete mode 100644 board/xilinx/common/xpacket_fifo_v1_00_b.c delete mode 100644 board/xilinx/common/xpacket_fifo_v1_00_b.h delete mode 100644 board/xilinx/common/xstatus.h delete mode 100644 board/xilinx/common/xversion.c delete mode 100644 board/xilinx/common/xversion.h delete mode 100644 board/xilinx/xilinx_iic/xiic_l.c delete mode 100644 board/xilinx/xilinx_iic/xiic_l.h

Signature · 4 lines
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
#3 lore raw
Quoted 71 lines · Michal Simek

Hi Tom,

please pull all these changes to your tree.
The major change is remove really ancient i2c driver + helper files for this driver.

Thanks,
Michal

The following changes since commit 6ad77d88e57f6ab815ec7e85c5ac329054318c73:
Marek Vasut (1):
vfat: Fix mkcksum argument sizes

are available in the git repository at:

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

Alexey Brodkin (1):
block: systemace: Added missing "else" in "ace_writew"

David Holsgrove (1):
microblaze: Add muldi3.c which contains routines for _muldi3

Jason Wu (1):
spi: xilinx_spi: Perform software reset during slave setup

Michal Simek (5):
common: cmd_bdinfo: Fix bdinfo to show all MACs for Microblaze and ARM
board: xilinx: Remove unused ancient i2c driver
board: xilinx: Remove common folder
common: cmd_bdinfo: Fix compilation warning for microblaze
microblaze: Remove FSL support from generic board

 arch/microblaze/lib/Makefile                       |    1 +
 arch/microblaze/lib/muldi3.c                       |   91 ++
 board/xilinx/common/xbasic_types.c                 |  165 ---
 board/xilinx/common/xbasic_types.h                 |  283 -----
 board/xilinx/common/xbuf_descriptor.h              |  252 ----
 board/xilinx/common/xdma_channel.c                 |  738 -----------
 board/xilinx/common/xdma_channel.h                 |  291 -----
 board/xilinx/common/xdma_channel_i.h               |  110 --
 board/xilinx/common/xdma_channel_sg.c              | 1317 --------------------
 board/xilinx/common/xio.h                          |   81 --
 board/xilinx/common/xipif_v1_23_b.c                |  331 -----
 board/xilinx/common/xipif_v1_23_b.h                |  746 -----------
 board/xilinx/common/xpacket_fifo_v1_00_b.c         |  448 -------
 board/xilinx/common/xpacket_fifo_v1_00_b.h         |  306 -----
 board/xilinx/common/xstatus.h                      |  347 -----
 board/xilinx/common/xversion.c                     |  350 ------
 board/xilinx/common/xversion.h                     |   97 --
 .../xilinx/microblaze-generic/microblaze-generic.c |   20 -
 board/xilinx/xilinx_iic/xiic_l.c                   |  484 -------
 board/xilinx/xilinx_iic/xiic_l.h                   |  150 ---
 board/xilinx/zynq/Makefile                         |    3 -
 common/cmd_bdinfo.c                                |   27 +-
 drivers/block/systemace.c                          |    4 +-
 drivers/spi/xilinx_spi.c                           |    2 +
 drivers/spi/xilinx_spi.h                           |    3 +
 include/configs/microblaze-generic.h               |    4 -
 26 files changed, 121 insertions(+), 6530 deletions(-)
 create mode 100644 arch/microblaze/lib/muldi3.c
 delete mode 100644 board/xilinx/common/xbasic_types.c
 delete mode 100644 board/xilinx/common/xbasic_types.h
 delete mode 100644 board/xilinx/common/xbuf_descriptor.h
 delete mode 100644 board/xilinx/common/xdma_channel.c
 delete mode 100644 board/xilinx/common/xdma_channel.h
 delete mode 100644 board/xilinx/common/xdma_channel_i.h
 delete mode 100644 board/xilinx/common/xdma_channel_sg.c
 delete mode 100644 board/xilinx/common/xio.h
 delete mode 100644 board/xilinx/common/xipif_v1_23_b.c
Quoted 8 lines
 delete mode 100644 board/xilinx/common/xipif_v1_23_b.h
 delete mode 100644 board/xilinx/common/xpacket_fifo_v1_00_b.c
 delete mode 100644 board/xilinx/common/xpacket_fifo_v1_00_b.h
 delete mode 100644 board/xilinx/common/xstatus.h
 delete mode 100644 board/xilinx/common/xversion.c
 delete mode 100644 board/xilinx/common/xversion.h
 delete mode 100644 board/xilinx/xilinx_iic/xiic_l.c
 delete mode 100644 board/xilinx/xilinx_iic/xiic_l.h

Applied to u-boot/master and sorry about the delay!

Signature · 8 lines
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/20130204/26a250ed/attachment.pgp>
#4 lore raw

2013/2/4 Tom Rini <[email protected]>:

Quoted 82 lines · Michal Simek
Quoted 72 lines

Hi Tom,

please pull all these changes to your tree.
The major change is remove really ancient i2c driver + helper files for this driver.

Thanks,
Michal

The following changes since commit 6ad77d88e57f6ab815ec7e85c5ac329054318c73:
Marek Vasut (1):
vfat: Fix mkcksum argument sizes

are available in the git repository at:

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

Alexey Brodkin (1):
block: systemace: Added missing "else" in "ace_writew"

David Holsgrove (1):
microblaze: Add muldi3.c which contains routines for _muldi3

Jason Wu (1):
spi: xilinx_spi: Perform software reset during slave setup

Michal Simek (5):
common: cmd_bdinfo: Fix bdinfo to show all MACs for Microblaze and ARM
board: xilinx: Remove unused ancient i2c driver
board: xilinx: Remove common folder
common: cmd_bdinfo: Fix compilation warning for microblaze
microblaze: Remove FSL support from generic board

 arch/microblaze/lib/Makefile                       |    1 +
 arch/microblaze/lib/muldi3.c                       |   91 ++
 board/xilinx/common/xbasic_types.c                 |  165 ---
 board/xilinx/common/xbasic_types.h                 |  283 -----
 board/xilinx/common/xbuf_descriptor.h              |  252 ----
 board/xilinx/common/xdma_channel.c                 |  738 -----------
 board/xilinx/common/xdma_channel.h                 |  291 -----
 board/xilinx/common/xdma_channel_i.h               |  110 --
 board/xilinx/common/xdma_channel_sg.c              | 1317 --------------------
 board/xilinx/common/xio.h                          |   81 --
 board/xilinx/common/xipif_v1_23_b.c                |  331 -----
 board/xilinx/common/xipif_v1_23_b.h                |  746 -----------
 board/xilinx/common/xpacket_fifo_v1_00_b.c         |  448 -------
 board/xilinx/common/xpacket_fifo_v1_00_b.h         |  306 -----
 board/xilinx/common/xstatus.h                      |  347 -----
 board/xilinx/common/xversion.c                     |  350 ------
 board/xilinx/common/xversion.h                     |   97 --
 .../xilinx/microblaze-generic/microblaze-generic.c |   20 -
 board/xilinx/xilinx_iic/xiic_l.c                   |  484 -------
 board/xilinx/xilinx_iic/xiic_l.h                   |  150 ---
 board/xilinx/zynq/Makefile                         |    3 -
 common/cmd_bdinfo.c                                |   27 +-
 drivers/block/systemace.c                          |    4 +-
 drivers/spi/xilinx_spi.c                           |    2 +
 drivers/spi/xilinx_spi.h                           |    3 +
 include/configs/microblaze-generic.h               |    4 -
 26 files changed, 121 insertions(+), 6530 deletions(-)
 create mode 100644 arch/microblaze/lib/muldi3.c
 delete mode 100644 board/xilinx/common/xbasic_types.c
 delete mode 100644 board/xilinx/common/xbasic_types.h
 delete mode 100644 board/xilinx/common/xbuf_descriptor.h
 delete mode 100644 board/xilinx/common/xdma_channel.c
 delete mode 100644 board/xilinx/common/xdma_channel.h
 delete mode 100644 board/xilinx/common/xdma_channel_i.h
 delete mode 100644 board/xilinx/common/xdma_channel_sg.c
 delete mode 100644 board/xilinx/common/xio.h
 delete mode 100644 board/xilinx/common/xipif_v1_23_b.c
Quoted 8 lines
 delete mode 100644 board/xilinx/common/xipif_v1_23_b.h
 delete mode 100644 board/xilinx/common/xpacket_fifo_v1_00_b.c
 delete mode 100644 board/xilinx/common/xpacket_fifo_v1_00_b.h
 delete mode 100644 board/xilinx/common/xstatus.h
 delete mode 100644 board/xilinx/common/xversion.c
 delete mode 100644 board/xilinx/common/xversion.h
 delete mode 100644 board/xilinx/xilinx_iic/xiic_l.c
 delete mode 100644 board/xilinx/xilinx_iic/xiic_l.h
Quoted 1 line

Applied to u-boot/master and sorry about the delay!

You are not delayed.

Thanks,
Michal

Signature · 5 lines
Michal Simek, Ing. (M.Eng)
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