Skip to contentSkip to conversation

Pull request: u-boot-arm/master

U-Boot Applied Albert ARIBAUD 3 participants 5 messages Jul 18, 2011 – Aug 12, 2011

lore
Share & tools
lore

Albert ARIBAUD

author
#0 lore raw

Hi Wolfgang,

The following changes since commit 68d4230c3ccce96a72c5b99e48399bf1796fe3c6:

powerpc/85xx: Add default usb mode and phy type to hwconfig
(2011-07-11 13:24:21 -0500)

are available in the git repository at:
git://git.denx.de/u-boot-arm.git master

Albert ARIBAUD (1):
Remove volatile qualifier in get_ram_size() calls

Chan-Taek Park (1):
TI: TNETV107X Fix Build Error

David Jander (1):
ARM: MX5: Fix broken leftover TO-2 errata workaround

Fabio Estevam (2):
mx31pdk: cosmetic: Fix line over 80 characters
mx27: Make the UART port number explicit

Graeme Russ (1):
Timer: Fix misuse of ARM *timer_masked() functions outside arch/arm

Igor Grinberg (1):
arm: add CONFIG_MACH_TYPE setting and documentation

Jana Rapava (2):
EfikaMX: Use correct imximage.cfg
EfikaMX: Add missing CONFIG_SYS_TEXT_BASE

Marek Vasut (1):
EfikaMX: Enable EXT2 booting

Matthias Weisser (7):
build: Add targets for auto gen of asm-offsets.h and use it in imx35
imx: Add get_tbclk() function for imx25
imx: Use correct imx25 reset.c
imx: Add support for USB EHCI on imx25
imx: Add auto generation of asm-offsets.h for imx25
imx: Make imx25 compatible to mxc_gpio driver and fix in tx25
imx: Add support for zmx25 board

Rob Herring (2):
arm: add __ilog2 function
ARM: add missing CONFIG_SKIP_LOWLEVEL_INIT for armv7

Stefano Babic (3):
MX5: Update to autogenerated asm-offsets.h
MX27: Update to autogenerated asm-offsets.h
MX31: Cleanup clock function

Torsten Koschorrek (2):
ARM: Update maintainer of board scb9328
scb9328: Add ARM relocation support

