Skip to contentSkip to conversation

Pull request: u-boot-arm/master

U-Boot Applied Albert ARIBAUD 2 participants 2 messages Dec 24, 2011 – Jan 5, 2012

lore
Share & tools
lore
#0 lore raw

Hi Wolfgang,

Following the opening of the merge window, the following changes since commit bfcc40bb09b05c90cc3b1496abb270eb8aa72134:

Merge branch 'next' of ../next (2011-12-23 20:53:58 +0100)

are available in the git repository at:

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

Christian Riesch (7):
spl: display_options.o is required for SPI flash support in SPL
sf: Add spi_boot() to allow booting from SPI flash in an SPL arm, davinci: Add SPL support for DA850 SoCs
arm, da850evm: Add an SPL for SPI boot
mkimage: Fix variable length header support
arm, davinci: Add support for generating AIS images to the Makefile arm, davinci: Fix build warnings for cam_enc_4xx

Fabio Estevam (1):
vision2: Fix checkpatch warning

Simon Glass (14):
tegra2: Tidy UART selection
tegra2: Add UARTB support
tegra2: config: Enable SPI flash on Seaboard
tegra2: Enable SPI environment on Seaboard
tegra2: Implement SPI / UART GPIO switch
tegra2: spi: Support SPI / UART switch
tegra2: Plumb in SPI/UART switch code
tegra: Fix build error in plutux, medcom
tegra: Move cpu_init_cp15() to arch_cpu_init()
tegra: Move clock_early_init() to arch_cpu_init()
tegra: add clock_ll_start_uart() to enable UART prior to reloc
tegra: Add a function mux feature
tegra: Add support for UART init in cpu board.c
tegra: Move boards over to use arch-level board UART function

Stefano Babic (2):
ARM: omap3: added common configuration for Technexion TAM3517
ARM: omap3: add support to Technexion twister board

Thierry Reding (7):
tegra2: Always build with USE_PRIVATE_LIBGCC=yes.
tegra2: Change CONFIG_SYS_TEXT_BASE to 0x00108000.
tegra2: Move tegra2_mmc_init() prototype to public header.
tegra2: Add common Avionic Design Tamonten support.
tegra2: Add Avionic Design Plutux support.
tegra2: Add Avionic Design Medcom support.
tegra2: Optimize out-of-tree build for Ventana.

Thomas Weber (1):
Devkit8000: Switch over to enable_gpmc_cs_config

Tom Warren (2):
tegra2: spi: Add SPI driver for Tegra2 SOC
arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master

  .gitignore                                         |    1 +
  MAINTAINERS                                        |    6 +
  Makefile                                           |   13 +
  arch/arm/cpu/arm926ejs/davinci/Makefile            |    3 +-
  arch/arm/cpu/arm926ejs/davinci/spl.c               |   35 ++-
  arch/arm/cpu/armv7/tegra2/Makefile                 |    2 +-
  arch/arm/cpu/armv7/tegra2/board.c                  |   58 +++
  arch/arm/cpu/armv7/tegra2/clock.c                  |   14 +
  arch/arm/cpu/armv7/tegra2/config.mk                |    2 +
  arch/arm/cpu/armv7/tegra2/funcmux.c                |   58 +++
  arch/arm/include/asm/arch-tegra2/board.h           |   30 ++
  arch/arm/include/asm/arch-tegra2/clock.h           |   11 +
  arch/arm/include/asm/arch-tegra2/funcmux.h         |   41 ++
  arch/arm/include/asm/arch-tegra2/mmc.h             |   27 ++
  arch/arm/include/asm/arch-tegra2/tegra2.h          |    1 +
  arch/arm/include/asm/arch-tegra2/tegra2_spi.h      |   76 ++++
  arch/arm/include/asm/arch-tegra2/uart-spi-switch.h |   46 +++
  board/avionic-design/common/tamonten.c             |  116 ++++++
  board/avionic-design/common/tamonten.h             |   32 ++
  board/avionic-design/medcom/Makefile               |   50 +++
  board/avionic-design/medcom/medcom.c               |   45 +++
  board/avionic-design/plutux/Makefile               |   50 +++
  board/avionic-design/plutux/plutux.c               |   45 +++
  board/davinci/da8xxevm/da850evm.c                  |    4 +-
  board/davinci/da8xxevm/u-boot-spl.lds              |   73 ++++
  board/nvidia/common/Makefile                       |   47 +++
  board/nvidia/common/board.c                        |   73 +---
  board/nvidia/common/board.h                        |    2 +-
  board/nvidia/common/uart-spi-switch.c              |  138 +++++++
  board/nvidia/harmony/Makefile                      |    1 -
  board/nvidia/harmony/harmony.c                     |    2 +-
  board/nvidia/seaboard/Makefile                     |    1 -
  board/nvidia/seaboard/seaboard.c                   |    5 +-
  board/nvidia/ventana/Makefile                      |    6 +-
  board/technexion/twister/Makefile                  |   38 ++
  board/technexion/twister/twister.c                 |  116 ++++++
  board/technexion/twister/twister.h                 |  411 
