Skip to contentSkip to conversation

U-Boot-pxa

GIT PULL Marek Vasut 2 participants 4 messages Jul 22, 2010 – Aug 3, 2010

lore
Share & tools
lore
#0 lore raw

Hi, please merge my "for-wd-master" branch into u-boot.git "master" branch. Thanks

The following changes since commit 1f82ff4777f360e92aa37bbbed647f7b9d9d2044:

Merge branch 'master' of git://git.denx.de/u-boot-video (2010-07-17 20:49:59
+0200)

are available in the git repository at:

git://git.denx.de/u-boot-pxa.git for-wd-master

Marek Vasut (8):
ARM: Define __raw_readX and __raw_writeX
PXA: pxafb: Add ACX517AKN support
common: Enable serial for PXA250
PXA: Palm Tungsten|C Support
PXA: pxafb: Add support for Sharp LQ038J7DH53
PXA: Add initial Palm LifeDrive support Merge branch 'palm' into for-wd-master
PXA: Vpac270 config fixes

 arch/arm/cpu/pxa/pxafb.c     |   68 +++++++++++
 arch/arm/include/asm/io.h    |   46 ++++++-
 board/palmld/Makefile        |   54 ++++++++
 board/palmld/config.mk       |    1 +
 board/palmld/lowlevel_init.S |   46 +++++++
 board/palmld/palmld.c        |   81 ++++++++++++
 board/palmld/u-boot.lds      |   56 +++++++++
 board/palmtc/Makefile        |   54 ++++++++
 board/palmtc/config.mk       |    3 +
 board/palmtc/lowlevel_init.S |   40 ++++++
 board/palmtc/palmtc.c        |   77 ++++++++++++
 board/palmtc/u-boot.lds      |   56 +++++++++
 boards.cfg                   |    2 +
 common/serial.c              |    2 +-
 include/configs/palmld.h     |  275 ++++++++++++++++++++++++++++++++++++++++++
 include/configs/palmtc.h     |  250 ++++++++++++++++++++++++++++++++++++++
 include/configs/vpac270.h    |   12 ++-
 17 files changed, 1115 insertions(+), 8 deletions(-)
 create mode 100644 board/palmld/Makefile
 create mode 100644 board/palmld/config.mk
 create mode 100644 board/palmld/lowlevel_init.S
 create mode 100644 board/palmld/palmld.c
 create mode 100644 board/palmld/u-boot.lds
 create mode 100644 board/palmtc/Makefile
 create mode 100644 board/palmtc/config.mk
 create mode 100644 board/palmtc/lowlevel_init.S
 create mode 100644 board/palmtc/palmtc.c
 create mode 100644 board/palmtc/u-boot.lds
 create mode 100644 include/configs/palmld.h
 create mode 100644 include/configs/palmtc.h
#1 lore raw

Dne ?t 22. ?ervence 2010 17:01:37 Marek Vasut napsal(a):

Quoted 2 lines

Hi, please merge my "for-wd-master" branch into u-boot.git "master" branch. Thanks

Hi Wolfgang,

I added two more patches. Here's a revised pull request, please merge my "for- wd-master" branch into u-boot.git "master" branch.

Thanks!

The following changes since commit 1f82ff4777f360e92aa37bbbed647f7b9d9d2044:

Merge branch 'master' of git://git.denx.de/u-boot-video (2010-07-17 20:49:59
+0200)

are available in the git repository at:

http://git.denx.de/u-boot-pxa.git for-wd-master

