[U-Boot] Pull request - microblaze

[U-Boot] Pull request - microblaze

[Michal Simek]

Dear Wolfgang Denk,

please pull the following changes.

Thanks,
Michal


The following changes since commit 99ffccbd3e5b7bc715e2eed6ea6d36f4020b56d8:
   Diana CRACIUN (1):
         Flush cache after the OS image is loaded into the memory.

are available in the git repository at:

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

Michal Simek (25):
       net: emaclite: Change driver name and add address
       net: emaclite: Remove deviceid property
       net: emaclite: Use calloc instead of malloc
       net: emaclite: Remove baseaddress from xemaclite
       net: emaclite: Use dynamic allocation
       net: emaclite: Setup RX/TX ping pong for every instance
       net: emaclite: Move RX/TX ping pong initialization to board
       net: emaclite: Use helper function for io accesses
       net: emaclite: Fix coding style
       net: emaclite: Use unsigned long for baseaddr
       net: emaclite: Use PKTSIZE directly
       microblaze: Fix in/out_be8/16/32 functions
       microblaze: Support CTRL+C when tftp is running
       microblaze: Support flashes on lower addresses
       microblaze: Initialize jumptable and console
       microblaze: Fix unaligned.h for endians
       microblaze: Copy bootfile from variables
       microblaze: Remove debug saving value
       microblaze: Setup MB vectors if feature is enable for u-boot
       microblaze: Save and restore first unused vector
       microblaze: Clean up reset asm code
       microblaze: Do not select NFS for platforms without ethernet
       microblaze: Remove address offset for uart16550
       microblaze: Fix no return statement from microblaze-generic board
       microblaze: Enable FDT/FIT support

  arch/microblaze/cpu/start.S                        |   66 ++---
  arch/microblaze/include/asm/io.h                   |   33 ++-
  arch/microblaze/include/asm/unaligned.h            |   17 +--
  arch/microblaze/lib/board.c                        |   17 ++
  .../xilinx/microblaze-generic/microblaze-generic.c |   18 +-
  drivers/net/xilinx_emaclite.c                      |  285 +++++++++++---------
  include/configs/microblaze-generic.h               |    9 +-
  include/netdev.h                                   |    3 +-
  8 files changed, 251 insertions(+), 197 deletions(-)


-- 
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

[U-Boot] Pull request - microblaze

[Wolfgang Denk]

Dear Michal Simek,

In message <4E675918.60104@monstr.eu> you wrote:
> Dear Wolfgang Denk,
> 
> please pull the following changes.
> 
> Thanks,
> Michal
> 
> 
> The following changes since commit 99ffccbd3e5b7bc715e2eed6ea6d36f4020b56d8:
>    Diana CRACIUN (1):
>          Flush cache after the OS image is loaded into the memory.
> 
> are available in the git repository at:
> 
>    git://www.denx.de/git/u-boot-microblaze.git master
> 
> Michal Simek (25):
>        net: emaclite: Change driver name and add address
>        net: emaclite: Remove deviceid property
>        net: emaclite: Use calloc instead of malloc
>        net: emaclite: Remove baseaddress from xemaclite
>        net: emaclite: Use dynamic allocation
>        net: emaclite: Setup RX/TX ping pong for every instance
>        net: emaclite: Move RX/TX ping pong initialization to board
>        net: emaclite: Use helper function for io accesses

It appears this patch has never been posted on the mailing list?

>        net: emaclite: Fix coding style

Ditto.

>        net: emaclite: Use unsigned long for baseaddr

Ditto.

>        net: emaclite: Use PKTSIZE directly

Ditto.


NAK.  I will not pull any patches that have not been reviewed.

NOT pulled.

Please never try this again.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The ultimate barrier is one's viewpoint.
                        - Terry Pratchett, _The Dark Side of the Sun_

[U-Boot] Pull request - microblaze

[Michal Simek]

Dear Wolfgang Denk,