++++++++++++++++++++
  board/timll/devkit8000/devkit8000.c                |   19 +-
  board/ttcontrol/vision2/vision2.c                  |    3 +-
  boards.cfg                                         |    3 +
  doc/README.SPL                                     |    1 +
  doc/README.davinci                                 |    9 +
  drivers/mmc/tegra2_mmc.h                           |    2 -
  drivers/mtd/spi/Makefile                           |    4 +
  drivers/mtd/spi/spi_spl_load.c                     |   58 +++
  drivers/spi/Makefile                               |    1 +
  drivers/spi/tegra2_spi.c                           |  279 +++++++++++++
  include/configs/da850evm.h                         |   87 ++++
  include/configs/harmony.h                          |    3 +
  include/configs/medcom.h                           |   64 +++
  include/configs/plutux.h                           |   64 +++
  include/configs/seaboard.h                         |   20 +
  include/configs/tam3517-common.h                   |  361 
+++++++++++++++++
  include/configs/tegra2-common.h                    |    5 +-
  include/configs/twister.h                          |   54 +++
  include/configs/ventana.h                          |    3 +
  include/spi_flash.h                                |    3 +
  lib/Makefile                                       |    2 +
  tools/mkimage.c                                    |   97 +++---
  59 files changed, 2687 insertions(+), 134 deletions(-)

create mode 100644 arch/arm/cpu/armv7/tegra2/funcmux.c create mode 100644 arch/arm/include/asm/arch-tegra2/board.h create mode 100644 arch/arm/include/asm/arch-tegra2/funcmux.h create mode 100644 arch/arm/include/asm/arch-tegra2/mmc.h create mode 100644 arch/arm/include/asm/arch-tegra2/tegra2_spi.h create mode 100644 arch/arm/include/asm/arch-tegra2/uart-spi-switch.h create mode 100644 board/avionic-design/common/tamonten.c create mode 100644 board/avionic-design/common/tamonten.h create mode 100644 board/avionic-design/medcom/Makefile create mode 100644 board/avionic-design/medcom/medcom.c create mode 100644 board/avionic-design/plutux/Makefile create mode 100644 board/avionic-design/plutux/plutux.c create mode 100644 board/davinci/da8xxevm/u-boot-spl.lds create mode 100644 board/nvidia/common/Makefile
create mode 100644 board/nvidia/common/uart-spi-switch.c create mode 100644 board/technexion/twister/Makefile create mode 100644 board/technexion/twister/twister.c create mode 100644 board/technexion/twister/twister.h create mode 100644 drivers/mtd/spi/spi_spl_load.c
create mode 100644 drivers/spi/tegra2_spi.c
create mode 100644 include/configs/medcom.h
create mode 100644 include/configs/plutux.h
create mode 100644 include/configs/tam3517-common.h
create mode 100644 include/configs/twister.h

Amicalement,