Yegor Yefremov (1):
am3517evm: change console device from ttyS2 to ttyO2

  MAINTAINERS                                  |    7 +-
  README                                       |   10 ++
  arch/arm/cpu/arm1136/mx31/generic.c          |   21 +++-
  arch/arm/cpu/arm1136/mx35/Makefile           |   11 --
  arch/arm/cpu/arm926ejs/mx25/Makefile         |    8 +-
  arch/arm/cpu/arm926ejs/mx25/asm-offsets.c    |   60 ++++++++
  arch/arm/cpu/arm926ejs/mx25/timer.c          |   12 ++
  arch/arm/cpu/arm926ejs/mx27/Makefile         |    2 +
  arch/arm/cpu/arm926ejs/mx27/asm-offsets.c    |   45 ++++++
  arch/arm/cpu/arm926ejs/mx27/generic.c        |    2 +-
  arch/arm/cpu/arm926ejs/orion5x/dram.c        |    4 +-
  arch/arm/cpu/armv7/mx5/Makefile              |    2 +
  arch/arm/cpu/armv7/mx5/asm-offsets.c         |   76 ++++++++++
  arch/arm/cpu/armv7/mx5/lowlevel_init.S       |    6 +-
  arch/arm/cpu/armv7/start.S                   |    2 +
  arch/arm/include/asm/arch-mx25/imx-regs.h    |   49 ++++++-
  arch/arm/include/asm/arch-mx25/macro.h       |   64 ++++++++
  arch/arm/include/asm/arch-mx27/asm-offsets.h |   16 --
  arch/arm/include/asm/arch-mx27/imx-regs.h    |    2 +-
  arch/arm/include/asm/arch-mx31/clock.h       |   11 +-
  arch/arm/include/asm/arch-mx31/imx-regs.h    |    2 +-
  arch/arm/include/asm/arch-mx5/asm-offsets.h  |   55 -------
  arch/arm/include/asm/arch-mx5/imx-regs.h     |   18 +++
  arch/arm/include/asm/bitops.h                |    5 +
  arch/arm/lib/board.c                         |    4 +
  board/BuS/eb_cpux9k2/cpux9k2.c               |    2 +-
  board/armadillo/flash.c                      |    6 +-
  board/atmel/at91rm9200dk/flash.c             |   10 +-
  board/atmel/at91rm9200ek/at91rm9200ek.c      |    2 +-
  board/cerf250/flash.c                        |   14 +-
  board/cm4008/flash.c                         |   10 +-
  board/cm41xx/flash.c                         |   10 +-
  board/cmc_pu2/flash.c                        |   11 +-
  board/cradle/flash.c                         |   10 +-
  board/csb226/flash.c                         |   10 +-
  board/davedenx/qong/qong.c                   |    2 +-
  board/davinci/common/misc.c                  |    2 +-
  board/dnp1110/flash.c                        |   14 +-
  board/efikamx/efikamx.c                      |    2 +-
  board/ep7312/flash.c                         |   10 +-
  board/eukrea/cpu9260/cpu9260.c               |    2 +-
  board/eukrea/cpuat91/cpuat91.c               |    2 +-
  board/freescale/mx31ads/mx31ads.c            |    2 +-
  board/freescale/mx31pdk/mx31pdk.c            |    2 +-
  board/freescale/mx51evk/mx51evk.c            |    2 +-
  board/freescale/mx53ard/mx53ard.c            |    4 +-
  board/freescale/mx53evk/mx53evk.c            |    2 +-
  board/freescale/mx53loco/mx53loco.c          |    4 +-
  board/freescale/mx53smd/mx53smd.c            |    4 +-
  board/gcplus/flash.c                         |   14 +-
  board/impa7/flash.c                          |   10 +-
  board/imx31_phycore/imx31_phycore.c          |    2 +-
  board/innokom/flash.c                        |   10 +-
  board/karo/tx25/tx25.c                       |   32 ++--
  board/keymile/km_arm/km_arm.c                |    2 +-
  board/lart/flash.c                           |   10 +-
  board/logicpd/imx27lite/imx27lite.c          |    8 +-
  board/logicpd/imx31_litekit/imx31_litekit.c  |    2 +-
  board/lpd7a40x/flash.c                       |   10 +-
  board/lubbock/flash.c                        |   14 +-
  board/modnet50/flash.c                       |   14 +-
  board/mx1ads/mx1ads.c                        |    2 +-
  board/mx1ads/syncflash.c                     |    2 +-
  board/ns9750dev/flash.c                      |   15 +-
  board/pleb2/flash.c                          |   18 +-
  board/ronetix/pm9261/pm9261.c                |    2 +-
  board/ronetix/pm9263/pm9263.c                |    2 +-
  board/ronetix/pm9g45/pm9g45.c                |    2 +-
  board/samsung/smdk2400/flash.c               |   10 +-
  board/sbc2410x/flash.c                       |   10 +-
  board/scb9328/config.mk                      |   10 --
  board/scb9328/flash.c                        |    5 +-
  board/scb9328/scb9328.c                      |   24 +--
  board/shannon/flash.c                        |   10 +-
  board/syteco/jadecpu/jadecpu.c               |    2 +-
  board/syteco/zmx25/Makefile                  |   51 +++++++
  board/syteco/zmx25/lowlevel_init.S           |  110 ++++++++++++++
  board/syteco/zmx25/zmx25.c                   |  203 