please pull the following changes.
All patches were check by checkpatch script and were sent to mailing list.

I am going to send separate pull request for emaclite changes because it is driver.

Thanks,
Michal



The following changes since commit 2984fd1673fd76de0182c9626c3d66ea2e0486e7:
   Marek Vasut (1):
         GCC4.6: Squash warning in cmd_ubi.c:

are available in the git repository at:

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

Marek Vasut (1):
       GCC4.6: Squash warning in lzo1x_decompress.c

Michal Simek (7):
       microblaze: Remove debug saving value
       microblaze: Setup MB vectors if feature is enable for u-boot
       microblaze: Save and restore first unused vector
       microblaze: Clean up reset asm code
       microblaze: Do not select NFS for platforms without ethernet
       microblaze: Remove address offset for uart16550
       microblaze: Enable FDT/FIT support

  arch/microblaze/cpu/start.S          |   67 ++++++++++++++++------------------
  include/configs/microblaze-generic.h |    9 ++++-
  lib/lzo/lzo1x_decompress.c           |    3 +-
  3 files changed, 40 insertions(+), 39 deletions(-)

-- 
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

[U-Boot] Pull request - microblaze

[Michal Simek]

Dear Wolfgang Denk,

Michal Simek wrote:
> Dear Wolfgang Denk,
> 
> please pull the following changes.
> All patches were check by checkpatch script and were sent to mailing list.
> 
> I am going to send separate pull request for emaclite changes because it 
> is driver.

