[U-Boot] [PULL] Please pull u-boot-arm master:master
Wolfgang Denk
wd at denx.de
Fri Jul 16 21:16:24 CEST 2010
The following changes since commit 54841ab50c20d6fa6c9cc3eb826989da3a22d934:
Make sure that argv[] argument pointers are not modified. (2010-07-04 23:55:42 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git master
Nick Thompson (1):
Davinci: SPI: add the missing v2 patch changes
Steve Sakoman (8):
OMAP: mmc: add support for second and third mmc channels
ARM: Rename arch/arm/cpu/arm_cortexa8 to armv7
ARMV7: Add basic support for TI OMAP4
ARMV7: Restructure OMAP mmc driver to allow code sharing between OMAP3 and OMAP4
ARMV7: Restructure OMAP i2c driver to allow code sharing between OMAP3 and OMAP4
ARMV7: Add support for TI OMAP4430 SDP
ARMV7: Add support for TI OMAP4 Panda
mmc: add function prototype for mmc_set_dev in mmc.h
MAINTAINERS | 24 ++-
MAKEALL | 10 +-
Makefile | 7 +
arch/arm/cpu/{arm_cortexa8 => armv7}/Makefile | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/config.mk | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/cpu.c | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/Makefile | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/clock.c | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/iomux.c | 0
.../{arm_cortexa8 => armv7}/mx51/lowlevel_init.S | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/soc.c | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/speed.c | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/timer.c | 0
.../cpu/{arm_cortexa8 => armv7}/mx51/u-boot.lds | 2 +-
.../mx51 => armv7/omap-common}/Makefile | 10 +-
.../{arm_cortexa8 => armv7/omap-common}/config.mk | 0
.../omap3 => armv7/omap-common}/reset.S | 0
.../omap3 => armv7/omap-common}/timer.c | 5 +
.../arm/cpu/{arm_cortexa8 => armv7}/omap3/Makefile | 2 -
arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/board.c | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/cache.S | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/clock.c | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/emif4.c | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/gpio.c | 0
.../{arm_cortexa8 => armv7}/omap3/lowlevel_init.S | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/mem.c | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/sdrc.c | 0
.../cpu/{arm_cortexa8 => armv7}/omap3/sys_info.c | 0
.../arm/cpu/{arm_cortexa8 => armv7}/omap3/syslib.c | 0
.../{arm_cortexa8/s5pc1xx => armv7/omap4}/Makefile | 16 +-
arch/arm/cpu/armv7/omap4/board.c | 90 ++++++++
.../omap3/reset.S => armv7/omap4/lowlevel_init.S} | 40 +++--
.../omap3/reset.S => armv7/omap4/sys_info.c} | 50 +++--
.../cpu/{arm_cortexa8 => armv7}/s5pc1xx/Makefile | 0
.../cpu/{arm_cortexa8 => armv7}/s5pc1xx/cache.S | 2 +-
.../cpu/{arm_cortexa8 => armv7}/s5pc1xx/clock.c | 0
.../cpu/{arm_cortexa8 => armv7}/s5pc1xx/cpu_info.c | 0
.../cpu/{arm_cortexa8 => armv7}/s5pc1xx/reset.S | 0
.../cpu/{arm_cortexa8 => armv7}/s5pc1xx/sromc.c | 0
.../cpu/{arm_cortexa8 => armv7}/s5pc1xx/timer.c | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/start.S | 0
arch/arm/cpu/{arm_cortexa8 => armv7}/u-boot.lds | 2 +-
arch/arm/include/asm/arch-mx51/asm-offsets.h | 2 +-
arch/arm/include/asm/arch-omap3/i2c.h | 149 +-------------
arch/arm/include/asm/arch-omap3/mmc_host_def.h | 15 +-
arch/arm/include/asm/arch-omap4/cpu.h | 94 +++++++++
arch/arm/include/asm/arch-omap4/i2c.h | 74 +++++++
arch/arm/include/asm/arch-omap4/mmc_host_def.h | 171 +++++++++++++++
arch/arm/include/asm/arch-omap4/omap4.h | 118 +++++++++++
.../reset.S => include/asm/arch-omap4/sys_proto.h} | 35 ++--
board/logicpd/zoom2/zoom2.c | 2 +-
.../cpu/arm_cortexa8 => board/ti/panda}/Makefile | 24 ++-
.../cpu/arm_cortexa8 => board/ti/panda}/config.mk | 25 +--
.../u-boot.lds => board/ti/panda/panda.c | 65 +++---
.../cpu/arm_cortexa8 => board/ti/sdp4430}/Makefile | 24 ++-
.../arm_cortexa8 => board/ti/sdp4430}/config.mk | 25 +--
.../u-boot.lds => board/ti/sdp4430/sdp.c | 66 +++---
boards.cfg | 26 ++-
drivers/i2c/omap24xx_i2c.c | 17 ++-
drivers/i2c/omap24xx_i2c.h | 166 +++++++++++++++
drivers/mmc/omap3_mmc.c | 50 ++++-
.../arch-omap3/mmc.h => drivers/mmc/omap3_mmc.h | 2 +-
drivers/spi/davinci_spi.c | 8 +-
include/configs/am3517_evm.h | 2 +-
include/configs/devkit8000.h | 2 +-
include/configs/omap3_beagle.h | 2 +-
include/configs/omap3_evm.h | 2 +-
include/configs/omap3_overo.h | 2 +-
include/configs/omap3_pandora.h | 2 +-
include/configs/omap3_sdp3430.h | 2 +-
include/configs/omap3_zoom1.h | 2 +-
include/configs/omap3_zoom2.h | 2 +-
include/configs/omap4_panda.h | 220 +++++++++++++++++++
include/configs/omap4_sdp4430.h | 221 ++++++++++++++++++++
include/configs/s5p_goni.h | 2 +-
include/configs/smdkc100.h | 2 +-
include/mmc.h | 1 +
77 files changed, 1504 insertions(+), 378 deletions(-)
copy arch/arm/cpu/{arm_cortexa8 => armv7}/Makefile (100%)
copy arch/arm/cpu/{arm_cortexa8 => armv7}/config.mk (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/cpu.c (100%)
copy arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/Makefile (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/clock.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/iomux.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/lowlevel_init.S (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/soc.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/speed.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/timer.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/mx51/u-boot.lds (97%)
rename arch/arm/cpu/{arm_cortexa8/mx51 => armv7/omap-common}/Makefile (87%)
copy arch/arm/cpu/{arm_cortexa8 => armv7/omap-common}/config.mk (100%)
copy arch/arm/cpu/{arm_cortexa8/omap3 => armv7/omap-common}/reset.S (100%)
rename arch/arm/cpu/{arm_cortexa8/omap3 => armv7/omap-common}/timer.c (96%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/Makefile (97%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/board.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/cache.S (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/clock.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/emif4.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/gpio.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/lowlevel_init.S (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/mem.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/sdrc.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/sys_info.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/omap3/syslib.c (100%)
copy arch/arm/cpu/{arm_cortexa8/s5pc1xx => armv7/omap4}/Makefile (83%)
create mode 100644 arch/arm/cpu/armv7/omap4/board.c
copy arch/arm/cpu/{arm_cortexa8/omap3/reset.S => armv7/omap4/lowlevel_init.S} (65%)
copy arch/arm/cpu/{arm_cortexa8/omap3/reset.S => armv7/omap4/sys_info.c} (60%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/Makefile (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/cache.S (98%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/clock.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/cpu_info.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/reset.S (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/sromc.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/s5pc1xx/timer.c (100%)
rename arch/arm/cpu/{arm_cortexa8 => armv7}/start.S (100%)
copy arch/arm/cpu/{arm_cortexa8 => armv7}/u-boot.lds (97%)
create mode 100644 arch/arm/include/asm/arch-omap4/cpu.h
create mode 100644 arch/arm/include/asm/arch-omap4/i2c.h
create mode 100644 arch/arm/include/asm/arch-omap4/mmc_host_def.h
create mode 100644 arch/arm/include/asm/arch-omap4/omap4.h
rename arch/arm/{cpu/arm_cortexa8/omap3/reset.S => include/asm/arch-omap4/sys_proto.h} (64%)
copy {arch/arm/cpu/arm_cortexa8 => board/ti/panda}/Makefile (79%)
copy {arch/arm/cpu/arm_cortexa8 => board/ti/panda}/config.mk (54%)
copy arch/arm/cpu/arm_cortexa8/u-boot.lds => board/ti/panda/panda.c (53%)
rename {arch/arm/cpu/arm_cortexa8 => board/ti/sdp4430}/Makefile (79%)
rename {arch/arm/cpu/arm_cortexa8 => board/ti/sdp4430}/config.mk (54%)
rename arch/arm/cpu/arm_cortexa8/u-boot.lds => board/ti/sdp4430/sdp.c (52%)
create mode 100644 drivers/i2c/omap24xx_i2c.h
rename arch/arm/include/asm/arch-omap3/mmc.h => drivers/mmc/omap3_mmc.h (99%)
create mode 100644 include/configs/omap4_panda.h
create mode 100644 include/configs/omap4_sdp4430.h
The following changes since commit 93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658:
Merge branch 'master' of ../master (2010-07-15 22:48:46 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm.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
Wolfgang Denk (1):
Merge branch 'master' of git://git.denx.de/u-boot-pxa
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
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: wd at denx.de
A Stanford research group advertised for participants in a study of
obsessive-compulsive disorder. They were looking for therapy clients
who had been diagnosed with this disorder. The response was grati-
fying; they got 3,000 responses about three days after the ad came
out. All from the same person.
More information about the U-Boot
mailing list