U-Boot-pxa pull request
Hi,
please pull my git://git.denx.de/u-boot-pxa for-wd-testing branch into your u- boot-testing/Makefile-cleanup branch. Thanks
The following changes since commit a5cb985d8006bd1bb6d188b84f435f5d007fd6ac:
Makefile: move all Power Architecture boards into boards.cfg (2010-10-17
01:34:08 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-pxa.git for-wd-testing
Marek Vasut (19):
PXA: pxafb: Fix indent problems
PXA: pxa-regs.h cleanup
PXA: pxafb: Add ACX517AKN support
PXA: pxafb: Add support for Sharp LQ038J7DH53
PXA: pxafb: Marvell Littleton LCD definition
common: Enable serial for PXA250
PXA: Palm Tungsten|C Support
PXA: Add initial Palm LifeDrive support
PXA: Voipac270 improvements
PXA: Balloon3 board support
PXA: Add missing MAINTAINERS entries
PXA: Add necessary information for RELOC
PXA: Fix reloc, Push lowlevel init into C code
PXA: Fix vpac270 for Reloc
PXA: Fix ZipitZ2 for Reloc
PXA: Fix Balloon3 for Reloc
PXA: Fix vpac270 OneNAND booter
Build: PXA: Fix Vpac270 build variants
Build: PXA: Fix TrizepsIV build variants
Mikhail Kshevetskiy (4):
PXA: remove unused u-boot.lds from board/vpac270
PXA: cleanup vpac270 config and set CONFIG_SYS_HZ to 1000
PXA: fix environment sector size, kernel and environment location for
vpac270
PXA: fix MDREFR[APD] bit setting
MAINTAINERS | 9 +
MAKEALL | 7 +-
Makefile | 17 -
arch/arm/cpu/pxa/cpu.c | 255 +++-
arch/arm/cpu/pxa/i2c.c | 69 +-
arch/arm/cpu/pxa/pxafb.c | 365 +++--
arch/arm/cpu/pxa/start.S | 346 ++---
arch/arm/cpu/pxa/timer.c | 7 +-
arch/arm/cpu/pxa/usb.c | 61 +-
arch/arm/include/asm/arch-pxa/hardware.h | 61 +-
arch/arm/include/asm/arch-pxa/macro.h | 20 +-
arch/arm/include/asm/arch-pxa/pxa-regs.h | 2688 +++++++++++++++--------------
board/balloon3/Makefile | 47 +
board/balloon3/balloon3.c | 238 +++
board/colibri_pxa270/colibri_pxa270.c | 33 +-
board/cradle/cradle.c | 5 +-
board/cradle/lowlevel_init.S | 4 +-
board/csb226/csb226.c | 13 +-
board/delta/delta.c | 37 +-
board/delta/nand.c | 110 +-
board/innokom/innokom.c | 14 +-
board/palmld/Makefile | 49 +
board/palmld/config.mk | 1 +
board/{zipitz2 => palmld}/lowlevel_init.S | 9 +-
board/palmld/palmld.c | 69 +
board/{vpac270 => palmld}/u-boot.lds | 7 +-
board/palmtc/Makefile | 49 +
board/palmtc/config.mk | 1 +
board/{vpac270 => palmtc}/lowlevel_init.S | 3 +-
board/palmtc/palmtc.c | 59 +
board/{vpac270 => palmtc}/u-boot.lds | 7 +-
board/pxa255_idp/pxa_idp.c | 27 +-
board/trizepsiv/conxs.c | 35 +-
board/vpac270/Makefile | 17 +-
board/vpac270/config.mk | 1 -
board/vpac270/vpac270.c | 92 +-
board/wepep250/wepep250.c | 11 +-
board/zipitz2/Makefile | 10 +-
board/zipitz2/config.mk | 1 -
board/zipitz2/zipitz2.c | 57 +-
board/zylonite/nand.c | 110 +-
boards.cfg | 8 +
common/serial.c | 2 +-
drivers/mmc/pxa_mmc.c | 98 +-
drivers/serial/serial_pxa.c | 94 +-
include/configs/balloon3.h | 274 +++
include/configs/cerf250.h | 3 +
include/configs/colibri_pxa270.h | 3 +
include/configs/cradle.h | 5 +-
include/configs/csb226.h | 3 +
include/configs/delta.h | 4 +
include/configs/innokom.h | 3 +
include/configs/lubbock.h | 3 +
include/configs/palmld.h | 276 +++
include/configs/palmtc.h | 248 +++
include/configs/pleb2.h | 3 +
include/configs/pxa255_idp.h | 3 +
include/configs/trizepsiv.h | 3 +
include/configs/vpac270.h | 138 +-
include/configs/wepep250.h | 4 +
include/configs/xaeniax.h | 3 +
include/configs/xm250.h | 3 +
include/configs/xsengine.h | 3 +
include/configs/zipitz2.h | 10 +-
include/configs/zylonite.h | 3 +
onenand_ipl/board/vpac270/Makefile | 5 +-
66 files changed, 4017 insertions(+), 2206 deletions(-)
create mode 100644 board/balloon3/Makefile
create mode 100644 board/balloon3/balloon3.c
create mode 100644 board/palmld/Makefile
create mode 100644 board/palmld/config.mk
rename board/{zipitz2 => palmld}/lowlevel_init.S (90%)
create mode 100644 board/palmld/palmld.c
copy board/{vpac270 => palmld}/u-boot.lds (90%)
create mode 100644 board/palmtc/Makefile
create mode 100644 board/palmtc/config.mk
rename board/{vpac270 => palmtc}/lowlevel_init.S (95%)
create mode 100644 board/palmtc/palmtc.c
rename board/{vpac270 => palmtc}/u-boot.lds (90%)
delete mode 100644 board/vpac270/config.mk
delete mode 100644 board/zipitz2/config.mk
create mode 100644 include/configs/balloon3.h
create mode 100644 include/configs/palmld.h
create mode 100644 include/configs/palmtc.hDear Marek Vasut,
Quoted 11 lines · In message <[email protected]> you wrote:
Hi,
please pull mygit://git.denx.de/u-boot-pxafor-wd-testing branch into your u- boot-testing/Makefile-cleanup branch. ThanksThe following changes since commit
a5cb985d8006bd1bb6d188b84f435f5d007fd6ac:
Makefile: move all Power Architecture boards into boards.cfg (2010-10-17
01:34:08 +0200)are available in the git repository at:
git://git.denx.de/u-boot-pxa.gitfor-wd-testing
I send you the result of the pull off list.
You really need to reabse your tree:
-> cd u-boot-arm/
-> git remote update
...
-> git pull u-boot-pxa.git for-wd-testing
Dear Marek Vasut,
Quoted 116 lines · In message <[email protected]> you wrote:
Hi,
please pull mygit://git.denx.de/u-boot-pxafor-wd-testing branch into your u- boot-testing/Makefile-cleanup branch. ThanksThe following changes since commit
a5cb985d8006bd1bb6d188b84f435f5d007fd6ac:
Makefile: move all Power Architecture boards into boards.cfg (2010-10-17
01:34:08 +0200)are available in the git repository at:
git://git.denx.de/u-boot-pxa.gitfor-wd-testingMarek Vasut (19):
PXA: pxafb: Fix indent problems
PXA:pxa-regs.hcleanup
PXA: pxafb: Add ACX517AKN support
PXA: pxafb: Add support for Sharp LQ038J7DH53
PXA: pxafb: Marvell Littleton LCD definition
common: Enable serial for PXA250
PXA: Palm Tungsten|C Support
PXA: Add initial Palm LifeDrive support
PXA: Voipac270 improvements
PXA: Balloon3 board support
PXA: Add missingMAINTAINERSentries
PXA: Add necessary information for RELOC
PXA: Fix reloc, Push lowlevel init into C code
PXA: Fix vpac270 for Reloc
PXA: Fix ZipitZ2 for Reloc
PXA: Fix Balloon3 for Reloc
PXA: Fix vpac270 OneNAND booter
Build: PXA: Fix Vpac270 build variants
Build: PXA: Fix TrizepsIV build variantsMikhail Kshevetskiy (4):
PXA: remove unusedu-boot.ldsfrom board/vpac270
PXA: cleanup vpac270 config and setCONFIG_SYS_HZto 1000
PXA: fix environment sector size, kernel and environment location for
vpac270
PXA: fix MDREFR[APD] bit settingMAINTAINERS | 9 + MAKEALL | 7 +- Makefile | 17 - arch/arm/cpu/pxa/cpu.c | 255 +++- arch/arm/cpu/pxa/i2c.c | 69 +- arch/arm/cpu/pxa/pxafb.c | 365 +++-- arch/arm/cpu/pxa/start.S | 346 ++--- arch/arm/cpu/pxa/timer.c | 7 +- arch/arm/cpu/pxa/usb.c | 61 +- arch/arm/include/asm/arch-pxa/hardware.h | 61 +- arch/arm/include/asm/arch-pxa/macro.h | 20 +- arch/arm/include/asm/arch-pxa/pxa-regs.h | 2688 +++++++++++++++-------------- board/balloon3/Makefile | 47 + board/balloon3/balloon3.c | 238 +++ board/colibri_pxa270/colibri_pxa270.c | 33 +- board/cradle/cradle.c | 5 +- board/cradle/lowlevel_init.S | 4 +- board/csb226/csb226.c | 13 +- board/delta/delta.c | 37 +- board/delta/nand.c | 110 +- board/innokom/innokom.c | 14 +- board/palmld/Makefile | 49 + board/palmld/config.mk | 1 + board/{zipitz2 => palmld}/lowlevel_init.S | 9 +- board/palmld/palmld.c | 69 + board/{vpac270 => palmld}/u-boot.lds | 7 +- board/palmtc/Makefile | 49 + board/palmtc/config.mk | 1 + board/{vpac270 => palmtc}/lowlevel_init.S | 3 +- board/palmtc/palmtc.c | 59 + board/{vpac270 => palmtc}/u-boot.lds | 7 +- board/pxa255_idp/pxa_idp.c | 27 +- board/trizepsiv/conxs.c | 35 +- board/vpac270/Makefile | 17 +- board/vpac270/config.mk | 1 - board/vpac270/vpac270.c | 92 +- board/wepep250/wepep250.c | 11 +- board/zipitz2/Makefile | 10 +- board/zipitz2/config.mk | 1 - board/zipitz2/zipitz2.c | 57 +- board/zylonite/nand.c | 110 +- boards.cfg | 8 + common/serial.c | 2 +- drivers/mmc/pxa_mmc.c | 98 +- drivers/serial/serial_pxa.c | 94 +- include/configs/balloon3.h | 274 +++ include/configs/cerf250.h | 3 + include/configs/colibri_pxa270.h | 3 + include/configs/cradle.h | 5 +- include/configs/csb226.h | 3 + include/configs/delta.h | 4 + include/configs/innokom.h | 3 + include/configs/lubbock.h | 3 + include/configs/palmld.h | 276 +++ include/configs/palmtc.h | 248 +++ include/configs/pleb2.h | 3 + include/configs/pxa255_idp.h | 3 + include/configs/trizepsiv.h | 3 + include/configs/vpac270.h | 138 +- include/configs/wepep250.h | 4 + include/configs/xaeniax.h | 3 + include/configs/xm250.h | 3 + include/configs/xsengine.h | 3 + include/configs/zipitz2.h | 10 +- include/configs/zylonite.h | 3 + onenand_ipl/board/vpac270/Makefile | 5 +- 66 files changed, 4017 insertions(+), 2206 deletions(-) create mode 100644 board/balloon3/Makefile create mode 100644 board/balloon3/balloon3.c create mode 100644 board/palmld/Makefile create mode 100644 board/palmld/config.mk rename board/{zipitz2 => palmld}/lowlevel_init.S (90%) create mode 100644 board/palmld/palmld.c copy board/{vpac270 => palmld}/u-boot.lds (90%) create mode 100644 board/palmtc/Makefile create mode 100644 board/palmtc/config.mk
Quoted 8 lines
rename board/{vpac270 => palmtc}/lowlevel_init.S (95%)
create mode 100644 board/palmtc/palmtc.c
rename board/{vpac270 => palmtc}/u-boot.lds (90%)
delete mode 100644 board/vpac270/config.mk
delete mode 100644 board/zipitz2/config.mk
create mode 100644 include/configs/balloon3.h
create mode 100644 include/configs/palmld.h
create mode 100644 include/configs/palmtc.hDunno what was wrong with your tree.
Cherry-picked the commits one by one.
Thanks.
Best regards,
Wolfgang Denk
Signature · 6 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 So we follow our wandering paths, and the very darkness acts as our guide and our doubts serve to reassure us. - Jean-Pierre de Caussade, eighteenth-century Jesuit priest