[U-Boot] [PULL] u-boot-pxa/master

The following changes since commit c851a2458fbc12495f4f786d4eabb612850a5143:
Merge git://git.denx.de/u-boot-socfpga (2015-08-23 20:44:25 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-pxa.git HEAD
for you to fetch changes up to 3664fa1beec3921dcfed605a9b37f63dee28ce6a:
arm: pxa: colibri_pxa270: add optional i2c support (2015-08-24 20:30:38 +0200)
---------------------------------------------------------------- Andrew Ruder (2): pxa: Fix boot hang by avoiding vector relocation arm: pxa: use common timer functions
Marcel Ziswiler (9): arm: pxa: clean-up include file order arm: pxa: mmc: clean-up include file order serial: pxa: clean-up include file order usb: pxa27x_udc: clean-up include file order lcd: pxa: clean-up include file order arm: pxa: palmtreo680: get rid of obsolete CONFIG_SYS_LCD_PXA_NO_L_BIAS arm: pxa: colibri_pxa270: add some more nor flash details arm: pxa: colibri_pxa270: add optional lcd support arm: pxa: colibri_pxa270: add optional i2c support
arch/arm/cpu/pxa/Makefile | 1 + arch/arm/cpu/pxa/pxa2xx.c | 4 ++-- arch/arm/cpu/pxa/relocate.S | 23 +++++++++++++++++++++++ arch/arm/cpu/pxa/timer.c | 71 ++--------------------------------------------------------------------- arch/arm/include/asm/arch-pxa/config.h | 25 +++++++++++++++++++++++++ arch/arm/include/asm/config.h | 5 ++++- drivers/mmc/pxa_mmc_gen.c | 8 +++----- drivers/serial/serial_pxa.c | 4 ++-- drivers/usb/gadget/pxa27x_udc.c | 5 ++--- drivers/video/pxa_lcd.c | 9 ++++----- include/configs/colibri_pxa270.h | 26 ++++++++++++++++++++++++++ include/configs/palmtreo680.h | 1 - 12 files changed, 94 insertions(+), 88 deletions(-) create mode 100644 arch/arm/cpu/pxa/relocate.S create mode 100644 arch/arm/include/asm/arch-pxa/config.h

On Mon, Aug 24, 2015 at 08:31:13PM +0200, Marek Vasut wrote:
The following changes since commit c851a2458fbc12495f4f786d4eabb612850a5143:
Merge git://git.denx.de/u-boot-socfpga (2015-08-23 20:44:25 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-pxa.git HEAD
for you to fetch changes up to 3664fa1beec3921dcfed605a9b37f63dee28ce6a:
arm: pxa: colibri_pxa270: add optional i2c support (2015-08-24 20:30:38 +0200)
Applied to u-boot/master, thanks!
participants (2)
-
Marek Vasut
-
Tom Rini