++++++++++++++++++++++++++
  board/ti/omap1610inn/flash.c                 |   15 +-
  board/ti/omap730p2/flash.c                   |   15 +-
  board/xaeniax/flash.c                        |   14 +-
  board/xm250/flash.c                          |   23 ++--
  board/zylonite/flash.c                       |   14 +-
  boards.cfg                                   |    3 +-
  common/memsize.c                             |    2 +-
  drivers/mtd/spi/eeprom_m95xxx.c              |    5 +-
  drivers/net/fec_mxc.c                        |    6 +-
  drivers/net/netarm_eth.c                     |   12 +-
  drivers/spi/mxc_spi.c                        |    2 -
  drivers/usb/host/ehci-mxc.c                  |   33 +++-
  include/common.h                             |    2 +-
  include/configs/am3517_evm.h                 |    2 +-
  include/configs/efikamx.h                    |    3 +
  include/configs/mx31pdk.h                    |    6 +-
  include/configs/scb9328.h                    |    5 +
  include/configs/tnetv107x_evm.h              |    6 +
  include/configs/zmx25.h                      |  180 
+++++++++++++++++++++++
  include/mxc_gpio.h                           |    5 +
  rules.mk                                     |   10 ++
  99 files changed, 1242 insertions(+), 360 deletions(-)

create mode 100644 arch/arm/cpu/arm926ejs/mx25/asm-offsets.c create mode 100644 arch/arm/cpu/arm926ejs/mx27/asm-offsets.c create mode 100644 arch/arm/cpu/armv7/mx5/asm-offsets.c create mode 100644 arch/arm/include/asm/arch-mx25/macro.h delete mode 100644 arch/arm/include/asm/arch-mx27/asm-offsets.h delete mode 100644 arch/arm/include/asm/arch-mx5/asm-offsets.h delete mode 100644 board/scb9328/config.mk
create mode 100644 board/syteco/zmx25/Makefile
create mode 100644 board/syteco/zmx25/lowlevel_init.S create mode 100644 board/syteco/zmx25/zmx25.c
create mode 100644 include/configs/zmx25.h

Amicalement,

Signature · 1 line
Albert.
author
#3 lore raw

Hi Igor,

Quoted 10 lines · Albert ARIBAUD

Hi Igor,

Quoted 8 lines
Quoted 2 lines

Igor Grinberg (1):
arm: add CONFIG_MACH_TYPE setting and documentation

hmm... no [2/3] and [3/3]... ?

http://patchwork.ozlabs.org/patch/103048/
http://patchwork.ozlabs.org/patch/103047/

Quoted 6 lines
Quoted 1 line

When do you plan to pull these?

Thanks for reminding me. I'll pull them in after I've applied the u-boot-ti/master branch.

Amicalement,

Better late, they say... Applied to u-boot-arm/master, thanks.

Amicalement,

Signature · 1 line
Albert.
Applied
#4 lore raw
In reply to Albert ARIBAUD

Dear Albert ARIBAUD,

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

Hi Wolfgang,

The following changes since commit 68d4230c3ccce96a72c5b99e48399bf1796fe3c6:

powerpc/85xx: Add default usb mode and phy type to hwconfig
(2011-07-11 13:24:21 -0500)

are available in the git repository at:
git://git.denx.de/u-boot-arm.git master

Albert ARIBAUD (1):
Remove volatile qualifier in get_ram_size() calls

Chan-Taek Park (1):
TI: TNETV107X Fix Build Error

David Jander (1):
ARM: MX5: Fix broken leftover TO-2 errata workaround

Fabio Estevam (2):
mx31pdk: cosmetic: Fix line over 80 characters
mx27: Make the UART port number explicit

Graeme Russ (1):
Timer: Fix misuse of ARM *timer_masked() functions outside arch/arm

Igor Grinberg (1):
arm: add CONFIG_MACH_TYPE setting and documentation

Jana Rapava (2):
EfikaMX: Use correct imximage.cfg
EfikaMX: Add missing CONFIG_SYS_TEXT_BASE

Marek Vasut (1):
EfikaMX: Enable EXT2 booting

Matthias Weisser (7):
build: Add targets for auto gen of asm-offsets.h and use it in imx35
imx: Add get_tbclk() function for imx25
imx: Use correct imx25 reset.c
imx: Add support for USB EHCI on imx25
imx: Add auto generation of asm-offsets.h for imx25
imx: Make imx25 compatible to mxc_gpio driver and fix in tx25
imx: Add support for zmx25 board