Signature · 1 line
Albert.
#1 lore raw

Dear Albert ARIBAUD,

Quoted 137 lines · In message <[email protected]> you wrote:

Hi Wolfgang,

Following the opening of the merge window, the following changes since commit bfcc40bb09b05c90cc3b1496abb270eb8aa72134:

   Merge branch 'next' of ../next (2011-12-23 20:53:58 +0100)

are available in the git repository at:

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

Christian Riesch (7):
spl: display_options.o is required for SPI flash support in SPL
sf: Add spi_boot() to allow booting from SPI flash in an SPL arm, davinci: Add SPL support for DA850 SoCs
arm, da850evm: Add an SPL for SPI boot
mkimage: Fix variable length header support
arm, davinci: Add support for generating AIS images to the Makefile arm, davinci: Fix build warnings for cam_enc_4xx

Fabio Estevam (1):
vision2: Fix checkpatch warning

Simon Glass (14):
tegra2: Tidy UART selection
tegra2: Add UARTB support
tegra2: config: Enable SPI flash on Seaboard
tegra2: Enable SPI environment on Seaboard
tegra2: Implement SPI / UART GPIO switch
tegra2: spi: Support SPI / UART switch
tegra2: Plumb in SPI/UART switch code
tegra: Fix build error in plutux, medcom
tegra: Move cpu_init_cp15() to arch_cpu_init()
tegra: Move clock_early_init() to arch_cpu_init()
tegra: add clock_ll_start_uart() to enable UART prior to reloc
tegra: Add a function mux feature
tegra: Add support for UART init in cpu board.c
tegra: Move boards over to use arch-level board UART function

Stefano Babic (2):
ARM: omap3: added common configuration for Technexion TAM3517
ARM: omap3: add support to Technexion twister board

Thierry Reding (7):
tegra2: Always build with USE_PRIVATE_LIBGCC=yes.
tegra2: Change CONFIG_SYS_TEXT_BASE to 0x00108000.
tegra2: Move tegra2_mmc_init() prototype to public header.
tegra2: Add common Avionic Design Tamonten support.
tegra2: Add Avionic Design Plutux support.
tegra2: Add Avionic Design Medcom support.
tegra2: Optimize out-of-tree build for Ventana.

Thomas Weber (1):
Devkit8000: Switch over to enable_gpmc_cs_config

Tom Warren (2):
tegra2: spi: Add SPI driver for Tegra2 SOC
arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master

  .gitignore                                         |    1 +
  MAINTAINERS                                        |    6 +
  Makefile                                           |   13 +
  arch/arm/cpu/arm926ejs/davinci/Makefile            |    3 +-
  arch/arm/cpu/arm926ejs/davinci/spl.c               |   35 ++-
  arch/arm/cpu/armv7/tegra2/Makefile                 |    2 +-
  arch/arm/cpu/armv7/tegra2/board.c                  |   58 +++
  arch/arm/cpu/armv7/tegra2/clock.c                  |   14 +
  arch/arm/cpu/armv7/tegra2/config.mk                |    2 +
  arch/arm/cpu/armv7/tegra2/funcmux.c                |   58 +++
  arch/arm/include/asm/arch-tegra2/board.h           |   30 ++
  arch/arm/include/asm/arch-tegra2/clock.h           |   11 +
  arch/arm/include/asm/arch-tegra2/funcmux.h         |   41 ++
  arch/arm/include/asm/arch-tegra2/mmc.h             |   27 ++
  arch/arm/include/asm/arch-tegra2/tegra2.h          |    1 +
  arch/arm/include/asm/arch-tegra2/tegra2_spi.h      |   76 ++++
  arch/arm/include/asm/arch-tegra2/uart-spi-switch.h |   46 +++
  board/avionic-design/common/tamonten.c             |  116 ++++++
  board/avionic-design/common/tamonten.h             |   32 ++
  board/avionic-design/medcom/Makefile               |   50 +++
  board/avionic-design/medcom/medcom.c               |   45 +++
  board/avionic-design/plutux/Makefile               |   50 +++
  board/avionic-design/plutux/plutux.c               |   45 +++
  board/davinci/da8xxevm/da850evm.c                  |    4 +-
  board/davinci/da8xxevm/u-boot-spl.lds              |   73 ++++
  board/nvidia/common/Makefile                       |   47 +++
  board/nvidia/common/board.c                        |   73 +---
  board/nvidia/common/board.h                        |    2 +-
  board/nvidia/common/uart-spi-switch.c              |  138 +++++++
  board/nvidia/harmony/Makefile                      |    1 -
  board/nvidia/harmony/harmony.c                     |    2 +-
  board/nvidia/seaboard/Makefile                     |    1 -
  board/nvidia/seaboard/seaboard.c                   |    5 +-
  board/nvidia/ventana/Makefile                      |    6 +-
  board/technexion/twister/Makefile                  |   38 ++
  board/technexion/twister/twister.c                 |  116 ++++++
  board/technexion/twister/twister.h                 |  411 
