[U-Boot] Pull request: u-boot-arm (master + next)

The following changes since commit ac8983bcba75576c50307b5e8dc8fb848740ee61:
Merge branch 'master' of git://git.denx.de/u-boot-imx (2010-12-09 20:52:44 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git ..BRANCH.NOT.VERIFIED..
Dirk Behme (1): OMAP: Timer: Replace bss variable by gd
Nick Thompson (1): davinci: Rewrite timer.c to use tbl/tbu emulation variables in gd
Nishanth Menon (1): omap3: emif|sdrc: use a single global data define
Sandeep Paulraj (1): DaVinci DM6446: Config Update
Wolfgang Denk (1): ARM: */start.S: use canonical asm syntax
arch/arm/cpu/arm1136/start.S | 2 +- arch/arm/cpu/arm1176/start.S | 2 +- arch/arm/cpu/arm720t/start.S | 2 +- arch/arm/cpu/arm920t/start.S | 2 +- arch/arm/cpu/arm925t/start.S | 2 +- arch/arm/cpu/arm926ejs/davinci/timer.c | 77 ++++++++++++-------------------- arch/arm/cpu/arm926ejs/start.S | 2 +- arch/arm/cpu/arm946es/start.S | 2 +- arch/arm/cpu/arm_intcm/start.S | 2 +- arch/arm/cpu/armv7/omap-common/timer.c | 22 +++++----- arch/arm/cpu/armv7/omap3/emif4.c | 3 +- arch/arm/cpu/armv7/omap3/sdrc.c | 3 +- arch/arm/cpu/armv7/start.S | 2 +- arch/arm/cpu/ixp/start.S | 2 +- arch/arm/cpu/lh7a40x/start.S | 2 +- arch/arm/cpu/pxa/start.S | 2 +- arch/arm/cpu/s3c44b0/start.S | 2 +- arch/arm/cpu/sa1100/start.S | 2 +- include/configs/davinci_dvevm.h | 19 +++++--- 19 files changed, 66 insertions(+), 86 deletions(-)
The following changes since commit 917a62c0d292d9da45100a76151a9fa2d13a9cdc:
Merge branch 'next' of git://git.denx.de/u-boot into next (2010-12-11 10:35:40 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git next
Balaji T K (1): ARMV7: OMAP4: twl6030 add battery charging support
Dirk Behme (1): OMAP3: SPI driver
board/ti/sdp4430/Makefile | 2 +- board/ti/sdp4430/cmd_bat.c | 58 +++++++ board/ti/sdp4430/sdp.c | 4 + drivers/power/twl6030.c | 124 ++++++++++++++- drivers/spi/Makefile | 1 + drivers/spi/omap3_spi.c | 352 +++++++++++++++++++++++++++++++++++++++ drivers/spi/omap3_spi.h | 117 +++++++++++++ include/configs/omap3_beagle.h | 2 + include/configs/omap4_sdp4430.h | 1 + include/twl6030.h | 45 +++++- 10 files changed, 701 insertions(+), 5 deletions(-) create mode 100644 board/ti/sdp4430/cmd_bat.c create mode 100644 drivers/spi/omap3_spi.c create mode 100644 drivers/spi/omap3_spi.h
Best regards,
Wolfgang Denk
participants (1)
-
Wolfgang Denk