Skip to contentSkip to conversation

Please pull coldfire tree

GIT PULL John Rigby 3 participants 3 messages Jun 5, 2008 – Jun 11, 2008

lore
Share & tools
lore

John Rigby

author
#0 lore raw

Wolfgang,

The following changes since commit 8155efbd7ae9c65564ca98affe94631d612ae088:
Wolfgang Denk (1):
Merge branch 'master' of ssh://mercury/home/wd/git/u-boot/master

are available in the git repository at:

git+ssh://gu-coldfire at www.denx.de/u-boot.coldfire master

TsiChung Liew (3):
ColdFire: Add 10 base ethernet support for mcf5445x
ColdFire: Add M5253DEMO platform support for mcf5253
ColdFire: Fix warning messages by passing correct data type in
board.c

  Makefile                              |    3 +
  board/freescale/m5253demo/Makefile    |   44 +++
  board/freescale/m5253demo/config.mk   |   25 ++
  board/freescale/m5253demo/flash.c     |  467 
++++++++++++++++++++++++++++++++
  board/freescale/m5253demo/m5253demo.c |  140 ++++++++++
  board/freescale/m5253demo/u-boot.lds  |  144 ++++++++++
  drivers/net/dm9000x.c                 |    4 +
  drivers/net/mcffec.c                  |    6 +
  include/configs/M5253DEMO.h           |  250 ++++++++++++++++++
  lib_m68k/board.c                      |    6 +-
  10 files changed, 1086 insertions(+), 3 deletions(-)

create mode 100644 board/freescale/m5253demo/Makefile create mode 100644 board/freescale/m5253demo/config.mk create mode 100644 board/freescale/m5253demo/flash.c create mode 100644 board/freescale/m5253demo/m5253demo.c create mode 100644 board/freescale/m5253demo/u-boot.lds create mode 100644 include/configs/M5253DEMO.h

Thanks
John

#1 lore raw
Quoted 9 lines · In message <[email protected]> you wrote:

Wolfgang,

The following changes since commit 8155efbd7ae9c65564ca98affe94631d612ae088:
Wolfgang Denk (1):
Merge branch 'master' of ssh://mercury/home/wd/git/u-boot/master

are available in the git repository at:

git+ssh://gu-coldfire at www.denx.de/u-boot.coldfire master

Please switch to using git.denx.de ; the git and www servers may be separated soon.

Quoted 5 lines

TsiChung Liew (3):
ColdFire: Add 10 base ethernet support for mcf5445x
ColdFire: Add M5253DEMO platform support for mcf5253
ColdFire: Fix warning messages by passing correct data type in
board.c

Sorry, this is causing a merge conflict in drivers/net/dm9000x.c ; and I cannot decide which part is correct [and actually this should go through the net repo].

Best regards,

Wolfgang Denk

Signature · 5 lines
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
A meeting is an event at which the minutes are kept and the hours are
lost.
#2 lore raw
Quoted 8 lines · Wolfgang Denk
Quoted 6 lines · In message <[email protected]> you wrote:

Wolfgang,

The following changes since commit 8155efbd7ae9c65564ca98affe94631d612ae088:
Wolfgang Denk (1):
Merge branch 'master' of ssh://mercury/home/wd/git/u-boot/master

Quoted 12 lines
Quoted 4 lines

are available in the git repository at:

git+ssh://gu-coldfire at www.denx.de/u-boot.coldfire master

Please switch to using git.denx.de ; the git and www servers may be separated soon.

Quoted 3 lines

TsiChung Liew (3):
ColdFire: Add 10 base ethernet support for mcf5445x

This is already checked in. Commit ff36fbb2e7583fb808eef773f511489c7a9c2df3

Quoted 6 lines
Quoted 4 lines

ColdFire: Add M5253DEMO platform support for mcf5253
ColdFire: Fix warning messages by passing correct data type in
board.c

Quoted 10 lines

Sorry, this is causing a merge conflict in drivers/net/dm9000x.c ; and I cannot decide which part is correct [and actually this should go through the net repo].

Best regards,

Wolfgang Denk

regards,
Ben