Please ignore this one - there is one Marek mainline patch. :-(
Will resend new pull request without it.

Thanks,
Michal

-- 
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

[U-Boot] Pull request v2 - microblaze

[Michal Simek]

Dear Wolfgang Denk,

please pull the following changes.
All patches were check by checkpatch script and were sent to mailing list.

v2: Removed Marek's mainline patch from pull request - no repository change.

Thanks,
Michal

The following changes since commit 7b8ffea2ac44097ed1c99ba70b8c6a4cf12ba0b4:
   Marek Vasut (1):
         GCC4.6: Squash warning in lzo1x_decompress.c

are available in the git repository at:

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

Michal Simek (7):
       microblaze: Remove debug saving value
       microblaze: Setup MB vectors if feature is enable for u-boot
       microblaze: Save and restore first unused vector
       microblaze: Clean up reset asm code
       microblaze: Do not select NFS for platforms without ethernet
       microblaze: Remove address offset for uart16550
       microblaze: Enable FDT/FIT support

  arch/microblaze/cpu/start.S          |   67 ++++++++++++++++------------------
  include/configs/microblaze-generic.h |    9 ++++-
  2 files changed, 39 insertions(+), 37 deletions(-)


-- 
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

[U-Boot] Pull request v2 - microblaze

[Wolfgang Denk]

Dear Michal Simek,

In message <4E896313.1020508@monstr.eu> you wrote:
> Dear Wolfgang Denk,
> 
> please pull the following changes.
> All patches were check by checkpatch script and were sent to mailing list.
> 
> v2: Removed Marek's mainline patch from pull request - no repository change.
> 
> Thanks,
> Michal
> 
> The following changes since commit 7b8ffea2ac44097ed1c99ba70b8c6a4cf12ba0b4:
>    Marek Vasut (1):
>          GCC4.6: Squash warning in lzo1x_decompress.c
> 
> are available in the git repository at:
> 
>    git://www.denx.de/git/u-boot-microblaze.git master
> 
> Michal Simek (7):
>        microblaze: Remove debug saving value
>        microblaze: Setup MB vectors if feature is enable for u-boot
>        microblaze: Save and restore first unused vector
>        microblaze: Clean up reset asm code
>        microblaze: Do not select NFS for platforms without ethernet
>        microblaze: Remove address offset for uart16550
>        microblaze: Enable FDT/FIT support
> 
>   arch/microblaze/cpu/start.S          |   67 ++++++++++++++++------------------
>   include/configs/microblaze-generic.h |    9 ++++-
>   2 files changed, 39 insertions(+), 37 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Often it is fatal to live too long.                          - Racine

[U-Boot] Pull request - microblaze

[Michal Simek]

Dear Wolfgang Denk,

please pull the following changes to your tree.

Thanks,
Michal


The following changes since commit 0841ca90f22d73b0ea4642ef1ce33d879bb2f3ff:
   Wolfgang Denk (1):
         arm920t/s3c24x0/usb_ohci.c: fix warning: variable ... set but not used

are available in the git repository at:

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

Michal Simek (5):
       microblaze: Call common console_init_f initialization function
       microblaze: Support flashes on lower addresses
       microblaze: Initialize jumptable and console
       microblaze: Fix unaligned.h for endians
       microblaze: Copy bootfile from variables

  arch/microblaze/include/asm/processor.h |   32 ++++++++++++++++++++++++++++++-
  arch/microblaze/include/asm/unaligned.h |   17 +---------------
  arch/microblaze/lib/board.c             |   16 +++++++++++++++
  3 files changed, 48 insertions(+), 17 deletions(-)


-- 
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

[U-Boot] Pull request - microblaze

[Wolfgang Denk]

Dear Michal Simek,

In message <4E929A07.5080405@monstr.eu> you wrote:
> Dear Wolfgang Denk,
> 
> please pull the following changes to your tree.
> 
> Thanks,
> Michal
> 
> 
> The following changes since commit 0841ca90f22d73b0ea4642ef1ce33d879bb2f3ff:
>    Wolfgang Denk (1):
>          arm920t/s3c24x0/usb_ohci.c: fix warning: variable ... set but not used
> 
> are available in the git repository at:
> 
>    git://www.denx.de/git/u-boot-microblaze.git master
> 
> Michal Simek (5):
>        microblaze: Call common console_init_f initialization function
>        microblaze: Support flashes on lower addresses
>        microblaze: Initialize jumptable and console
>        microblaze: Fix unaligned.h for endians
>        microblaze: Copy bootfile from variables
> 
>   arch/microblaze/include/asm/processor.h |   32 ++++++++++++++++++++++++++++++-
>   arch/microblaze/include/asm/unaligned.h |   17 +---------------
>   arch/microblaze/lib/board.c             |   16 +++++++++++++++
>   3 files changed, 48 insertions(+), 17 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
[War] is instinctive. But the instinct can  be  fought.  We're  human
beings  with the blood of a million savage years on our hands! But we
can stop it. We can admit that we're killers ... but we're not  going
to  kill  today. That's all it takes! Knowing that we're not going to
kill today!
	-- Kirk, "A Taste of Armageddon", stardate 3193.0

[U-Boot] Pull request - microblaze

[Michal Simek]

Dear Wolfgang Denk,

please pull these two patches to your tree.

Thanks,
Michal


The following changes since commit 4962e38e9a4a053792722918bb11c5408549aebd:
   Stefano Babic (1):
         mkimage: adding support for Davinci AIS image

are available in the git repository at:

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

Michal Simek (2):
       microblaze: Wire up axi_ethernet driver initialization
       microblaze: Fix strict-aliasing rules for in_be32

  arch/microblaze/include/asm/io.h                   |    2 +-
  .../xilinx/microblaze-generic/microblaze-generic.c |    6 ++++++
  include/configs/microblaze-generic.h               |    4 ++++
  3 files changed, 11 insertions(+), 1 deletions(-)


-- 
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

[U-Boot] Pull request - microblaze

[Wolfgang Denk]

Dear Michal Simek,

In message <4EA4FF1A.2020904@monstr.eu> you wrote:
> Dear Wolfgang Denk,
> 
> please pull these two patches to your tree.
> 
> Thanks,
> Michal
> 
> 
> The following changes since commit 4962e38e9a4a053792722918bb11c5408549aebd:
>    Stefano Babic (1):
>          mkimage: adding support for Davinci AIS image
> 
> are available in the git repository at:
> 
>    git://www.denx.de/git/u-boot-microblaze.git master
> 
> Michal Simek (2):
>        microblaze: Wire up axi_ethernet driver initialization
>        microblaze: Fix strict-aliasing rules for in_be32
> 
>   arch/microblaze/include/asm/io.h                   |    2 +-
>   .../xilinx/microblaze-generic/microblaze-generic.c |    6 ++++++
>   include/configs/microblaze-generic.h               |    4 ++++
>   3 files changed, 11 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Anything that is worth doing at all is worth doing well.
                                       -- Philip Earl of Chesterfield

[U-Boot] Pull request - microblaze

[Michal Simek]

Dear Wolfgang,

please pull the following changes.
Especially the first patch is important because it fixes build error.

Thanks,
Michal


The following changes since commit 2acca35ce4604dcef933f07d90aa9c9c930e1049:
   Wolfgang Denk (1):
         Merge branch 'master' of git://git.denx.de/u-boot-mmc

are available in the git repository at:

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

Stephan Linz (3):
       microblaze: fix build failure due to undefined reference to `get_ticks'
       microblaze: avoid interrupt race conditions
       microblaze: Enable TFTP put command

  arch/microblaze/cpu/interrupts.c     |    4 ++--
  arch/microblaze/cpu/timer.c          |   18 ++++++++++++++++++
  include/configs/microblaze-generic.h |    1 +
  3 files changed, 21 insertions(+), 2 deletions(-)

-- 
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

[U-Boot] Pull request - microblaze

[Wolfgang Denk]

Dear Michal Simek,

In message <4F46224C.8010507@monstr.eu> you wrote:
> Dear Wolfgang,
> 
> please pull the following changes.
> Especially the first patch is important because it fixes build error.
> 
> Thanks,
> Michal
> 
> 
> The following changes since commit 2acca35ce4604dcef933f07d90aa9c9c930e1049:
>    Wolfgang Denk (1):
>          Merge branch 'master' of git://git.denx.de/u-boot-mmc
> 
> are available in the git repository at:
> 
>    git://www.denx.de/git/u-boot-microblaze.git master
> 
> Stephan Linz (3):
>        microblaze: fix build failure due to undefined reference to `get_ticks'
>        microblaze: avoid interrupt race conditions
>        microblaze: Enable TFTP put command
> 
>   arch/microblaze/cpu/interrupts.c     |    4 ++--
>   arch/microblaze/cpu/timer.c          |   18 ++++++++++++++++++
>   include/configs/microblaze-generic.h |    1 +
>   3 files changed, 21 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"...all the  good  computer  designs  are  bootlegged;  the  formally
planned  products,  if  they  are built at all, are dogs!" - David E.
Lundstrom, "A Few Good Men From Univac", MIT Press, 1987

[U-Boot] Pull request - microblaze

[Michal Simek]

Dear Wolfgang Denk,

Please pull this one patch when merge window is open.

Thanks,
Michal


The following changes since commit 7cb30b13f12077c7eec8ce2419cd96cd65ace8e2:
   Wolfgang Denk (1):
         Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

are available in the git repository at:

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

Stephan Linz (1):
       microblaze: Enable phylib and mii support

  include/configs/microblaze-generic.h |   21 +++++++++++++++++++++
  1 files changed, 21 insertions(+), 0 deletions(-)

-- 
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

[U-Boot] Pull request - microblaze

[Wolfgang Denk]

Dear Michal Simek,

In message <4F71B03A.8050204@monstr.eu> you wrote:
> Dear Wolfgang Denk,
> 
> Please pull this one patch when merge window is open.
> 
> Thanks,
> Michal
> 
> 
> The following changes since commit 7cb30b13f12077c7eec8ce2419cd96cd65ace8e2:
>    Wolfgang Denk (1):
>          Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
> 
> are available in the git repository at:
> 
>    git://www.denx.de/git/u-boot-microblaze.git master
> 
> Stephan Linz (1):
>        microblaze: Enable phylib and mii support
> 
>   include/configs/microblaze-generic.h |   21 +++++++++++++++++++++
>   1 files changed, 21 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Where there's no emotion, there's no motive for violence.
	-- Spock, "Dagger of the Mind", stardate 2715.1

[U-Boot] Pull request - microblaze

[Michal Simek]

Dear Wolfgang Denk,

Please pull these patches to your repository. There will be one simple merge conflict
around SPI makefile which is easy to resolve.

dts/ patch is acked by Simon

Thanks,
Michal


The following changes since commit 436da3cd233e7166b5ce9293dbd28092cf37bcc9:
   u-boot at lakedaemon.net (1):
         ext2load: increase read speed

are available in the git repository at:

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

Michal Simek (6):
       microblaze: Add gpio.h
       microblaze: Move individual board linker scripts to common script in cpu tree.
       microblaze: Remove extern from board.c
       microblaze: Move __udelay implementation
       microblaze: Call serial multi initialization
       microblaze: intc: Clear interrupt code

Stephan Linz (9):
       microblaze: Remove wrong define CONFIG_SYS_FLASH_PROTECTION
       microblaze: Avoid compile error on systems without cfi flash
       microblaze: Enable ubi support
       microblaze: Expand and correct configuration comments
       microblaze: Add missing undefs for UBI and UBIFS
       fdt: Add board specific dts inclusion
       microblaze: Wire up dts configuration
       spi: microblaze: Adds driver for Xilinx SPI controller
       microblaze: Wire up SPI driver

  arch/microblaze/config.mk                          |    2 +
  arch/microblaze/cpu/interrupts.c                   |   88 +++++----
  arch/microblaze/cpu/start.S                        |    2 -
  arch/microblaze/cpu/timer.c                        |   21 ++-
  .../microblaze/cpu}/u-boot.lds                     |    0
  arch/microblaze/include/asm/gpio.h                 |   41 ++++
  arch/microblaze/include/asm/microblaze_intc.h      |    3 +
  arch/microblaze/lib/Makefile                       |    1 -
  arch/microblaze/lib/board.c                        |   15 +-
  arch/microblaze/lib/time.c                         |   42 ----
  board/xilinx/dts/microblaze.dts                    |    1 +
  board/xilinx/microblaze-generic/dts/microblaze.dts |    7 +
  drivers/spi/Makefile                               |    1 +
  drivers/spi/xilinx_spi.c                           |  214 ++++++++++++++++++++
  drivers/spi/xilinx_spi.h                           |  135 ++++++++++++
  dts/Makefile                                       |    3 +-
  include/configs/microblaze-generic.h               |  129 ++++++++++--
  17 files changed, 594 insertions(+), 111 deletions(-)
  rename {board/xilinx/microblaze-generic => arch/microblaze/cpu}/u-boot.lds (100%)
  create mode 100644 arch/microblaze/include/asm/gpio.h
  create mode 100644 board/xilinx/dts/microblaze.dts
  create mode 100644 board/xilinx/microblaze-generic/dts/microblaze.dts
  create mode 100644 drivers/spi/xilinx_spi.c
  create mode 100644 drivers/spi/xilinx_spi.h