++++++++++++++++++++
  board/timll/devkit8000/devkit8000.c                |   19 +-
  board/ttcontrol/vision2/vision2.c                  |    3 +-
  boards.cfg                                         |    3 +
  doc/README.SPL                                     |    1 +
  doc/README.davinci                                 |    9 +
  drivers/mmc/tegra2_mmc.h                           |    2 -
  drivers/mtd/spi/Makefile                           |    4 +
  drivers/mtd/spi/spi_spl_load.c                     |   58 +++
  drivers/spi/Makefile                               |    1 +
  drivers/spi/tegra2_spi.c                           |  279 +++++++++++++
  include/configs/da850evm.h                         |   87 ++++
  include/configs/harmony.h                          |    3 +
  include/configs/medcom.h                           |   64 +++
  include/configs/plutux.h                           |   64 +++
  include/configs/seaboard.h                         |   20 +
  include/configs/tam3517-common.h                   |  361 
+++++++++++++++++
  include/configs/tegra2-common.h                    |    5 +-
  include/configs/twister.h                          |   54 +++
  include/configs/ventana.h                          |    3 +
  include/spi_flash.h                                |    3 +
  lib/Makefile                                       |    2 +
  tools/mkimage.c                                    |   97 +++---
  59 files changed, 2687 insertions(+), 134 deletions(-)

create mode 100644 arch/arm/cpu/armv7/tegra2/funcmux.c create mode 100644 arch/arm/include/asm/arch-tegra2/board.h create mode 100644 arch/arm/include/asm/arch-tegra2/funcmux.h create mode 100644 arch/arm/include/asm/arch-tegra2/mmc.h create mode 100644 arch/arm/include/asm/arch-tegra2/tegra2_spi.h create mode 100644 arch/arm/include/asm/arch-tegra2/uart-spi-switch.h create mode 100644 board/avionic-design/common/tamonten.c create mode 100644 board/avionic-design/common/tamonten.h create mode 100644 board/avionic-design/medcom/Makefile create mode 100644 board/avionic-design/medcom/medcom.c create mode 100644 board/avionic-design/plutux/Makefile create mode 100644 board/avionic-design/plutux/plutux.c create mode 100644 board/davinci/da8xxevm/u-boot-spl.lds create mode 100644 board/nvidia/common/Makefile
create mode 100644 board/nvidia/common/uart-spi-switch.c create mode 100644 board/technexion/twister/Makefile

Quoted 8 lines

create mode 100644 board/technexion/twister/twister.c create mode 100644 board/technexion/twister/twister.h create mode 100644 drivers/mtd/spi/spi_spl_load.c create mode 100644 drivers/spi/tegra2_spi.c create mode 100644 include/configs/medcom.h create mode 100644 include/configs/plutux.h create mode 100644 include/configs/tam3517-common.h create mode 100644 include/configs/twister.h

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
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
egrep patterns are full regular expressions; it uses a fast  determi-
nistic algorithm that sometimes needs exponential space.
- unix manuals