Rob Herring (2):
arm: add __ilog2 function
ARM: add missing CONFIG_SKIP_LOWLEVEL_INIT for armv7

Stefano Babic (3):
MX5: Update to autogenerated asm-offsets.h
MX27: Update to autogenerated asm-offsets.h
MX31: Cleanup clock function

Torsten Koschorrek (2):
ARM: Update maintainer of board scb9328
scb9328: Add ARM relocation support

Yegor Yefremov (1):
am3517evm: change console device from ttyS2 to ttyO2

  MAINTAINERS                                  |    7 +-
  README                                       |   10 ++
  arch/arm/cpu/arm1136/mx31/generic.c          |   21 +++-
  arch/arm/cpu/arm1136/mx35/Makefile           |   11 --
  arch/arm/cpu/arm926ejs/mx25/Makefile         |    8 +-
  arch/arm/cpu/arm926ejs/mx25/asm-offsets.c    |   60 ++++++++
  arch/arm/cpu/arm926ejs/mx25/timer.c          |   12 ++
  arch/arm/cpu/arm926ejs/mx27/Makefile         |    2 +
  arch/arm/cpu/arm926ejs/mx27/asm-offsets.c    |   45 ++++++
  arch/arm/cpu/arm926ejs/mx27/generic.c        |    2 +-
  arch/arm/cpu/arm926ejs/orion5x/dram.c        |    4 +-
  arch/arm/cpu/armv7/mx5/Makefile              |    2 +
  arch/arm/cpu/armv7/mx5/asm-offsets.c         |   76 ++++++++++
  arch/arm/cpu/armv7/mx5/lowlevel_init.S       |    6 +-
  arch/arm/cpu/armv7/start.S                   |    2 +
  arch/arm/include/asm/arch-mx25/imx-regs.h    |   49 ++++++-
  arch/arm/include/asm/arch-mx25/macro.h       |   64 ++++++++
  arch/arm/include/asm/arch-mx27/asm-offsets.h |   16 --
  arch/arm/include/asm/arch-mx27/imx-regs.h    |    2 +-
  arch/arm/include/asm/arch-mx31/clock.h       |   11 +-
  arch/arm/include/asm/arch-mx31/imx-regs.h    |    2 +-
  arch/arm/include/asm/arch-mx5/asm-offsets.h  |   55 -------
  arch/arm/include/asm/arch-mx5/imx-regs.h     |   18 +++
  arch/arm/include/asm/bitops.h                |    5 +
  arch/arm/lib/board.c                         |    4 +
  board/BuS/eb_cpux9k2/cpux9k2.c               |    2 +-
  board/armadillo/flash.c                      |    6 +-
  board/atmel/at91rm9200dk/flash.c             |   10 +-
  board/atmel/at91rm9200ek/at91rm9200ek.c      |    2 +-
  board/cerf250/flash.c                        |   14 +-
  board/cm4008/flash.c                         |   10 +-
  board/cm41xx/flash.c                         |   10 +-
  board/cmc_pu2/flash.c                        |   11 +-
  board/cradle/flash.c                         |   10 +-
  board/csb226/flash.c                         |   10 +-
  board/davedenx/qong/qong.c                   |    2 +-
  board/davinci/common/misc.c                  |    2 +-
  board/dnp1110/flash.c                        |   14 +-
  board/efikamx/efikamx.c                      |    2 +-
  board/ep7312/flash.c                         |   10 +-
  board/eukrea/cpu9260/cpu9260.c               |    2 +-
  board/eukrea/cpuat91/cpuat91.c               |    2 +-
  board/freescale/mx31ads/mx31ads.c            |    2 +-
  board/freescale/mx31pdk/mx31pdk.c            |    2 +-
  board/freescale/mx51evk/mx51evk.c            |    2 +-
  board/freescale/mx53ard/mx53ard.c            |    4 +-
  board/freescale/mx53evk/mx53evk.c            |    2 +-
  board/freescale/mx53loco/mx53loco.c          |    4 +-
  board/freescale/mx53smd/mx53smd.c            |    4 +-
  board/gcplus/flash.c                         |   14 +-
  board/impa7/flash.c                          |   10 +-
  board/imx31_phycore/imx31_phycore.c          |    2 +-
  board/innokom/flash.c                        |   10 +-
  board/karo/tx25/tx25.c                       |   32 ++--
  board/keymile/km_arm/km_arm.c                |    2 +-
  board/lart/flash.c                           |   10 +-
  board/logicpd/imx27lite/imx27lite.c          |    8 +-
  board/logicpd/imx31_litekit/imx31_litekit.c  |    2 +-
  board/lpd7a40x/flash.c                       |   10 +-
  board/lubbock/flash.c                        |   14 +-
  board/modnet50/flash.c                       |   14 +-
  board/mx1ads/mx1ads.c                        |    2 +-
  board/mx1ads/syncflash.c                     |    2 +-
  board/ns9750dev/flash.c                      |   15 +-
  board/pleb2/flash.c                          |   18 +-
  board/ronetix/pm9261/pm9261.c                |    2 +-
  board/ronetix/pm9263/pm9263.c                |    2 +-
  board/ronetix/pm9g45/pm9g45.c                |    2 +-
  board/samsung/smdk2400/flash.c               |   10 +-
  board/sbc2410x/flash.c                       |   10 +-
  board/scb9328/config.mk                      |   10 --
  board/scb9328/flash.c                        |    5 +-
  board/scb9328/scb9328.c                      |   24 +--
  board/shannon/flash.c                        |   10 +-
  board/syteco/jadecpu/jadecpu.c               |    2 +-
  board/syteco/zmx25/Makefile                  |   51 +++++++
  board/syteco/zmx25/lowlevel_init.S           |  110 ++++++++++++++
  board/syteco/zmx25/zmx25.c                   |  203 