-- 
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

[U-Boot] Pull request - microblaze

[Wolfgang Denk]

Dear Michal Simek,

In message <50176CA2.6000303@monstr.eu> you wrote:
> 
> Please pull these patches to your repository. There will be one simple merge conflict
> around SPI makefile which is easy to resolve.

Maybe it's easy for you - to me it was extra effort.  And I don;t even
know if I did it right.  Please validate!

Next time please fix such issues yourself, and send clean, working
pull requests.  Thanks.

>    u-boot at lakedaemon.net (1):
>          ext2load: increase read speed
> 
> are available in the git repository at:
> 
>    git://www.denx.de/git/u-boot-microblaze.git master
> 
> Michal Simek (6):
>        microblaze: Add gpio.h
>        microblaze: Move individual board linker scripts to common script in cpu tree.
>        microblaze: Remove extern from board.c
>        microblaze: Move __udelay implementation
>        microblaze: Call serial multi initialization
>        microblaze: intc: Clear interrupt code
> 
> Stephan Linz (9):
>        microblaze: Remove wrong define CONFIG_SYS_FLASH_PROTECTION
>        microblaze: Avoid compile error on systems without cfi flash
>        microblaze: Enable ubi support
>        microblaze: Expand and correct configuration comments
>        microblaze: Add missing undefs for UBI and UBIFS
>        fdt: Add board specific dts inclusion
>        microblaze: Wire up dts configuration
>        spi: microblaze: Adds driver for Xilinx SPI controller
>        microblaze: Wire up SPI driver
> 
>   arch/microblaze/config.mk                          |    2 +
>   arch/microblaze/cpu/interrupts.c                   |   88 +++++----
>   arch/microblaze/cpu/start.S                        |    2 -
>   arch/microblaze/cpu/timer.c                        |   21 ++-
>   .../microblaze/cpu}/u-boot.lds                     |    0
>   arch/microblaze/include/asm/gpio.h                 |   41 ++++
>   arch/microblaze/include/asm/microblaze_intc.h      |    3 +
>   arch/microblaze/lib/Makefile                       |    1 -
>   arch/microblaze/lib/board.c                        |   15 +-
>   arch/microblaze/lib/time.c                         |   42 ----
>   board/xilinx/dts/microblaze.dts                    |    1 +
>   board/xilinx/microblaze-generic/dts/microblaze.dts |    7 +
>   drivers/spi/Makefile                               |    1 +
>   drivers/spi/xilinx_spi.c                           |  214 ++++++++++++++++++++
>   drivers/spi/xilinx_spi.h                           |  135 ++++++++++++
>   dts/Makefile                                       |    3 +-
>   include/configs/microblaze-generic.h               |  129 ++++++++++--
>   17 files changed, 594 insertions(+), 111 deletions(-)
>   rename {board/xilinx/microblaze-generic => arch/microblaze/cpu}/u-boot.lds (100%)
>   create mode 100644 arch/microblaze/include/asm/gpio.h
>   create mode 100644 board/xilinx/dts/microblaze.dts
>   create mode 100644 board/xilinx/microblaze-generic/dts/microblaze.dts
>   create mode 100644 drivers/spi/xilinx_spi.c
>   create mode 100644 drivers/spi/xilinx_spi.h

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Conceptual integrity in turn dictates that the  design  must  proceed
from  one  mind,  or  from  a  very small number of agreeing resonant
minds.               - Frederick Brooks Jr., "The Mythical Man Month" 