Marek Vasut (9):
ARM: Define __raw_readX and __raw_writeX
PXA: pxafb: Add ACX517AKN support
common: Enable serial for PXA250
PXA: Palm Tungsten|C Support
PXA: pxafb: Add support for Sharp LQ038J7DH53
PXA: Add initial Palm LifeDrive support
PXA: Vpac270 config fixes
PXA: Balloon3 board support
PXA: Voipac270 128MB module support

 MAKEALL                        |    3 +-
 Makefile                       |    7 +-
 arch/arm/cpu/pxa/pxafb.c       |   68 +++++++++
 arch/arm/include/asm/io.h      |   46 ++++++-
 board/balloon3/Makefile        |   48 +++++++
 board/balloon3/balloon3.c      |  244 ++++++++++++++++++++++++++++++++
 board/balloon3/config.mk       |    1 +
 board/balloon3/lowlevel_init.S |   40 ++++++
 board/balloon3/u-boot.lds      |   55 +++++++
 board/palmld/Makefile          |   54 +++++++
 board/palmld/config.mk         |    1 +
 board/palmld/lowlevel_init.S   |   46 ++++++
 board/palmld/palmld.c          |   81 +++++++++++
 board/palmld/u-boot.lds        |   56 ++++++++
 board/palmtc/Makefile          |   54 +++++++
 board/palmtc/config.mk         |    3 +
 board/palmtc/lowlevel_init.S   |   40 ++++++
 board/palmtc/palmtc.c          |   77 ++++++++++
 board/palmtc/u-boot.lds        |   56 ++++++++
 board/vpac270/vpac270.c        |    7 +-
 boards.cfg                     |    3 +
 common/serial.c                |    2 +-
 include/configs/balloon3.h     |  303 ++++++++++++++++++++++++++++++++++++++++
 include/configs/palmld.h       |  275 ++++++++++++++++++++++++++++++++++++
 include/configs/palmtc.h       |  250 +++++++++++++++++++++++++++++++++
 include/configs/vpac270.h      |   32 ++++-
 26 files changed, 1839 insertions(+), 13 deletions(-)
 create mode 100644 board/balloon3/Makefile
 create mode 100644 board/balloon3/balloon3.c
 create mode 100644 board/balloon3/config.mk
 create mode 100644 board/balloon3/lowlevel_init.S
 create mode 100644 board/balloon3/u-boot.lds
 create mode 100644 board/palmld/Makefile
 create mode 100644 board/palmld/config.mk
 create mode 100644 board/palmld/lowlevel_init.S
 create mode 100644 board/palmld/palmld.c
 create mode 100644 board/palmld/u-boot.lds
 create mode 100644 board/palmtc/Makefile
 create mode 100644 board/palmtc/config.mk
 create mode 100644 board/palmtc/lowlevel_init.S
 create mode 100644 board/palmtc/palmtc.c
 create mode 100644 board/palmtc/u-boot.lds
 create mode 100644 include/configs/balloon3.h
 create mode 100644 include/configs/palmld.h
 create mode 100644 include/configs/palmtc.h
#3 lore raw
In reply to Marek Vasut

Dear Marek Vasut,

Quoted 12 lines · In message <[email protected]> you wrote:

Hi, please merge my "for-wd-master" branch into u-boot.git "master" branch. Thanks

The following changes since commit 1f82ff4777f360e92aa37bbbed647f7b9d9d2044:

Merge branch 'master' of git://git.denx.de/u-boot-video (2010-07-17 20:49:59
+0200)

are available in the git repository at:

git://git.denx.de/u-boot-pxa.git for-wd-master

Quoted 9 lines

Marek Vasut (8):
ARM: Define __raw_readX and __raw_writeX
PXA: pxafb: Add ACX517AKN support
common: Enable serial for PXA250
PXA: Palm Tungsten|C Support
PXA: pxafb: Add support for Sharp LQ038J7DH53
PXA: Add initial Palm LifeDrive support Merge branch 'palm' into for-wd-master
PXA: Vpac270 config fixes

Sorry. Please do not send the pull request at the same time (or actually _before_) the patches. Please allow for a couple of days of review time.

Some patches need rework, not pulled because of that.

Best regards,

Wolfgang Denk

Signature · 4 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
I program, therefore I am.
#2 lore raw
In reply to Marek Vasut

Dear Marek Vasut,

Quoted 3 lines · In message <[email protected]> you wrote:

I added two more patches. Here's a revised pull request, please merge my "for- wd-master" branch into u-boot.git "master" branch.

I don't see any trace of these patches on the mailing list.

I will not pull any such stuff.

Best regards,

Wolfgang Denk

Signature · 8 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
There is a theory which states that if ever anyone discovers  exactly
what  the  Universe is for and why it is here, it will instantly dis-
appear and be replaced by something even more  bizarre  and  inexpli-
cable.  There  is  another  theory which states that this has already
happened.    -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"