Skip to contentSkip to conversation

Pull request: u-boot-imx

GIT PULL Applied Stefano Babic 2 participants 2 messages Oct 19, 2010

lore
Share & tools
lore
#0 lore raw

Hi Wolfgang,

please pull from u-boot-imx.

The following changes since commit cacc342d5aa311673efdc05770cb53246dd41c9f:

Merge branch 'master' of git://git.denx.de/u-boot-arm (2010-10-17
20:25:05 +0200)

are available in the git repository at:

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

Jason Liu (2):
MX5: rename mx51 to mx5
MX5: Remove dead code with ENABLE_IMPRECISE_ABORT

Magnus Lilja (1):
i.MX31: Fix Litekit board to use new ARM relocation support.

Stefano Babic (1):
MX31: add delay between USB port setup and reset

Wolfgang Denk (1):
QONG: fix and update board config file

 arch/arm/cpu/armv7/{mx51 => mx5}/Makefile          |    0
 arch/arm/cpu/armv7/{mx51 => mx5}/clock.c           |   42
++++++++++----------
 arch/arm/cpu/armv7/{mx51 => mx5}/iomux.c           |    2 +-
 arch/arm/cpu/armv7/{mx51 => mx5}/lowlevel_init.S   |   14 -------
 arch/arm/cpu/armv7/{mx51 => mx5}/soc.c             |   28 ++++++++-----
 arch/arm/cpu/armv7/{mx51 => mx5}/speed.c           |    0
 arch/arm/cpu/armv7/{mx51 => mx5}/timer.c           |    8 ++--
 arch/arm/cpu/armv7/{mx51 => mx5}/u-boot.lds        |    0
 .../asm/{arch-mx51 => arch-mx5}/asm-offsets.h      |    0
 .../include/asm/{arch-mx51 => arch-mx5}/clock.h    |    0
 .../include/asm/{arch-mx51 => arch-mx5}/crm_regs.h |    0
 .../include/asm/{arch-mx51 => arch-mx5}/imx-regs.h |    0
 .../include/asm/{arch-mx51 => arch-mx5}/iomux.h    |    8 ++--
 .../mx51_pins.h => arch-mx5/mx5x_pins.h}           |    6 +-
 .../asm/{arch-mx51 => arch-mx5}/sys_proto.h        |    0
 board/freescale/mx51evk/mx51evk.c                  |    2 +-
 board/logicpd/imx31_litekit/config.mk              |    2 +-
 board/logicpd/imx31_litekit/imx31_litekit.c        |   10 ++++-
 board/ttcontrol/vision2/vision2.c                  |    2 +-
 boards.cfg                                         |    4 +-
 drivers/usb/host/ehci-mxc.c                        |    2 +
 include/configs/imx31_litekit.h                    |    7 +++
 include/configs/mx51evk.h                          |    4 +-
 include/configs/qong.h                             |   32 +++++++--------
 include/configs/vision2.h                          |    4 +-
 25 files changed, 90 insertions(+), 87 deletions(-)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/Makefile (100%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/clock.c (85%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/iomux.c (99%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/lowlevel_init.S (95%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/soc.c (81%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/speed.c (100%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/timer.c (92%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/u-boot.lds (100%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/asm-offsets.h (100%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/clock.h (100%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/crm_regs.h (100%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/imx-regs.h (100%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/iomux.h (98%)
 rename arch/arm/include/asm/{arch-mx51/mx51_pins.h =>
arch-mx5/mx5x_pins.h} (99%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/sys_proto.h (100%)
Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================
#1 lore raw

Dear Stefano Babic,

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

Hi Wolfgang,

please pull from u-boot-imx.

The following changes since commit cacc342d5aa311673efdc05770cb53246dd41c9f:

Merge branch 'master' of git://git.denx.de/u-boot-arm (2010-10-17
20:25:05 +0200)

are available in the git repository at:

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

Jason Liu (2):
MX5: rename mx51 to mx5
MX5: Remove dead code with ENABLE_IMPRECISE_ABORT

Magnus Lilja (1):
i.MX31: Fix Litekit board to use new ARM relocation support.

Stefano Babic (1):
MX31: add delay between USB port setup and reset

Wolfgang Denk (1):
QONG: fix and update board config file

 arch/arm/cpu/armv7/{mx51 => mx5}/Makefile          |    0
 arch/arm/cpu/armv7/{mx51 => mx5}/clock.c           |   42
++++++++++----------
 arch/arm/cpu/armv7/{mx51 => mx5}/iomux.c           |    2 +-
 arch/arm/cpu/armv7/{mx51 => mx5}/lowlevel_init.S   |   14 -------
 arch/arm/cpu/armv7/{mx51 => mx5}/soc.c             |   28 ++++++++-----
 arch/arm/cpu/armv7/{mx51 => mx5}/speed.c           |    0
 arch/arm/cpu/armv7/{mx51 => mx5}/timer.c           |    8 ++--
 arch/arm/cpu/armv7/{mx51 => mx5}/u-boot.lds        |    0
 .../asm/{arch-mx51 => arch-mx5}/asm-offsets.h      |    0
 .../include/asm/{arch-mx51 => arch-mx5}/clock.h    |    0
 .../include/asm/{arch-mx51 => arch-mx5}/crm_regs.h |    0
 .../include/asm/{arch-mx51 => arch-mx5}/imx-regs.h |    0
 .../include/asm/{arch-mx51 => arch-mx5}/iomux.h    |    8 ++--
 .../mx51_pins.h => arch-mx5/mx5x_pins.h}           |    6 +-
 .../asm/{arch-mx51 => arch-mx5}/sys_proto.h        |    0
 board/freescale/mx51evk/mx51evk.c                  |    2 +-
 board/logicpd/imx31_litekit/config.mk              |    2 +-
 board/logicpd/imx31_litekit/imx31_litekit.c        |   10 ++++-
 board/ttcontrol/vision2/vision2.c                  |    2 +-
 boards.cfg                                         |    4 +-
 drivers/usb/host/ehci-mxc.c                        |    2 +
 include/configs/imx31_litekit.h                    |    7 +++
 include/configs/mx51evk.h                          |    4 +-
 include/configs/qong.h                             |   32 +++++++--------
 include/configs/vision2.h                          |    4 +-
 25 files changed, 90 insertions(+), 87 deletions(-)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/Makefile (100%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/clock.c (85%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/iomux.c (99%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/lowlevel_init.S (95%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/soc.c (81%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/speed.c (100%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/timer.c (92%)
 rename arch/arm/cpu/armv7/{mx51 => mx5}/u-boot.lds (100%)
Quoted 8 lines
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/asm-offsets.h (100%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/clock.h (100%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/crm_regs.h (100%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/imx-regs.h (100%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/iomux.h (98%)
 rename arch/arm/include/asm/{arch-mx51/mx51_pins.h =>
arch-mx5/mx5x_pins.h} (99%)
 rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/sys_proto.h (100%)

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
It is practically impossible to teach good programming style to  stu-
dents that have had prior exposure to BASIC: as potential programmers
they are mentally mutilated beyond hope of regeneration.   - Dijkstra