[U-Boot] Pull request - microblaze

[Michal Simek]

Dear Wolfgang Denk,

On 07/31/2012 10:07 PM, Wolfgang Denk wrote:
> Dear Michal Simek,
>
> In message <50176CA2.6000303@monstr.eu> you wrote:
>>
>> Please pull these patches to your repository. There will be one simple merge conflict
>> around SPI makefile which is easy to resolve.
>
> Maybe it's easy for you - to me it was extra effort.  And I don;t even
> know if I did it right.  Please validate!

I have looked at it and there is one additional line. Will send patch to fix it.

>
> Next time please fix such issues yourself, and send clean, working
> pull requests.  Thanks.

ok. Will do it next time.

Thanks,
Michal



-- 
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

[U-Boot] Pull request - microblaze

[Michal Simek]

Dear Wolfgang,

please pull the following changes to your tree.

Thanks,
Michal


The following changes since commit a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721:
   Wolfgang Denk (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 (10):
       block: systemace: Simplify base and width initialization
       serial: Support serial multi for Microblaze
       serial: uartlite: Init all uartlites for serial multi
       microblaze: Add support for device tree driven board configuration
       microblaze: board: Remove compilation warning
       microblaze: intc: Registering interrupt should return value
       microblaze: intc: Coding style cleanup
       microblaze: timer: Prepare for device-tree initialization
       microblaze: Clean microblaze initialization
       microblaze: board: Use bi_flashstart instead of CONFIG_SYS_FLASH_BASE

Stephan Linz (1):
       spi: xilinx: Remove unused variable

  arch/microblaze/config.mk                          |    2 +
  arch/microblaze/cpu/interrupts.c                   |   42 ++++++------
  arch/microblaze/cpu/start.S                        |    2 +-
  arch/microblaze/cpu/timer.c                        |   69 ++++++++++---------
  arch/microblaze/cpu/u-boot.lds                     |    1 +
  arch/microblaze/include/asm/global_data.h          |    1 +
  arch/microblaze/include/asm/microblaze_intc.h      |   11 +++-
  arch/microblaze/include/asm/microblaze_timer.h     |    3 +
  arch/microblaze/include/asm/processor.h            |    3 +
  arch/microblaze/lib/board.c                        |   59 ++++++++++-------
  .../xilinx/microblaze-generic/microblaze-generic.c |    9 +++
  drivers/block/systemace.c                          |   38 +++++++----
  drivers/serial/serial_xuartlite.c                  |   34 ++++++----
  drivers/spi/xilinx_spi.c                           |    1 -
  include/configs/microblaze-generic.h               |   12 +---
  include/serial.h                                   |    3 +-
  16 files changed, 171 insertions(+), 119 deletions(-)


-- 
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

[U-Boot] Pull request - microblaze

[Tom Rini]

On Wed, Sep 12, 2012 at 12:13:17PM +0200, Michal Simek wrote:

> Dear Wolfgang,
> 
> please pull the following changes to your tree.
> 
> Thanks,
> Michal
> 
> 
> The following changes since commit a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721:
>   Wolfgang Denk (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 (10):
>       block: systemace: Simplify base and width initialization
>       serial: Support serial multi for Microblaze
>       serial: uartlite: Init all uartlites for serial multi
>       microblaze: Add support for device tree driven board configuration
>       microblaze: board: Remove compilation warning
>       microblaze: intc: Registering interrupt should return value
>       microblaze: intc: Coding style cleanup
>       microblaze: timer: Prepare for device-tree initialization
>       microblaze: Clean microblaze initialization
>       microblaze: board: Use bi_flashstart instead of CONFIG_SYS_FLASH_BASE
> 
> Stephan Linz (1):
>       spi: xilinx: Remove unused variable
> 
>  arch/microblaze/config.mk                          |    2 +
>  arch/microblaze/cpu/interrupts.c                   |   42 ++++++------
>  arch/microblaze/cpu/start.S                        |    2 +-
>  arch/microblaze/cpu/timer.c                        |   69 ++++++++++---------
>  arch/microblaze/cpu/u-boot.lds                     |    1 +
>  arch/microblaze/include/asm/global_data.h          |    1 +
>  arch/microblaze/include/asm/microblaze_intc.h      |   11 +++-
>  arch/microblaze/include/asm/microblaze_timer.h     |    3 +
>  arch/microblaze/include/asm/processor.h            |    3 +
>  arch/microblaze/lib/board.c                        |   59 ++++++++++-------
>  .../xilinx/microblaze-generic/microblaze-generic.c |    9 +++
>  drivers/block/systemace.c                          |   38 +++++++----
>  drivers/serial/serial_xuartlite.c                  |   34 ++++++----
>  drivers/spi/xilinx_spi.c                           |    1 -
>  include/configs/microblaze-generic.h               |   12 +---
>  include/serial.h                                   |    3 +-
>  16 files changed, 171 insertions(+), 119 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/20120918/579f2515/attachment.pgp>