++++++++++++++++++++++++++
  board/ti/omap1610inn/flash.c                 |   15 +-
  board/ti/omap730p2/flash.c                   |   15 +-
  board/xaeniax/flash.c                        |   14 +-
  board/xm250/flash.c                          |   23 ++--
  board/zylonite/flash.c                       |   14 +-
  boards.cfg                                   |    3 +-
  common/memsize.c                             |    2 +-
  drivers/mtd/spi/eeprom_m95xxx.c              |    5 +-
  drivers/net/fec_mxc.c                        |    6 +-
  drivers/net/netarm_eth.c                     |   12 +-
  drivers/spi/mxc_spi.c                        |    2 -
  drivers/usb/host/ehci-mxc.c                  |   33 +++-
  include/common.h                             |    2 +-
  include/configs/am3517_evm.h                 |    2 +-
  include/configs/efikamx.h                    |    3 +
  include/configs/mx31pdk.h                    |    6 +-
  include/configs/scb9328.h                    |    5 +
  include/configs/tnetv107x_evm.h              |    6 +
  include/configs/zmx25.h                      |  180 
+++++++++++++++++++++++
  include/mxc_gpio.h                           |    5 +
  rules.mk                                     |   10 ++
  99 files changed, 1242 insertions(+), 360 deletions(-)
Quoted 11 lines

create mode 100644 arch/arm/cpu/arm926ejs/mx25/asm-offsets.c create mode 100644 arch/arm/cpu/arm926ejs/mx27/asm-offsets.c create mode 100644 arch/arm/cpu/armv7/mx5/asm-offsets.c create mode 100644 arch/arm/include/asm/arch-mx25/macro.h delete mode 100644 arch/arm/include/asm/arch-mx27/asm-offsets.h delete mode 100644 arch/arm/include/asm/arch-mx5/asm-offsets.h delete mode 100644 board/scb9328/config.mk
create mode 100644 board/syteco/zmx25/Makefile
create mode 100644 board/syteco/zmx25/lowlevel_init.S create mode 100644 board/syteco/zmx25/zmx25.c
create mode 100644 include/configs/zmx25.h

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 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
I know engineers. They love to change things.             - Dr. McCoy