Dear Marek Vasut, In message <201007142341.38179.marek.va...@gmail.com> you wrote: > Please merge into -master. > > The following changes since commit d6f324d03d7829a1da1dee8b60f91b173a3976f0: > > Merge branch 'next' of git://git.denx.de/u-boot-nios (2010-07-14 22:07:41 > +0200) > > are available in the git repository at: > > git://git.denx.de/u-boot-pxa.git master > > Marek Vasut (9): > Enable PXAFB for PXA27X and PXA3XX > PXA: Add hardware init helper macros > PXA: Add PWM2 and PWM3 regs to pxa-regs.h > PXA: Add OneNAND booting support to start.S > Voipac PXA270 LCD Support > PXA: Add support for LMS285GF05 into pxafb > PXA: Voipac PXA270 Support > PXA: Toradex Colibri PXA270 support > PXA: ZipitZ2 support > > MAKEALL | 4 + > Makefile | 9 + > arch/arm/cpu/pxa/pxafb.c | 76 ++++++- > arch/arm/cpu/pxa/start.S | 48 ++++- > arch/arm/include/asm/arch-pxa/macro.h | 324 > ++++++++++++++++++++++++++ > arch/arm/include/asm/arch-pxa/pxa-regs.h | 10 +- > board/colibri_pxa270/Makefile | 45 ++++ > board/colibri_pxa270/colibri_pxa270.c | 118 ++++++++++ > board/colibri_pxa270/config.mk | 1 + > board/colibri_pxa270/lowlevel_init.S | 36 +++ > board/vpac270/Makefile | 48 ++++ > board/vpac270/config.mk | 1 + > board/vpac270/lowlevel_init.S | 40 ++++ > board/vpac270/u-boot.lds | 55 +++++ > board/vpac270/vpac270.c | 127 ++++++++++ > board/zipitz2/Makefile | 54 +++++ > board/zipitz2/config.mk | 1 + > board/zipitz2/lowlevel_init.S | 40 ++++ > board/zipitz2/u-boot.lds | 56 +++++ > board/zipitz2/zipitz2.c | 213 +++++++++++++++++ > boards.cfg | 2 + > common/lcd.c | 12 +- > include/configs/colibri_pxa270.h | 278 ++++++++++++++++++++++ > include/configs/vpac270.h | 323 +++++++++++++++++++++++++ > include/configs/zipitz2.h | 259 ++++++++++++++++++++ > include/lcd.h | 2 +- > onenand_ipl/board/vpac270/Makefile | 83 +++++++ > onenand_ipl/board/vpac270/config.mk | 1 + > onenand_ipl/board/vpac270/lowlevel_init.S | 34 +++ > onenand_ipl/board/vpac270/u-boot.onenand.lds | 51 ++++ > onenand_ipl/board/vpac270/vpac270.c | 42 ++++ > 31 files changed, 2379 insertions(+), 14 deletions(-) > create mode 100644 arch/arm/include/asm/arch-pxa/macro.h > create mode 100644 board/colibri_pxa270/Makefile > create mode 100644 board/colibri_pxa270/colibri_pxa270.c > create mode 100644 board/colibri_pxa270/config.mk > create mode 100644 board/colibri_pxa270/lowlevel_init.S > create mode 100644 board/vpac270/Makefile > create mode 100644 board/vpac270/config.mk > create mode 100644 board/vpac270/lowlevel_init.S > create mode 100644 board/vpac270/u-boot.lds > create mode 100644 board/vpac270/vpac270.c > create mode 100644 board/zipitz2/Makefile > create mode 100644 board/zipitz2/config.mk > create mode 100644 board/zipitz2/lowlevel_init.S > create mode 100644 board/zipitz2/u-boot.lds > create mode 100644 board/zipitz2/zipitz2.c > create mode 100644 include/configs/colibri_pxa270.h > create mode 100644 include/configs/vpac270.h > create mode 100644 include/configs/zipitz2.h > create mode 100644 onenand_ipl/board/vpac270/Makefile > create mode 100644 onenand_ipl/board/vpac270/config.mk > create mode 100644 onenand_ipl/board/vpac270/lowlevel_init.S > create mode 100644 onenand_ipl/board/vpac270/u-boot.onenand.lds > create mode 100644 onenand_ipl/board/vpac270/vpac270.c
Pulled into u-boot-arm #master. 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: w...@denx.de An Ada exception is when a routine gets in trouble and says 'Beam me up, Scotty'. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot