Patchwork [U-Boot] Pull request: u-boot-arm/master

login
register
mail settings
Submitter Albert ARIBAUD
Date Aug. 4, 2011, 12:28 p.m.
Message ID <4E3A907A.5060809@aribaud.net>
Download mbox
Permalink /patch/108435/
State Superseded
Headers show

Pull-request

git://git.denx.de/u-boot-arm.git master

Comments

Albert ARIBAUD - Aug. 4, 2011, 12:28 p.m.
Hi Wolfgang,

Here is my pull request for u-boot-arm/master, from which I did remove 
the wrongly applied commits that you indicated and in which all patches 
submitted before the merge window closure are taken into account.

Developers, please direct complaints to me for any ARM-directed patches 
submitted before the window closure, and which is not accounted for at 
this point.

Still to apply are  bugfix patches submitted after window closure as 
well as the UTF-8 conversion patch and the ARM board removal patch.

The following changes since commit d50a8f45c9a640b3bcbd0ede91f83c8646cca018:

   Merge branch 'master' of git://git.denx.de/u-boot-mmc (2011-08-02 
22:39:36 +0200)

are available in the git repository at:

   git://git.denx.de/u-boot-arm.git master

Andreas Bießmann (8):
       ARM: remove obsolete at91rm9200
       MAKEALL: remove obsolete at91rm9200 soc
       a/a/c/arm920t/cpu.c: remove CONFIG_AT91_LEGACY warning
       README.at91-soc: remove AT91(RM9200) joining notice
       net/eth.c: drop obsolete at91rm9200 support
       README: fix arm920t/at91 path
       a/a/c/arm920t/at91/reset.c: drop obsolete CONFIG_AT91RM9200_USART
       avr32: add grasshopper (ICnova AP7000) board

Aneesh V (15):
       omap4: utility function to identify the context of hw init
       omap4: cleanup pin mux data
       omap4: add OMAP4430 revision check
       omap4: add clock support
       omap4: add sdram init support
       omap4: calculate EMIF register values
       omap4: automatic sdram detection
       armv7: start.S: fixes and enhancements for SPL
       omap: add basic SPL support
       omap: add MMC and FAT support to SPL
       omap4: add omap4460 revision detection
       omap4: sdram init changes for omap4460
       omap: reuse omap3 gpio support in omap4
       omap4: support TPS programming
       omap4: clock init support for omap4460

Asen Dimov (1):
       AT91: change common at91sam9261 files to compile with new scheme

Chander Kashyap (1):
       SMDKV310: MMC_SPL: Fix building when using "make O="

Christopher Harvey (1):
       Removed unused define, CONFIG_ARMV7.

Dirk Behme (1):
       ARMv7: u8500_href: Add missing header to fix compiler warning

Heiko Schocher (1):
       cosmetic: arm: lib/board.c: Coding Style cleanup

John Rigby (1):
       mkimage: Add OMAP boot image support

Laurence Withers (6):
       DaVinci: rename gpio_defs.h to gpio.h
       DA8xx: add generic GPIO driver
       DaVinci EMAC: declare function for all DA8xx CPUs
       DA8xx: add MMC/SD controller addresses
       DA8xx: switch an enum to defines for consistency
       DA8xx: fix LPSC constants

Matthias Weisser (1):
       arm: auto gen asm-offsets.h for mb86r0x

Po-Yu Chuang (2):
       arm: a320: fix multiline comment style
       arm: a320: enable tagged list support

Reinhard Meyer (3):
       AT91: fix mistake in at91sam9260_devices.c(spi1_hw_init)
       MAKEALL: remove AT91 boards that are in boards.cfg
       AT91/SPI: fix atmel_dataflash_spi.c to allow building without 
warnings

Sanjeev Premi (3):
       omap3: Include array definition only when it is used
       omap3evm: eth: split function setup_net_chip
       omap3evm: eth: Include functions only when necessary

Shiraz Hashim (1):
       spear: fix build errors for spear3xx/spear600 platforms

Sriramakrishnan (1):
       omap3evm: Update ethernet reset sequence for Rev.G board

Stefano Babic (1):
       ARM: versatile: fix board support

Thomas Abraham (1):
       SMDKV310: Enable device tree support

Xu, Hong (6):
       AT91: Makes AT91SAM9RL SoC build correctly against 
u-boot-atmel/master
       AT91: Makes AT91SAM9RL-EK build correctly against u-boot-atmel/master
       AT91: SoC fix at91sam9261_matrix.h
       AT91: Board fix for AT91SAM9261-EK
       AT91: Makes AT91SAM9263 SoC build correctly against 
u-boot-atmel/master
       AT91: Makes AT91SAM9263-EK build correctly against 
u-boot-atmel/master

  MAINTAINERS                                        |    1 +
  MAKEALL                                            |    7 -
  Makefile                                           |   63 -
  README                                             |    2 +-
  arch/arm/cpu/arm920t/at91/reset.c                  |    4 -
  arch/arm/cpu/arm920t/at91rm9200/bcm5221.c          |  232 ----
  arch/arm/cpu/arm920t/at91rm9200/dm9161.c           |  225 ----
  arch/arm/cpu/arm920t/at91rm9200/ether.c            |  316 -----
  arch/arm/cpu/arm920t/at91rm9200/i2c.c              |  192 ---
  arch/arm/cpu/arm920t/at91rm9200/ks8721.c           |  249 ----
  arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S    |  169 ---
  arch/arm/cpu/arm920t/at91rm9200/lxt972.c           |  192 ---
  arch/arm/cpu/arm920t/at91rm9200/reset.c            |   71 --
  arch/arm/cpu/arm920t/at91rm9200/spi.c              |  152 ---
  arch/arm/cpu/arm920t/at91rm9200/timer.c            |  142 ---
  arch/arm/cpu/arm920t/at91rm9200/usb.c              |   53 -
  arch/arm/cpu/arm920t/cpu.c                         |    4 -
  arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c  |    2 +-
  arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c  |   76 +-
  arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c  |   38 +-
  arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c   |   74 +-
  arch/arm/cpu/arm926ejs/at91/lowlevel_init.S        |    2 +-
  arch/arm/cpu/arm926ejs/mb86r0x/Makefile            |    2 +
  arch/arm/cpu/arm926ejs/mb86r0x/asm-offsets.c       |   65 +
  arch/arm/cpu/armv7/Makefile                        |    7 +-
  arch/arm/cpu/armv7/cpu.c                           |    7 +
  arch/arm/cpu/armv7/omap-common/Makefile            |    6 +
  arch/arm/cpu/armv7/{omap3 => omap-common}/gpio.c   |   41 +-
  arch/arm/cpu/armv7/omap-common/spl.c               |  272 ++++
  arch/arm/cpu/armv7/omap-common/u-boot-spl.lds      |   62 +
  arch/arm/cpu/armv7/omap-common/utils.c             |   57 +
  arch/arm/cpu/armv7/omap3/Makefile                  |    1 -
  arch/arm/cpu/armv7/omap3/board.c                   |   12 +
  arch/arm/cpu/armv7/omap3/sys_info.c                |    3 +
  arch/arm/cpu/armv7/omap4/Makefile                  |    6 +
  arch/arm/cpu/armv7/omap4/board.c                   |  180 +++-
  arch/arm/cpu/armv7/omap4/clocks.c                  |  940 ++++++++++++++
  .../panda => arch/arm/cpu/armv7/omap4}/config.mk   |   25 +-
  arch/arm/cpu/armv7/omap4/emif.c                    | 1310 
++++++++++++++++++++
  arch/arm/cpu/armv7/omap4/lowlevel_init.S           |   31 +
  arch/arm/cpu/armv7/omap4/omap4_mux_data.h          |   76 ++
  arch/arm/cpu/armv7/omap4/sdram_elpida.c            |  282 +++++
  arch/arm/cpu/armv7/start.S                         |   50 +-
  arch/arm/cpu/armv7/u-boot.lds                      |    2 +
  arch/arm/include/asm/arch-at91/at91_spi.h          |    2 +-
  arch/arm/include/asm/arch-at91/at91sam9261.h       |    3 +-
  .../arm/include/asm/arch-at91/at91sam9261_matrix.h |   77 +-
  arch/arm/include/asm/arch-at91/at91sam9263.h       |   13 +
  .../arm/include/asm/arch-at91/at91sam9263_matrix.h |  146 +--
  arch/arm/include/asm/arch-at91/at91sam9rl.h        |  185 ++--
  arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h |  121 +--
  arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h  |  812 ------------
  arch/arm/include/asm/arch-at91rm9200/hardware.h    |   75 --
  arch/arm/include/asm/arch-davinci/davinci_misc.h   |    2 +-
  .../asm/arch-davinci/{gpio_defs.h => gpio.h}       |    8 +
  arch/arm/include/asm/arch-davinci/hardware.h       |  102 +-
  arch/arm/include/asm/arch-mb86r0x/asm-offsets.h    |   74 --
  arch/arm/include/asm/arch-mb86r0x/mb86r0x.h        |   42 +
  arch/arm/include/asm/arch-omap3/cpu.h              |   26 +
  arch/arm/include/asm/arch-omap4/clocks.h           |  690 +++++++++++
  arch/arm/include/asm/arch-omap4/cpu.h              |   26 +
  arch/arm/include/asm/arch-omap4/emif.h             | 1040 ++++++++++++++++
  arch/arm/include/asm/arch-omap4/mux_omap4.h        |    1 +
  arch/arm/include/asm/arch-omap4/omap4.h            |   61 +-
  arch/arm/include/asm/arch-omap4/sys_proto.h        |   72 ++-
  arch/arm/include/asm/armv7.h                       |    6 +
  arch/arm/include/asm/omap_common.h                 |   56 +
  .../include/asm/{arch-omap3/gpio.h => omap_gpio.h} |   27 +-
  arch/arm/lib/board.c                               |  216 ++--
  board/armltd/versatile/config.mk                   |    5 -
  board/armltd/versatile/versatile.c                 |   10 +-
  board/atmel/at91sam9261ek/at91sam9261ek.c          |  136 ++-
  board/atmel/at91sam9261ek/config.mk                |    1 -
  board/atmel/at91sam9261ek/led.c                    |    7 +-
  board/atmel/at91sam9263ek/at91sam9263ek.c          |   56 +-
  board/atmel/at91sam9263ek/config.mk                |    1 -
  board/atmel/at91sam9263ek/led.c                    |   23 +-
  board/atmel/at91sam9rlek/at91sam9rlek.c            |   73 +-
  board/atmel/at91sam9rlek/config.mk                 |    1 -
  board/atmel/at91sam9rlek/led.c                     |    6 +-
  board/davinci/dm355leopard/dm355leopard.c          |    2 +-
  board/davinci/dm365evm/dm365evm.c                  |    2 +-
  .../in-circuit/grasshopper}/Makefile               |   29 +-
  board/in-circuit/grasshopper/grasshopper.c         |  112 ++
  board/spear/common/spr_misc.c                      |   10 +-
  board/st-ericsson/u8500/u8500_href.c               |    1 +
  board/ti/evm/evm.c                                 |   45 +-
  board/ti/evm/evm.h                                 |    1 +
  board/ti/panda/Makefile                            |    2 +
  board/ti/panda/panda.c                             |   25 +-
  board/ti/{sdp4430/sdp.h => panda/panda_mux_data.h} |   76 +-
  board/ti/sdp4430/Makefile                          |    2 +
  board/ti/sdp4430/config.mk                         |   31 -
  board/ti/sdp4430/sdp.c                             |   25 +-
  .../{panda/panda.h => sdp4430/sdp4430_mux_data.h}  |  128 +--
  boards.cfg                                         |   17 +
  common/image.c                                     |    6 +-
  doc/README.at91-soc                                |   22 -
  drivers/gpio/Makefile                              |    1 +
  drivers/gpio/da8xx_gpio.c                          |  281 +++++
  drivers/spi/atmel_dataflash_spi.c                  |   16 +-
  drivers/usb/musb/da8xx.h                           |    2 +-
  include/configs/a320evb.h                          |   34 +-
  include/configs/am3517_crane.h                     |    1 -
  include/configs/am3517_evm.h                       |    1 -
  include/configs/at91sam9261ek.h                    |  133 ++-
  include/configs/at91sam9263ek.h                    |   83 +-
  include/configs/at91sam9rlek.h                     |   85 +-
  include/configs/ca9x4_ct_vxp.h                     |    3 -
  include/configs/cm_t35.h                           |    1 -
  include/configs/devkit8000.h                       |    1 -
  include/configs/dig297.h                           |    1 -
  include/configs/grasshopper.h                      |  198 +++
  include/configs/igep0020.h                         |    1 -
  include/configs/igep0030.h                         |    1 -
  include/configs/omap3_beagle.h                     |    1 -
  include/configs/omap3_evm.h                        |    1 -
  include/configs/omap3_overo.h                      |    1 -
  include/configs/omap3_pandora.h                    |    1 -
  include/configs/omap3_sdp3430.h                    |    1 -
  include/configs/omap3_zoom1.h                      |    1 -
  include/configs/omap3_zoom2.h                      |    1 -
  include/configs/omap4_panda.h                      |   38 +-
  include/configs/omap4_sdp4430.h                    |   38 +-
  include/configs/s5p_goni.h                         |    1 -
  include/configs/s5pc210_universal.h                |    1 -
  include/configs/smdkc100.h                         |    1 -
  include/configs/smdkv310.h                         |    4 +-
  include/configs/spear-common.h                     |   12 +
  include/configs/versatile.h                        |   21 +-
  include/image.h                                    |    1 +
  mmc_spl/board/samsung/smdkv310/Makefile            |   12 +-
  net/eth.c                                          |    4 -
  spl/Makefile                                       |    6 +
  tools/Makefile                                     |    2 +
  tools/mkimage.c                                    |    2 +
  tools/mkimage.h                                    |    1 +
  tools/omap/clocks_get_m_n.c                        |  197 +++
  tools/omapimage.c                                  |  224 ++++
  tools/omapimage.h                                  |   50 +
  140 files changed, 7628 insertions(+), 4278 deletions(-)
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/bcm5221.c
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/dm9161.c
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/ether.c
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/i2c.c
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/ks8721.c
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/lowlevel_init.S
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/lxt972.c
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/reset.c
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/spi.c
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/timer.c
  delete mode 100644 arch/arm/cpu/arm920t/at91rm9200/usb.c
  create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/asm-offsets.c
  rename arch/arm/cpu/armv7/{omap3 => omap-common}/gpio.c (76%)
  create mode 100644 arch/arm/cpu/armv7/omap-common/spl.c
  create mode 100644 arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
  create mode 100644 arch/arm/cpu/armv7/omap-common/utils.c
  create mode 100644 arch/arm/cpu/armv7/omap4/clocks.c
  rename {board/ti/panda => arch/arm/cpu/armv7/omap4}/config.mk (64%)
  create mode 100644 arch/arm/cpu/armv7/omap4/emif.c
  create mode 100644 arch/arm/cpu/armv7/omap4/omap4_mux_data.h
  create mode 100644 arch/arm/cpu/armv7/omap4/sdram_elpida.c
  delete mode 100644 arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h
  delete mode 100644 arch/arm/include/asm/arch-at91rm9200/hardware.h
  rename arch/arm/include/asm/arch-davinci/{gpio_defs.h => gpio.h} (90%)
  delete mode 100644 arch/arm/include/asm/arch-mb86r0x/asm-offsets.h
  create mode 100644 arch/arm/include/asm/arch-omap4/clocks.h
  create mode 100644 arch/arm/include/asm/arch-omap4/emif.h
  create mode 100644 arch/arm/include/asm/omap_common.h
  rename arch/arm/include/asm/{arch-omap3/gpio.h => omap_gpio.h} (67%)
  delete mode 100644 board/armltd/versatile/config.mk
  delete mode 100644 board/atmel/at91sam9261ek/config.mk
  delete mode 100644 board/atmel/at91sam9263ek/config.mk
  delete mode 100644 board/atmel/at91sam9rlek/config.mk
  rename {arch/arm/cpu/arm920t/at91rm9200 => 
board/in-circuit/grasshopper}/Makefile (73%)
  create mode 100644 board/in-circuit/grasshopper/grasshopper.c
  rename board/ti/{sdp4430/sdp.h => panda/panda_mux_data.h} (76%)
  delete mode 100644 board/ti/sdp4430/config.mk
  rename board/ti/{panda/panda.h => sdp4430/sdp4430_mux_data.h} (67%)
  create mode 100644 drivers/gpio/da8xx_gpio.c
  create mode 100644 include/configs/grasshopper.h
  create mode 100644 tools/omap/clocks_get_m_n.c
  create mode 100644 tools/omapimage.c
  create mode 100644 tools/omapimage.h

Amicalement,
Albert ARIBAUD - Aug. 4, 2011, 4:53 p.m.
Hi Wolfgang,

Le 04/08/2011 14:28, Albert ARIBAUD a écrit :
> Hi Wolfgang,
>
> Here is my pull request for u-boot-arm/master, from which I did remove
> the wrongly applied commits that you indicated and in which all patches
> submitted before the merge window closure are taken into account.
>
> Developers, please direct complaints to me for any ARM-directed patches
> submitted before the window closure, and which is not accounted for at
> this point.
>
> Still to apply are  bugfix patches submitted after window closure as
> well as the UTF-8 conversion patch and the ARM board removal patch.
>
> The following changes since commit d50a8f45c9a640b3bcbd0ede91f83c8646cca018:
>
>     Merge branch 'master' of git://git.denx.de/u-boot-mmc (2011-08-02
> 22:39:36 +0200)
>
> are available in the git repository at:
>
>     git://git.denx.de/u-boot-arm.git master

As I have pulled Parfulla's tree, please disregard this request, I am 
re-sending an updated one one right away.

Amicalement,