Patchwork [U-Boot,PULL] : Please pull u-boot-imx

login
register
mail settings
Submitter Stefano Babic
Date May 7, 2013, 7:55 a.m.
Message ID <5188B35C.5030401@denx.de>
Download mbox
Permalink /patch/242063/
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Pull-request

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

Comments

Stefano Babic - May 7, 2013, 7:55 a.m.
Hi Albert,

please pull from u-boot-imx, thanks !

The following changes since commit f2e8a87305a55652488af140adcf65b1e688f287:

  exynos: fdt: Add TMU node for snow (2013-04-17 10:00:44 +0900)

are available in the git repository at:

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

for you to fetch changes up to d782c1fe7246301143ed78c0d86ea6c81f9325f9:

  arm: mxs: video: Enable MXS LCDIF on M28EVK (2013-05-06 17:40:23 +0200)

----------------------------------------------------------------
Benoît Thébaudeau (40):
      imx: Homogenize and fix fuse register definitions
      imx: Add useful fuse definitions
      Add fuse API and commands
      Add fsl_iim driver
      mpc: iim: Switch to common fsl_iim
      mx51evk: Enable support for iim
      Add mxc_ocotp driver
      mx6qsabrelite: Enable support for ocotp
      nitrogen6x: Enable support for ocotp
      imx: Document fuse assignments for MAC addresses
      imx: iomux-v3: Fix common pad control definitions
      imx: iomux-v3: cosmetic: Reorganize definitions
      imx: iomux-v3: Restore Linux's NEW_PAD_CTRL() macro
      imx: iomux-v3: Include PKE and PUE to pad control pull definitions
      imx: iomux-v3: Add iomux-mx25.h
      imx: mx25pdk: Convert to iomux-v3
      imx: mx25pdk: Fix GPIO assignments
      imx: tx25: Convert to iomux-v3
      imx: zmx25: Convert to iomux-v3
      imx: mx25: Remove legacy iomux support
      imx: iomux-v3: Add iomux-mx35.h
      imx: flea3: Convert to iomux-v3
      imx: mx35pdk: Fix WDOG_RST iomux function
      imx: mx35pdk: Convert to iomux-v3
      imx: woodburn: Convert to iomux-v3
      imx: mx35: Remove legacy iomux support
      imx: iomux-mx51: Fix MX51_PAD_EIM_CS2__GPIO2_27
      imx: iomux-v3: Add missing definitions to iomux-mx51.h
      imx: mx51evk: Convert to iomux-v3
      imx: mx51_efikamx/sb: Convert to iomux-v3
      imx: vision2: Convert to iomux-v3
      imx: iomux-v3: Add iomux-mx53.h
      imx: ima3-mx53: Convert to iomux-v3
      imx: mx53ard: Convert to iomux-v3
      imx: mx53evk: Convert to iomux-v3
      imx: mx53loco: Convert to iomux-v3
      imx: mx53smd: Convert to iomux-v3
      imx: m53evk: Convert to iomux-v3
      imx: mx5: Remove legacy iomux support
      imx: mx35pdk: Fix MUX2_CTR GPIO

Eric Benard (1):
      mx28evk: add trimffs to nand command

Fabio Estevam (22):
      iomux-v3: Place pad control definitions into common file
      mx6: Add solo-lite variant support
      mx6sl: Add initial support for mx6slevk board
      imx: mx6q_4x_mt41j128.cfg: Setup CCM_CCOSR register
      nitrogen6x: Setup CCM_CCOSR register
      mx51evk: Update environment in order to allow booting a dt kernel
      mx51evk: Do not force the rootfs type
      mx5: Define a common get_board_rev()
      mx5: Select CONFIG_REVISION_TAG
      mx53ard: Move register masks into imx-regs.h
      mx23: Put back RAM voltage level to its original value
      mx23: Fix pad voltage selection bit
      mx23evk: Fix DDR pin iomux settings
      mx23_olinuxino: Fix DDR pin iomux settings
      mxs: spl_mem_init: Fix comment about start bit
      mxs: spl_mem_init: Remove erroneous DDR setting
      mxs: spl_mem_init: Skip the initialization of some DRAM_CTL registers
      mxs: spl_mem_init: Change EMI port priority
      mx23: Operate DDR voltage supply at 2.5V
      mx23evk: Do not set voltage selection bit for SSP pads
      mx23_olinuxino: Do not set voltage selection bit for SSP pads
      mxs: Explain why some mx23 DDR registers are not configured

Marek Vasut (13):
      tools: arm: imx: Implement BOOT_OFFSET command for imximage
      imx: Align the imximage header and payload to multiples of 4k
      nand: Add SPL_NAND support to mxc_nand_spl
      arm: imx: Pack u-boot.bin into uImage for SPL
      arm: mx5: Add SPL support code to MX5
      arm: mx5: Add NAND clock handling
      arm: mx5: Add support for DENX M53EVK
      arm: mx23: Fix VDDMEM misconfiguration
      arm: mxs: Preprocess u-boot.bd so they contain full path
      arm: mxs: Add LCDIF clock configuration function
      arm: mxs: Add LCDIF registers for i.MX233
      arm: mxs: Add MXS LCDIF driver
      arm: mxs: video: Enable MXS LCDIF on M28EVK

Otavio Salvador (9):
      mx6qsabre{sd, auto}: Add update_sd_firmware support
      mx6qsabresd: Return status when initializing MMC
      wandboard: Use env storage info for mmcdev/mmcpart
      wandboard: Add update_sd_firmware support
      wandboard: Add card detection for SOM MicroSD card
      wandboard: Add support for Carrier Board MicroSD card
      wandboard: Add boot selection support
      mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
      mx53ard: Rework default environment to support FDT, MMC and netboot

Philip Paeps (2):
      mx35 iomux: correct offsets of IOMUX registers
      mx35 iomux: correct input select register index

Shawn Guo (1):
      ARM: mx6: define CONFIG_ARM_ERRATA_742230

Stefan Roese (7):
      arm: imx: Change iomux functions to void type
      imx: Move some header files from arch-mxs to imx-common
      imx: Move some i.MX common functions into the imx-common directory
      dma: Add i.MX6 support to drivers/dma/apbh_dma.c
      mtd: mxs_nand: Add support for i.MX6
      imx: Add titanium board support (i.MX6 based)
      arm: imx: Codingstyle enhancement of include/asm/arch-mx6/crm_regs.h

Stefano Babic (1):
      Merge branch 'next'

 .gitignore                                         |    1 +
 MAINTAINERS                                        |    4 +
 Makefile                                           |    9 +-
 README                                             |    1 +
 arch/arm/cpu/arm1136/mx35/Makefile                 |    1 -
 arch/arm/cpu/arm1136/mx35/iomux.c                  |  114 --
 arch/arm/cpu/arm926ejs/mx25/generic.c              |  117 --
 arch/arm/cpu/arm926ejs/mxs/Makefile                |   10 +
 arch/arm/cpu/arm926ejs/mxs/clock.c                 |   93 ++
 arch/arm/cpu/arm926ejs/mxs/mxs.c                   |   65 +-
 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c          |   46 +-
 arch/arm/cpu/arm926ejs/mxs/spl_power_init.c        |   50 +-
 arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd         |    4 +-
 arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd         |    4 +-
 arch/arm/cpu/armv7/mx5/Makefile                    |    2 +-
 arch/arm/cpu/armv7/mx5/clock.c                     |   14 +-
 arch/arm/cpu/armv7/mx5/iomux.c                     |  186 ---
 arch/arm/cpu/armv7/mx5/soc.c                       |    7 +
 arch/arm/cpu/armv7/mx6/clock.c                     |   52 +-
 arch/arm/cpu/armv7/mx6/soc.c                       |   11 +-
 arch/arm/imx-common/Makefile                       |   22 +-
 arch/arm/imx-common/iomux-v3.c                     |   18 +-
 arch/arm/imx-common/misc.c                         |   84 ++
 arch/arm/include/asm/arch-mx25/imx-regs.h          |   21 +-
 arch/arm/include/asm/arch-mx25/imx25-pinmux.h      |  421 -------
 arch/arm/include/asm/arch-mx25/iomux-mx25.h        |  545 +++++++++
 arch/arm/include/asm/arch-mx27/imx-regs.h          |    3 +-
 arch/arm/include/asm/arch-mx31/imx-regs.h          |   22 +-
 arch/arm/include/asm/arch-mx35/imx-regs.h          |   19 +-
 arch/arm/include/asm/arch-mx35/iomux-mx35.h        | 1276
++++++++++++++++++++
 arch/arm/include/asm/arch-mx35/iomux.h             |  295 -----
 arch/arm/include/asm/arch-mx35/mx35_pins.h         |  353 ------
 arch/arm/include/asm/arch-mx5/clock.h              |    1 +
 arch/arm/include/asm/arch-mx5/imx-regs.h           |   24 +-
 arch/arm/include/asm/arch-mx5/iomux-mx51.h         |  180 ++-
 arch/arm/include/asm/arch-mx5/iomux-mx53.h         | 1232
+++++++++++++++++++
 arch/arm/include/asm/arch-mx5/iomux.h              |   91 --
 arch/arm/include/asm/arch-mx5/mx5x_pins.h          |  879 --------------
 arch/arm/include/asm/arch-mx5/spl.h                |   19 +
 arch/arm/include/asm/arch-mx6/clock.h              |    1 +
 arch/arm/include/asm/arch-mx6/crm_regs.h           |  183 +--
 arch/arm/include/asm/arch-mx6/imx-regs.h           |   96 +-
 arch/arm/include/asm/arch-mx6/mx6-pins.h           |    4 +
 arch/arm/include/asm/arch-mx6/mx6dl_pins.h         |   35 +-
 arch/arm/include/asm/arch-mx6/mx6q_pins.h          |   27 -
 arch/arm/include/asm/arch-mx6/mx6sl_pins.h         |   25 +
 arch/arm/include/asm/arch-mx6/sys_proto.h          |   10 +
 arch/arm/include/asm/arch-mxs/clock.h              |    1 +
 arch/arm/include/asm/arch-mxs/imx-regs.h           |    6 +-
 arch/arm/include/asm/arch-mxs/iomux.h              |    4 +
 arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h  |    2 +-
 arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h  |    2 +-
 arch/arm/include/asm/arch-mxs/regs-digctl.h        |    2 +-
 arch/arm/include/asm/arch-mxs/regs-i2c.h           |    2 +-
 arch/arm/include/asm/arch-mxs/regs-lcdif.h         |   38 +-
 arch/arm/include/asm/arch-mxs/regs-lradc.h         |    2 +-
 arch/arm/include/asm/arch-mxs/regs-ocotp.h         |    2 +-
 arch/arm/include/asm/arch-mxs/regs-pinctrl.h       |    2 +-
 arch/arm/include/asm/arch-mxs/regs-power-mx23.h    |    2 +-
 arch/arm/include/asm/arch-mxs/regs-power-mx28.h    |    2 +-
 arch/arm/include/asm/arch-mxs/regs-rtc.h           |    2 +-
 arch/arm/include/asm/arch-mxs/regs-ssp.h           |    2 +-
 arch/arm/include/asm/arch-mxs/regs-timrot.h        |    2 +-
 .../arm/include/asm/{arch-mxs => imx-common}/dma.h |   12 +
 arch/arm/include/asm/imx-common/imximage.cfg       |   30 +
 arch/arm/include/asm/imx-common/iomux-v3.h         |   69 +-
 .../asm/{arch-mxs => imx-common}/regs-apbh.h       |   19 +-
 .../asm/{arch-mxs => imx-common}/regs-bch.h        |   12 +-
 .../asm/{arch-mxs => imx-common}/regs-common.h     |    0
 .../asm/{arch-mxs => imx-common}/regs-gpmi.h       |    2 +-
 arch/powerpc/cpu/mpc512x/Makefile                  |    1 -
 arch/powerpc/cpu/mpc512x/cpu_init.c                |    2 +-
 arch/powerpc/cpu/mpc512x/iim.c                     |  394 ------
 arch/powerpc/include/asm/immap_512x.h              |    2 +
 board/CarMediaLab/flea3/flea3.c                    |   91 +-
 board/boundary/nitrogen6x/clocks.cfg               |   11 +
 board/boundary/nitrogen6x/nitrogen6x.c             |   42 +-
 board/denx/m53evk/Makefile                         |   40 +
 board/denx/m53evk/imximage.cfg                     |  108 ++
 board/denx/m53evk/m53evk.c                         |  328 +++++
 board/esg/ima3-mx53/ima3-mx53.c                    |  228 ++--
 board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg       |   11 +
 board/freescale/mx23evk/spl_boot.c                 |    4 +-
 board/freescale/mx25pdk/mx25pdk.c                  |  132 +-
 board/freescale/mx35pdk/mx35pdk.c                  |  175 ++-
 board/freescale/mx51evk/mx51evk.c                  |  348 ++----
 board/freescale/mx51evk/mx51evk_video.c            |   22 +-
 board/freescale/mx53ard/mx53ard.c                  |  329 +++--
 board/freescale/mx53evk/mx53evk.c                  |  289 ++---
 board/freescale/mx53loco/mx53loco.c                |  268 ++--
 board/freescale/mx53loco/mx53loco_video.c          |   68 +-
 board/freescale/mx53smd/mx53smd.c                  |  152 +--
 board/freescale/mx6qarm2/mx6qarm2.c                |   17 +-
 board/freescale/mx6qsabreauto/mx6qsabreauto.c      |   22 +-
 board/freescale/mx6qsabrelite/mx6qsabrelite.c      |   30 +-
 board/freescale/mx6qsabresd/mx6qsabresd.c          |   30 +-
 board/freescale/mx6slevk/Makefile                  |   28 +
 board/freescale/mx6slevk/imximage.cfg              |  118 ++
 board/freescale/mx6slevk/mx6slevk.c                |  102 ++
 board/freescale/titanium/Makefile                  |   36 +
 board/freescale/titanium/imximage.cfg              |  178 +++
 board/freescale/titanium/titanium.c                |  334 +++++
 board/genesi/mx51_efikamx/efikamx-usb.c            |  122 +-
 board/genesi/mx51_efikamx/efikamx.c                |    2 +-
 board/karo/tx25/tx25.c                             |  107 +-
 board/olimex/mx23_olinuxino/spl_boot.c             |    4 +-
 board/syteco/zmx25/zmx25.c                         |  143 +--
 board/ttcontrol/vision2/vision2.c                  |  585 ++++-----
 board/wandboard/wandboard.c                        |  113 +-
 board/woodburn/woodburn.c                          |   69 +-
 boards.cfg                                         |    3 +
 common/Makefile                                    |    1 +
 common/cmd_fuse.c                                  |  168 +++
 doc/README.fsl_iim                                 |   48 +
 doc/README.fuse                                    |   67 +
 doc/README.imx25                                   |   10 +
 doc/README.imx27                                   |   10 +
 doc/README.imx5                                    |    6 +
 doc/README.imx6                                    |   10 +
 doc/README.imximage                                |   18 +
 doc/README.mxc_ocotp                               |   50 +
 drivers/dma/apbh_dma.c                             |    5 +-
 drivers/misc/Makefile                              |    2 +
 drivers/misc/fsl_iim.c                             |  286 +++++
 drivers/misc/mxc_ocotp.c                           |  216 ++++
 drivers/mmc/mxsmmc.c                               |    2 +-
 drivers/mtd/nand/mxc_nand_spl.c                    |   13 +-
 drivers/mtd/nand/mxs_nand.c                        |   15 +-
 drivers/spi/mxs_spi.c                              |    2 +-
 drivers/usb/host/ehci-mx5.c                        |   73 --
 drivers/video/Makefile                             |    1 +
 drivers/video/cfb_console.c                        |    4 +
 drivers/video/mxsfb.c                              |  189 +++
 include/config_cmd_all.h                           |    1 +
 include/configs/ac14xx.h                           |    5 +
 include/configs/aria.h                             |    2 +-
 include/configs/ima3-mx53.h                        |    3 -
 include/configs/m28evk.h                           |   19 +
 include/configs/m53evk.h                           |  256 ++++
 include/configs/mecp5123.h                         |    2 +-
 include/configs/mpc5121ads.h                       |    2 +-
 include/configs/mx28evk.h                          |    1 +
 include/configs/mx51evk.h                          |   51 +-
 include/configs/mx53ard.h                          |  102 +-
 include/configs/mx53evk.h                          |    1 +
 include/configs/mx53smd.h                          |    1 +
 include/configs/mx6_common.h                       |    1 +
 include/configs/mx6qsabre_common.h                 |   14 +
 include/configs/mx6qsabrelite.h                    |    5 +
 include/configs/mx6slevk.h                         |  189 +++
 include/configs/nitrogen6x.h                       |    5 +
 include/configs/pdm360ng.h                         |    7 +
 include/configs/titanium.h                         |  277 +++++
 include/configs/wandboard.h                        |   24 +-
 .../asm/arch-mx25/sys_proto.h => include/fuse.h    |   30 +-
 include/usb/ehci-fsl.h                             |    6 -
 spl/Makefile                                       |    8 +
 tools/imximage.c                                   |   17 +-
 tools/imximage.h                                   |    9 +-
 tools/mxsboot.c                                    |    8 +-
 160 files changed, 8884 insertions(+), 5340 deletions(-)
 delete mode 100644 arch/arm/cpu/arm1136/mx35/iomux.c
 delete mode 100644 arch/arm/cpu/armv7/mx5/iomux.c
 create mode 100644 arch/arm/imx-common/misc.c
 delete mode 100644 arch/arm/include/asm/arch-mx25/imx25-pinmux.h
 create mode 100644 arch/arm/include/asm/arch-mx25/iomux-mx25.h
 create mode 100644 arch/arm/include/asm/arch-mx35/iomux-mx35.h
 delete mode 100644 arch/arm/include/asm/arch-mx35/iomux.h
 delete mode 100644 arch/arm/include/asm/arch-mx35/mx35_pins.h
 create mode 100644 arch/arm/include/asm/arch-mx5/iomux-mx53.h
 delete mode 100644 arch/arm/include/asm/arch-mx5/iomux.h
 delete mode 100644 arch/arm/include/asm/arch-mx5/mx5x_pins.h
 create mode 100644 arch/arm/include/asm/arch-mx5/spl.h
 create mode 100644 arch/arm/include/asm/arch-mx6/mx6sl_pins.h
 rename arch/arm/include/asm/{arch-mxs => imx-common}/dma.h (93%)
 create mode 100644 arch/arm/include/asm/imx-common/imximage.cfg
 rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-apbh.h (97%)
 rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-bch.h (96%)
 rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-common.h (100%)
 rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-gpmi.h (99%)
 delete mode 100644 arch/powerpc/cpu/mpc512x/iim.c
 create mode 100644 board/denx/m53evk/Makefile
 create mode 100644 board/denx/m53evk/imximage.cfg
 create mode 100644 board/denx/m53evk/m53evk.c
 create mode 100644 board/freescale/mx6slevk/Makefile
 create mode 100644 board/freescale/mx6slevk/imximage.cfg
 create mode 100644 board/freescale/mx6slevk/mx6slevk.c
 create mode 100644 board/freescale/titanium/Makefile
 create mode 100644 board/freescale/titanium/imximage.cfg
 create mode 100644 board/freescale/titanium/titanium.c
 create mode 100644 common/cmd_fuse.c
 create mode 100644 doc/README.fsl_iim
 create mode 100644 doc/README.fuse
 create mode 100644 doc/README.imx25
 create mode 100644 doc/README.imx27
 create mode 100644 doc/README.imx6
 create mode 100644 doc/README.mxc_ocotp
 create mode 100644 drivers/misc/fsl_iim.c
 create mode 100644 drivers/misc/mxc_ocotp.c
 create mode 100644 drivers/video/mxsfb.c
 create mode 100644 include/configs/m53evk.h
 create mode 100644 include/configs/mx6slevk.h
 create mode 100644 include/configs/titanium.h
 rename arch/arm/include/asm/arch-mx25/sys_proto.h => include/fuse.h (55%)

Best regards,
Stefano
Albert ARIBAUD - May 11, 2013, 7:30 a.m.
Hi Stefano,

On Tue, 07 May 2013 09:55:08 +0200, Stefano Babic <sbabic@denx.de>
wrote:

> Hi Albert,
> 
> please pull from u-boot-imx, thanks !
> 
> The following changes since commit f2e8a87305a55652488af140adcf65b1e688f287:
> 
>   exynos: fdt: Add TMU node for snow (2013-04-17 10:00:44 +0900)
> 
> are available in the git repository at:
> 
>   git://www.denx.de/git/u-boot-imx.git master
> 
> for you to fetch changes up to d782c1fe7246301143ed78c0d86ea6c81f9325f9:
> 
>   arm: mxs: video: Enable MXS LCDIF on M28EVK (2013-05-06 17:40:23 +0200)
> 
> ----------------------------------------------------------------
> Benoît Thébaudeau (40):
>       imx: Homogenize and fix fuse register definitions
>       imx: Add useful fuse definitions
>       Add fuse API and commands
>       Add fsl_iim driver
>       mpc: iim: Switch to common fsl_iim
>       mx51evk: Enable support for iim
>       Add mxc_ocotp driver
>       mx6qsabrelite: Enable support for ocotp
>       nitrogen6x: Enable support for ocotp
>       imx: Document fuse assignments for MAC addresses
>       imx: iomux-v3: Fix common pad control definitions
>       imx: iomux-v3: cosmetic: Reorganize definitions
>       imx: iomux-v3: Restore Linux's NEW_PAD_CTRL() macro
>       imx: iomux-v3: Include PKE and PUE to pad control pull definitions
>       imx: iomux-v3: Add iomux-mx25.h
>       imx: mx25pdk: Convert to iomux-v3
>       imx: mx25pdk: Fix GPIO assignments
>       imx: tx25: Convert to iomux-v3
>       imx: zmx25: Convert to iomux-v3
>       imx: mx25: Remove legacy iomux support
>       imx: iomux-v3: Add iomux-mx35.h
>       imx: flea3: Convert to iomux-v3
>       imx: mx35pdk: Fix WDOG_RST iomux function
>       imx: mx35pdk: Convert to iomux-v3
>       imx: woodburn: Convert to iomux-v3
>       imx: mx35: Remove legacy iomux support
>       imx: iomux-mx51: Fix MX51_PAD_EIM_CS2__GPIO2_27
>       imx: iomux-v3: Add missing definitions to iomux-mx51.h
>       imx: mx51evk: Convert to iomux-v3
>       imx: mx51_efikamx/sb: Convert to iomux-v3
>       imx: vision2: Convert to iomux-v3
>       imx: iomux-v3: Add iomux-mx53.h
>       imx: ima3-mx53: Convert to iomux-v3
>       imx: mx53ard: Convert to iomux-v3
>       imx: mx53evk: Convert to iomux-v3
>       imx: mx53loco: Convert to iomux-v3
>       imx: mx53smd: Convert to iomux-v3
>       imx: m53evk: Convert to iomux-v3
>       imx: mx5: Remove legacy iomux support
>       imx: mx35pdk: Fix MUX2_CTR GPIO
> 
> Eric Benard (1):
>       mx28evk: add trimffs to nand command
> 
> Fabio Estevam (22):
>       iomux-v3: Place pad control definitions into common file
>       mx6: Add solo-lite variant support
>       mx6sl: Add initial support for mx6slevk board
>       imx: mx6q_4x_mt41j128.cfg: Setup CCM_CCOSR register
>       nitrogen6x: Setup CCM_CCOSR register
>       mx51evk: Update environment in order to allow booting a dt kernel
>       mx51evk: Do not force the rootfs type
>       mx5: Define a common get_board_rev()
>       mx5: Select CONFIG_REVISION_TAG
>       mx53ard: Move register masks into imx-regs.h
>       mx23: Put back RAM voltage level to its original value
>       mx23: Fix pad voltage selection bit
>       mx23evk: Fix DDR pin iomux settings
>       mx23_olinuxino: Fix DDR pin iomux settings
>       mxs: spl_mem_init: Fix comment about start bit
>       mxs: spl_mem_init: Remove erroneous DDR setting
>       mxs: spl_mem_init: Skip the initialization of some DRAM_CTL registers
>       mxs: spl_mem_init: Change EMI port priority
>       mx23: Operate DDR voltage supply at 2.5V
>       mx23evk: Do not set voltage selection bit for SSP pads
>       mx23_olinuxino: Do not set voltage selection bit for SSP pads
>       mxs: Explain why some mx23 DDR registers are not configured
> 
> Marek Vasut (13):
>       tools: arm: imx: Implement BOOT_OFFSET command for imximage
>       imx: Align the imximage header and payload to multiples of 4k
>       nand: Add SPL_NAND support to mxc_nand_spl
>       arm: imx: Pack u-boot.bin into uImage for SPL
>       arm: mx5: Add SPL support code to MX5
>       arm: mx5: Add NAND clock handling
>       arm: mx5: Add support for DENX M53EVK
>       arm: mx23: Fix VDDMEM misconfiguration
>       arm: mxs: Preprocess u-boot.bd so they contain full path
>       arm: mxs: Add LCDIF clock configuration function
>       arm: mxs: Add LCDIF registers for i.MX233
>       arm: mxs: Add MXS LCDIF driver
>       arm: mxs: video: Enable MXS LCDIF on M28EVK
> 
> Otavio Salvador (9):
>       mx6qsabre{sd, auto}: Add update_sd_firmware support
>       mx6qsabresd: Return status when initializing MMC
>       wandboard: Use env storage info for mmcdev/mmcpart
>       wandboard: Add update_sd_firmware support
>       wandboard: Add card detection for SOM MicroSD card
>       wandboard: Add support for Carrier Board MicroSD card
>       wandboard: Add boot selection support
>       mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
>       mx53ard: Rework default environment to support FDT, MMC and netboot
> 
> Philip Paeps (2):
>       mx35 iomux: correct offsets of IOMUX registers
>       mx35 iomux: correct input select register index
> 
> Shawn Guo (1):
>       ARM: mx6: define CONFIG_ARM_ERRATA_742230
> 
> Stefan Roese (7):
>       arm: imx: Change iomux functions to void type
>       imx: Move some header files from arch-mxs to imx-common
>       imx: Move some i.MX common functions into the imx-common directory
>       dma: Add i.MX6 support to drivers/dma/apbh_dma.c
>       mtd: mxs_nand: Add support for i.MX6
>       imx: Add titanium board support (i.MX6 based)
>       arm: imx: Codingstyle enhancement of include/asm/arch-mx6/crm_regs.h
> 
> Stefano Babic (1):
>       Merge branch 'next'
> 
>  .gitignore                                         |    1 +
>  MAINTAINERS                                        |    4 +
>  Makefile                                           |    9 +-
>  README                                             |    1 +
>  arch/arm/cpu/arm1136/mx35/Makefile                 |    1 -
>  arch/arm/cpu/arm1136/mx35/iomux.c                  |  114 --
>  arch/arm/cpu/arm926ejs/mx25/generic.c              |  117 --
>  arch/arm/cpu/arm926ejs/mxs/Makefile                |   10 +
>  arch/arm/cpu/arm926ejs/mxs/clock.c                 |   93 ++
>  arch/arm/cpu/arm926ejs/mxs/mxs.c                   |   65 +-
>  arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c          |   46 +-
>  arch/arm/cpu/arm926ejs/mxs/spl_power_init.c        |   50 +-
>  arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd         |    4 +-
>  arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd         |    4 +-
>  arch/arm/cpu/armv7/mx5/Makefile                    |    2 +-
>  arch/arm/cpu/armv7/mx5/clock.c                     |   14 +-
>  arch/arm/cpu/armv7/mx5/iomux.c                     |  186 ---
>  arch/arm/cpu/armv7/mx5/soc.c                       |    7 +
>  arch/arm/cpu/armv7/mx6/clock.c                     |   52 +-
>  arch/arm/cpu/armv7/mx6/soc.c                       |   11 +-
>  arch/arm/imx-common/Makefile                       |   22 +-
>  arch/arm/imx-common/iomux-v3.c                     |   18 +-
>  arch/arm/imx-common/misc.c                         |   84 ++
>  arch/arm/include/asm/arch-mx25/imx-regs.h          |   21 +-
>  arch/arm/include/asm/arch-mx25/imx25-pinmux.h      |  421 -------
>  arch/arm/include/asm/arch-mx25/iomux-mx25.h        |  545 +++++++++
>  arch/arm/include/asm/arch-mx27/imx-regs.h          |    3 +-
>  arch/arm/include/asm/arch-mx31/imx-regs.h          |   22 +-
>  arch/arm/include/asm/arch-mx35/imx-regs.h          |   19 +-
>  arch/arm/include/asm/arch-mx35/iomux-mx35.h        | 1276
> ++++++++++++++++++++
>  arch/arm/include/asm/arch-mx35/iomux.h             |  295 -----
>  arch/arm/include/asm/arch-mx35/mx35_pins.h         |  353 ------
>  arch/arm/include/asm/arch-mx5/clock.h              |    1 +
>  arch/arm/include/asm/arch-mx5/imx-regs.h           |   24 +-
>  arch/arm/include/asm/arch-mx5/iomux-mx51.h         |  180 ++-
>  arch/arm/include/asm/arch-mx5/iomux-mx53.h         | 1232
> +++++++++++++++++++
>  arch/arm/include/asm/arch-mx5/iomux.h              |   91 --
>  arch/arm/include/asm/arch-mx5/mx5x_pins.h          |  879 --------------
>  arch/arm/include/asm/arch-mx5/spl.h                |   19 +
>  arch/arm/include/asm/arch-mx6/clock.h              |    1 +
>  arch/arm/include/asm/arch-mx6/crm_regs.h           |  183 +--
>  arch/arm/include/asm/arch-mx6/imx-regs.h           |   96 +-
>  arch/arm/include/asm/arch-mx6/mx6-pins.h           |    4 +
>  arch/arm/include/asm/arch-mx6/mx6dl_pins.h         |   35 +-
>  arch/arm/include/asm/arch-mx6/mx6q_pins.h          |   27 -
>  arch/arm/include/asm/arch-mx6/mx6sl_pins.h         |   25 +
>  arch/arm/include/asm/arch-mx6/sys_proto.h          |   10 +
>  arch/arm/include/asm/arch-mxs/clock.h              |    1 +
>  arch/arm/include/asm/arch-mxs/imx-regs.h           |    6 +-
>  arch/arm/include/asm/arch-mxs/iomux.h              |    4 +
>  arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h  |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h  |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-digctl.h        |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-i2c.h           |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-lcdif.h         |   38 +-
>  arch/arm/include/asm/arch-mxs/regs-lradc.h         |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-ocotp.h         |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-pinctrl.h       |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-power-mx23.h    |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-power-mx28.h    |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-rtc.h           |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-ssp.h           |    2 +-
>  arch/arm/include/asm/arch-mxs/regs-timrot.h        |    2 +-
>  .../arm/include/asm/{arch-mxs => imx-common}/dma.h |   12 +
>  arch/arm/include/asm/imx-common/imximage.cfg       |   30 +
>  arch/arm/include/asm/imx-common/iomux-v3.h         |   69 +-
>  .../asm/{arch-mxs => imx-common}/regs-apbh.h       |   19 +-
>  .../asm/{arch-mxs => imx-common}/regs-bch.h        |   12 +-
>  .../asm/{arch-mxs => imx-common}/regs-common.h     |    0
>  .../asm/{arch-mxs => imx-common}/regs-gpmi.h       |    2 +-
>  arch/powerpc/cpu/mpc512x/Makefile                  |    1 -
>  arch/powerpc/cpu/mpc512x/cpu_init.c                |    2 +-
>  arch/powerpc/cpu/mpc512x/iim.c                     |  394 ------
>  arch/powerpc/include/asm/immap_512x.h              |    2 +
>  board/CarMediaLab/flea3/flea3.c                    |   91 +-
>  board/boundary/nitrogen6x/clocks.cfg               |   11 +
>  board/boundary/nitrogen6x/nitrogen6x.c             |   42 +-
>  board/denx/m53evk/Makefile                         |   40 +
>  board/denx/m53evk/imximage.cfg                     |  108 ++
>  board/denx/m53evk/m53evk.c                         |  328 +++++
>  board/esg/ima3-mx53/ima3-mx53.c                    |  228 ++--
>  board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg       |   11 +
>  board/freescale/mx23evk/spl_boot.c                 |    4 +-
>  board/freescale/mx25pdk/mx25pdk.c                  |  132 +-
>  board/freescale/mx35pdk/mx35pdk.c                  |  175 ++-
>  board/freescale/mx51evk/mx51evk.c                  |  348 ++----
>  board/freescale/mx51evk/mx51evk_video.c            |   22 +-
>  board/freescale/mx53ard/mx53ard.c                  |  329 +++--
>  board/freescale/mx53evk/mx53evk.c                  |  289 ++---
>  board/freescale/mx53loco/mx53loco.c                |  268 ++--
>  board/freescale/mx53loco/mx53loco_video.c          |   68 +-
>  board/freescale/mx53smd/mx53smd.c                  |  152 +--
>  board/freescale/mx6qarm2/mx6qarm2.c                |   17 +-
>  board/freescale/mx6qsabreauto/mx6qsabreauto.c      |   22 +-
>  board/freescale/mx6qsabrelite/mx6qsabrelite.c      |   30 +-
>  board/freescale/mx6qsabresd/mx6qsabresd.c          |   30 +-
>  board/freescale/mx6slevk/Makefile                  |   28 +
>  board/freescale/mx6slevk/imximage.cfg              |  118 ++
>  board/freescale/mx6slevk/mx6slevk.c                |  102 ++
>  board/freescale/titanium/Makefile                  |   36 +
>  board/freescale/titanium/imximage.cfg              |  178 +++
>  board/freescale/titanium/titanium.c                |  334 +++++
>  board/genesi/mx51_efikamx/efikamx-usb.c            |  122 +-
>  board/genesi/mx51_efikamx/efikamx.c                |    2 +-
>  board/karo/tx25/tx25.c                             |  107 +-
>  board/olimex/mx23_olinuxino/spl_boot.c             |    4 +-
>  board/syteco/zmx25/zmx25.c                         |  143 +--
>  board/ttcontrol/vision2/vision2.c                  |  585 ++++-----
>  board/wandboard/wandboard.c                        |  113 +-
>  board/woodburn/woodburn.c                          |   69 +-
>  boards.cfg                                         |    3 +
>  common/Makefile                                    |    1 +
>  common/cmd_fuse.c                                  |  168 +++
>  doc/README.fsl_iim                                 |   48 +
>  doc/README.fuse                                    |   67 +
>  doc/README.imx25                                   |   10 +
>  doc/README.imx27                                   |   10 +
>  doc/README.imx5                                    |    6 +
>  doc/README.imx6                                    |   10 +
>  doc/README.imximage                                |   18 +
>  doc/README.mxc_ocotp                               |   50 +
>  drivers/dma/apbh_dma.c                             |    5 +-
>  drivers/misc/Makefile                              |    2 +
>  drivers/misc/fsl_iim.c                             |  286 +++++
>  drivers/misc/mxc_ocotp.c                           |  216 ++++
>  drivers/mmc/mxsmmc.c                               |    2 +-
>  drivers/mtd/nand/mxc_nand_spl.c                    |   13 +-
>  drivers/mtd/nand/mxs_nand.c                        |   15 +-
>  drivers/spi/mxs_spi.c                              |    2 +-
>  drivers/usb/host/ehci-mx5.c                        |   73 --
>  drivers/video/Makefile                             |    1 +
>  drivers/video/cfb_console.c                        |    4 +
>  drivers/video/mxsfb.c                              |  189 +++
>  include/config_cmd_all.h                           |    1 +
>  include/configs/ac14xx.h                           |    5 +
>  include/configs/aria.h                             |    2 +-
>  include/configs/ima3-mx53.h                        |    3 -
>  include/configs/m28evk.h                           |   19 +
>  include/configs/m53evk.h                           |  256 ++++
>  include/configs/mecp5123.h                         |    2 +-
>  include/configs/mpc5121ads.h                       |    2 +-
>  include/configs/mx28evk.h                          |    1 +
>  include/configs/mx51evk.h                          |   51 +-
>  include/configs/mx53ard.h                          |  102 +-
>  include/configs/mx53evk.h                          |    1 +
>  include/configs/mx53smd.h                          |    1 +
>  include/configs/mx6_common.h                       |    1 +
>  include/configs/mx6qsabre_common.h                 |   14 +
>  include/configs/mx6qsabrelite.h                    |    5 +
>  include/configs/mx6slevk.h                         |  189 +++
>  include/configs/nitrogen6x.h                       |    5 +
>  include/configs/pdm360ng.h                         |    7 +
>  include/configs/titanium.h                         |  277 +++++
>  include/configs/wandboard.h                        |   24 +-
>  .../asm/arch-mx25/sys_proto.h => include/fuse.h    |   30 +-
>  include/usb/ehci-fsl.h                             |    6 -
>  spl/Makefile                                       |    8 +
>  tools/imximage.c                                   |   17 +-
>  tools/imximage.h                                   |    9 +-
>  tools/mxsboot.c                                    |    8 +-
>  160 files changed, 8884 insertions(+), 5340 deletions(-)
>  delete mode 100644 arch/arm/cpu/arm1136/mx35/iomux.c
>  delete mode 100644 arch/arm/cpu/armv7/mx5/iomux.c
>  create mode 100644 arch/arm/imx-common/misc.c
>  delete mode 100644 arch/arm/include/asm/arch-mx25/imx25-pinmux.h
>  create mode 100644 arch/arm/include/asm/arch-mx25/iomux-mx25.h
>  create mode 100644 arch/arm/include/asm/arch-mx35/iomux-mx35.h
>  delete mode 100644 arch/arm/include/asm/arch-mx35/iomux.h
>  delete mode 100644 arch/arm/include/asm/arch-mx35/mx35_pins.h
>  create mode 100644 arch/arm/include/asm/arch-mx5/iomux-mx53.h
>  delete mode 100644 arch/arm/include/asm/arch-mx5/iomux.h
>  delete mode 100644 arch/arm/include/asm/arch-mx5/mx5x_pins.h
>  create mode 100644 arch/arm/include/asm/arch-mx5/spl.h
>  create mode 100644 arch/arm/include/asm/arch-mx6/mx6sl_pins.h
>  rename arch/arm/include/asm/{arch-mxs => imx-common}/dma.h (93%)
>  create mode 100644 arch/arm/include/asm/imx-common/imximage.cfg
>  rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-apbh.h (97%)
>  rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-bch.h (96%)
>  rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-common.h (100%)
>  rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-gpmi.h (99%)
>  delete mode 100644 arch/powerpc/cpu/mpc512x/iim.c
>  create mode 100644 board/denx/m53evk/Makefile
>  create mode 100644 board/denx/m53evk/imximage.cfg
>  create mode 100644 board/denx/m53evk/m53evk.c
>  create mode 100644 board/freescale/mx6slevk/Makefile
>  create mode 100644 board/freescale/mx6slevk/imximage.cfg
>  create mode 100644 board/freescale/mx6slevk/mx6slevk.c
>  create mode 100644 board/freescale/titanium/Makefile
>  create mode 100644 board/freescale/titanium/imximage.cfg
>  create mode 100644 board/freescale/titanium/titanium.c
>  create mode 100644 common/cmd_fuse.c
>  create mode 100644 doc/README.fsl_iim
>  create mode 100644 doc/README.fuse
>  create mode 100644 doc/README.imx25
>  create mode 100644 doc/README.imx27
>  create mode 100644 doc/README.imx6
>  create mode 100644 doc/README.mxc_ocotp
>  create mode 100644 drivers/misc/fsl_iim.c
>  create mode 100644 drivers/misc/mxc_ocotp.c
>  create mode 100644 drivers/video/mxsfb.c
>  create mode 100644 include/configs/m53evk.h
>  create mode 100644 include/configs/mx6slevk.h
>  create mode 100644 include/configs/titanium.h
>  rename arch/arm/include/asm/arch-mx25/sys_proto.h => include/fuse.h (55%)
> 
> Best regards,
> Stefano
> 

Applied to u-boot-arm/master (with two trivial merge resolutions),
thanks!

Amicalement,
Albert ARIBAUD - May 11, 2013, 9:15 a.m.
On Sat, 11 May 2013 09:30:57 +0200, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Hi Stefano,
> 
> On Tue, 07 May 2013 09:55:08 +0200, Stefano Babic <sbabic@denx.de>
> wrote:
> 
> > Hi Albert,
> > 
> > please pull from u-boot-imx, thanks !
> > 
> > The following changes since commit f2e8a87305a55652488af140adcf65b1e688f287:
> > 
> >   exynos: fdt: Add TMU node for snow (2013-04-17 10:00:44 +0900)
> > 
> > are available in the git repository at:
> > 
> >   git://www.denx.de/git/u-boot-imx.git master
> > 
> > for you to fetch changes up to d782c1fe7246301143ed78c0d86ea6c81f9325f9:
> > 
> >   arm: mxs: video: Enable MXS LCDIF on M28EVK (2013-05-06 17:40:23 +0200)
> > 
> > ----------------------------------------------------------------
> > Benoît Thébaudeau (40):
> >       imx: Homogenize and fix fuse register definitions
> >       imx: Add useful fuse definitions
> >       Add fuse API and commands
> >       Add fsl_iim driver
> >       mpc: iim: Switch to common fsl_iim
> >       mx51evk: Enable support for iim
> >       Add mxc_ocotp driver
> >       mx6qsabrelite: Enable support for ocotp
> >       nitrogen6x: Enable support for ocotp
> >       imx: Document fuse assignments for MAC addresses
> >       imx: iomux-v3: Fix common pad control definitions
> >       imx: iomux-v3: cosmetic: Reorganize definitions
> >       imx: iomux-v3: Restore Linux's NEW_PAD_CTRL() macro
> >       imx: iomux-v3: Include PKE and PUE to pad control pull definitions
> >       imx: iomux-v3: Add iomux-mx25.h
> >       imx: mx25pdk: Convert to iomux-v3
> >       imx: mx25pdk: Fix GPIO assignments
> >       imx: tx25: Convert to iomux-v3
> >       imx: zmx25: Convert to iomux-v3
> >       imx: mx25: Remove legacy iomux support
> >       imx: iomux-v3: Add iomux-mx35.h
> >       imx: flea3: Convert to iomux-v3
> >       imx: mx35pdk: Fix WDOG_RST iomux function
> >       imx: mx35pdk: Convert to iomux-v3
> >       imx: woodburn: Convert to iomux-v3
> >       imx: mx35: Remove legacy iomux support
> >       imx: iomux-mx51: Fix MX51_PAD_EIM_CS2__GPIO2_27
> >       imx: iomux-v3: Add missing definitions to iomux-mx51.h
> >       imx: mx51evk: Convert to iomux-v3
> >       imx: mx51_efikamx/sb: Convert to iomux-v3
> >       imx: vision2: Convert to iomux-v3
> >       imx: iomux-v3: Add iomux-mx53.h
> >       imx: ima3-mx53: Convert to iomux-v3
> >       imx: mx53ard: Convert to iomux-v3
> >       imx: mx53evk: Convert to iomux-v3
> >       imx: mx53loco: Convert to iomux-v3
> >       imx: mx53smd: Convert to iomux-v3
> >       imx: m53evk: Convert to iomux-v3
> >       imx: mx5: Remove legacy iomux support
> >       imx: mx35pdk: Fix MUX2_CTR GPIO
> > 
> > Eric Benard (1):
> >       mx28evk: add trimffs to nand command
> > 
> > Fabio Estevam (22):
> >       iomux-v3: Place pad control definitions into common file
> >       mx6: Add solo-lite variant support
> >       mx6sl: Add initial support for mx6slevk board
> >       imx: mx6q_4x_mt41j128.cfg: Setup CCM_CCOSR register
> >       nitrogen6x: Setup CCM_CCOSR register
> >       mx51evk: Update environment in order to allow booting a dt kernel
> >       mx51evk: Do not force the rootfs type
> >       mx5: Define a common get_board_rev()
> >       mx5: Select CONFIG_REVISION_TAG
> >       mx53ard: Move register masks into imx-regs.h
> >       mx23: Put back RAM voltage level to its original value
> >       mx23: Fix pad voltage selection bit
> >       mx23evk: Fix DDR pin iomux settings
> >       mx23_olinuxino: Fix DDR pin iomux settings
> >       mxs: spl_mem_init: Fix comment about start bit
> >       mxs: spl_mem_init: Remove erroneous DDR setting
> >       mxs: spl_mem_init: Skip the initialization of some DRAM_CTL registers
> >       mxs: spl_mem_init: Change EMI port priority
> >       mx23: Operate DDR voltage supply at 2.5V
> >       mx23evk: Do not set voltage selection bit for SSP pads
> >       mx23_olinuxino: Do not set voltage selection bit for SSP pads
> >       mxs: Explain why some mx23 DDR registers are not configured
> > 
> > Marek Vasut (13):
> >       tools: arm: imx: Implement BOOT_OFFSET command for imximage
> >       imx: Align the imximage header and payload to multiples of 4k
> >       nand: Add SPL_NAND support to mxc_nand_spl
> >       arm: imx: Pack u-boot.bin into uImage for SPL
> >       arm: mx5: Add SPL support code to MX5
> >       arm: mx5: Add NAND clock handling
> >       arm: mx5: Add support for DENX M53EVK
> >       arm: mx23: Fix VDDMEM misconfiguration
> >       arm: mxs: Preprocess u-boot.bd so they contain full path
> >       arm: mxs: Add LCDIF clock configuration function
> >       arm: mxs: Add LCDIF registers for i.MX233
> >       arm: mxs: Add MXS LCDIF driver
> >       arm: mxs: video: Enable MXS LCDIF on M28EVK
> > 
> > Otavio Salvador (9):
> >       mx6qsabre{sd, auto}: Add update_sd_firmware support
> >       mx6qsabresd: Return status when initializing MMC
> >       wandboard: Use env storage info for mmcdev/mmcpart
> >       wandboard: Add update_sd_firmware support
> >       wandboard: Add card detection for SOM MicroSD card
> >       wandboard: Add support for Carrier Board MicroSD card
> >       wandboard: Add boot selection support
> >       mxs: mxsboot: Move sdcard BCB header to 4 sectors offset
> >       mx53ard: Rework default environment to support FDT, MMC and netboot
> > 
> > Philip Paeps (2):
> >       mx35 iomux: correct offsets of IOMUX registers
> >       mx35 iomux: correct input select register index
> > 
> > Shawn Guo (1):
> >       ARM: mx6: define CONFIG_ARM_ERRATA_742230
> > 
> > Stefan Roese (7):
> >       arm: imx: Change iomux functions to void type
> >       imx: Move some header files from arch-mxs to imx-common
> >       imx: Move some i.MX common functions into the imx-common directory
> >       dma: Add i.MX6 support to drivers/dma/apbh_dma.c
> >       mtd: mxs_nand: Add support for i.MX6
> >       imx: Add titanium board support (i.MX6 based)
> >       arm: imx: Codingstyle enhancement of include/asm/arch-mx6/crm_regs.h
> > 
> > Stefano Babic (1):
> >       Merge branch 'next'
> > 
> >  .gitignore                                         |    1 +
> >  MAINTAINERS                                        |    4 +
> >  Makefile                                           |    9 +-
> >  README                                             |    1 +
> >  arch/arm/cpu/arm1136/mx35/Makefile                 |    1 -
> >  arch/arm/cpu/arm1136/mx35/iomux.c                  |  114 --
> >  arch/arm/cpu/arm926ejs/mx25/generic.c              |  117 --
> >  arch/arm/cpu/arm926ejs/mxs/Makefile                |   10 +
> >  arch/arm/cpu/arm926ejs/mxs/clock.c                 |   93 ++
> >  arch/arm/cpu/arm926ejs/mxs/mxs.c                   |   65 +-
> >  arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c          |   46 +-
> >  arch/arm/cpu/arm926ejs/mxs/spl_power_init.c        |   50 +-
> >  arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd         |    4 +-
> >  arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd         |    4 +-
> >  arch/arm/cpu/armv7/mx5/Makefile                    |    2 +-
> >  arch/arm/cpu/armv7/mx5/clock.c                     |   14 +-
> >  arch/arm/cpu/armv7/mx5/iomux.c                     |  186 ---
> >  arch/arm/cpu/armv7/mx5/soc.c                       |    7 +
> >  arch/arm/cpu/armv7/mx6/clock.c                     |   52 +-
> >  arch/arm/cpu/armv7/mx6/soc.c                       |   11 +-
> >  arch/arm/imx-common/Makefile                       |   22 +-
> >  arch/arm/imx-common/iomux-v3.c                     |   18 +-
> >  arch/arm/imx-common/misc.c                         |   84 ++
> >  arch/arm/include/asm/arch-mx25/imx-regs.h          |   21 +-
> >  arch/arm/include/asm/arch-mx25/imx25-pinmux.h      |  421 -------
> >  arch/arm/include/asm/arch-mx25/iomux-mx25.h        |  545 +++++++++
> >  arch/arm/include/asm/arch-mx27/imx-regs.h          |    3 +-
> >  arch/arm/include/asm/arch-mx31/imx-regs.h          |   22 +-
> >  arch/arm/include/asm/arch-mx35/imx-regs.h          |   19 +-
> >  arch/arm/include/asm/arch-mx35/iomux-mx35.h        | 1276
> > ++++++++++++++++++++
> >  arch/arm/include/asm/arch-mx35/iomux.h             |  295 -----
> >  arch/arm/include/asm/arch-mx35/mx35_pins.h         |  353 ------
> >  arch/arm/include/asm/arch-mx5/clock.h              |    1 +
> >  arch/arm/include/asm/arch-mx5/imx-regs.h           |   24 +-
> >  arch/arm/include/asm/arch-mx5/iomux-mx51.h         |  180 ++-
> >  arch/arm/include/asm/arch-mx5/iomux-mx53.h         | 1232
> > +++++++++++++++++++
> >  arch/arm/include/asm/arch-mx5/iomux.h              |   91 --
> >  arch/arm/include/asm/arch-mx5/mx5x_pins.h          |  879 --------------
> >  arch/arm/include/asm/arch-mx5/spl.h                |   19 +
> >  arch/arm/include/asm/arch-mx6/clock.h              |    1 +
> >  arch/arm/include/asm/arch-mx6/crm_regs.h           |  183 +--
> >  arch/arm/include/asm/arch-mx6/imx-regs.h           |   96 +-
> >  arch/arm/include/asm/arch-mx6/mx6-pins.h           |    4 +
> >  arch/arm/include/asm/arch-mx6/mx6dl_pins.h         |   35 +-
> >  arch/arm/include/asm/arch-mx6/mx6q_pins.h          |   27 -
> >  arch/arm/include/asm/arch-mx6/mx6sl_pins.h         |   25 +
> >  arch/arm/include/asm/arch-mx6/sys_proto.h          |   10 +
> >  arch/arm/include/asm/arch-mxs/clock.h              |    1 +
> >  arch/arm/include/asm/arch-mxs/imx-regs.h           |    6 +-
> >  arch/arm/include/asm/arch-mxs/iomux.h              |    4 +
> >  arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h  |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h  |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-digctl.h        |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-i2c.h           |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-lcdif.h         |   38 +-
> >  arch/arm/include/asm/arch-mxs/regs-lradc.h         |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-ocotp.h         |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-pinctrl.h       |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-power-mx23.h    |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-power-mx28.h    |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-rtc.h           |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-ssp.h           |    2 +-
> >  arch/arm/include/asm/arch-mxs/regs-timrot.h        |    2 +-
> >  .../arm/include/asm/{arch-mxs => imx-common}/dma.h |   12 +
> >  arch/arm/include/asm/imx-common/imximage.cfg       |   30 +
> >  arch/arm/include/asm/imx-common/iomux-v3.h         |   69 +-
> >  .../asm/{arch-mxs => imx-common}/regs-apbh.h       |   19 +-
> >  .../asm/{arch-mxs => imx-common}/regs-bch.h        |   12 +-
> >  .../asm/{arch-mxs => imx-common}/regs-common.h     |    0
> >  .../asm/{arch-mxs => imx-common}/regs-gpmi.h       |    2 +-
> >  arch/powerpc/cpu/mpc512x/Makefile                  |    1 -
> >  arch/powerpc/cpu/mpc512x/cpu_init.c                |    2 +-
> >  arch/powerpc/cpu/mpc512x/iim.c                     |  394 ------
> >  arch/powerpc/include/asm/immap_512x.h              |    2 +
> >  board/CarMediaLab/flea3/flea3.c                    |   91 +-
> >  board/boundary/nitrogen6x/clocks.cfg               |   11 +
> >  board/boundary/nitrogen6x/nitrogen6x.c             |   42 +-
> >  board/denx/m53evk/Makefile                         |   40 +
> >  board/denx/m53evk/imximage.cfg                     |  108 ++
> >  board/denx/m53evk/m53evk.c                         |  328 +++++
> >  board/esg/ima3-mx53/ima3-mx53.c                    |  228 ++--
> >  board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg       |   11 +
> >  board/freescale/mx23evk/spl_boot.c                 |    4 +-
> >  board/freescale/mx25pdk/mx25pdk.c                  |  132 +-
> >  board/freescale/mx35pdk/mx35pdk.c                  |  175 ++-
> >  board/freescale/mx51evk/mx51evk.c                  |  348 ++----
> >  board/freescale/mx51evk/mx51evk_video.c            |   22 +-
> >  board/freescale/mx53ard/mx53ard.c                  |  329 +++--
> >  board/freescale/mx53evk/mx53evk.c                  |  289 ++---
> >  board/freescale/mx53loco/mx53loco.c                |  268 ++--
> >  board/freescale/mx53loco/mx53loco_video.c          |   68 +-
> >  board/freescale/mx53smd/mx53smd.c                  |  152 +--
> >  board/freescale/mx6qarm2/mx6qarm2.c                |   17 +-
> >  board/freescale/mx6qsabreauto/mx6qsabreauto.c      |   22 +-
> >  board/freescale/mx6qsabrelite/mx6qsabrelite.c      |   30 +-
> >  board/freescale/mx6qsabresd/mx6qsabresd.c          |   30 +-
> >  board/freescale/mx6slevk/Makefile                  |   28 +
> >  board/freescale/mx6slevk/imximage.cfg              |  118 ++
> >  board/freescale/mx6slevk/mx6slevk.c                |  102 ++
> >  board/freescale/titanium/Makefile                  |   36 +
> >  board/freescale/titanium/imximage.cfg              |  178 +++
> >  board/freescale/titanium/titanium.c                |  334 +++++
> >  board/genesi/mx51_efikamx/efikamx-usb.c            |  122 +-
> >  board/genesi/mx51_efikamx/efikamx.c                |    2 +-
> >  board/karo/tx25/tx25.c                             |  107 +-
> >  board/olimex/mx23_olinuxino/spl_boot.c             |    4 +-
> >  board/syteco/zmx25/zmx25.c                         |  143 +--
> >  board/ttcontrol/vision2/vision2.c                  |  585 ++++-----
> >  board/wandboard/wandboard.c                        |  113 +-
> >  board/woodburn/woodburn.c                          |   69 +-
> >  boards.cfg                                         |    3 +
> >  common/Makefile                                    |    1 +
> >  common/cmd_fuse.c                                  |  168 +++
> >  doc/README.fsl_iim                                 |   48 +
> >  doc/README.fuse                                    |   67 +
> >  doc/README.imx25                                   |   10 +
> >  doc/README.imx27                                   |   10 +
> >  doc/README.imx5                                    |    6 +
> >  doc/README.imx6                                    |   10 +
> >  doc/README.imximage                                |   18 +
> >  doc/README.mxc_ocotp                               |   50 +
> >  drivers/dma/apbh_dma.c                             |    5 +-
> >  drivers/misc/Makefile                              |    2 +
> >  drivers/misc/fsl_iim.c                             |  286 +++++
> >  drivers/misc/mxc_ocotp.c                           |  216 ++++
> >  drivers/mmc/mxsmmc.c                               |    2 +-
> >  drivers/mtd/nand/mxc_nand_spl.c                    |   13 +-
> >  drivers/mtd/nand/mxs_nand.c                        |   15 +-
> >  drivers/spi/mxs_spi.c                              |    2 +-
> >  drivers/usb/host/ehci-mx5.c                        |   73 --
> >  drivers/video/Makefile                             |    1 +
> >  drivers/video/cfb_console.c                        |    4 +
> >  drivers/video/mxsfb.c                              |  189 +++
> >  include/config_cmd_all.h                           |    1 +
> >  include/configs/ac14xx.h                           |    5 +
> >  include/configs/aria.h                             |    2 +-
> >  include/configs/ima3-mx53.h                        |    3 -
> >  include/configs/m28evk.h                           |   19 +
> >  include/configs/m53evk.h                           |  256 ++++
> >  include/configs/mecp5123.h                         |    2 +-
> >  include/configs/mpc5121ads.h                       |    2 +-
> >  include/configs/mx28evk.h                          |    1 +
> >  include/configs/mx51evk.h                          |   51 +-
> >  include/configs/mx53ard.h                          |  102 +-
> >  include/configs/mx53evk.h                          |    1 +
> >  include/configs/mx53smd.h                          |    1 +
> >  include/configs/mx6_common.h                       |    1 +
> >  include/configs/mx6qsabre_common.h                 |   14 +
> >  include/configs/mx6qsabrelite.h                    |    5 +
> >  include/configs/mx6slevk.h                         |  189 +++
> >  include/configs/nitrogen6x.h                       |    5 +
> >  include/configs/pdm360ng.h                         |    7 +
> >  include/configs/titanium.h                         |  277 +++++
> >  include/configs/wandboard.h                        |   24 +-
> >  .../asm/arch-mx25/sys_proto.h => include/fuse.h    |   30 +-
> >  include/usb/ehci-fsl.h                             |    6 -
> >  spl/Makefile                                       |    8 +
> >  tools/imximage.c                                   |   17 +-
> >  tools/imximage.h                                   |    9 +-
> >  tools/mxsboot.c                                    |    8 +-
> >  160 files changed, 8884 insertions(+), 5340 deletions(-)
> >  delete mode 100644 arch/arm/cpu/arm1136/mx35/iomux.c
> >  delete mode 100644 arch/arm/cpu/armv7/mx5/iomux.c
> >  create mode 100644 arch/arm/imx-common/misc.c
> >  delete mode 100644 arch/arm/include/asm/arch-mx25/imx25-pinmux.h
> >  create mode 100644 arch/arm/include/asm/arch-mx25/iomux-mx25.h
> >  create mode 100644 arch/arm/include/asm/arch-mx35/iomux-mx35.h
> >  delete mode 100644 arch/arm/include/asm/arch-mx35/iomux.h
> >  delete mode 100644 arch/arm/include/asm/arch-mx35/mx35_pins.h
> >  create mode 100644 arch/arm/include/asm/arch-mx5/iomux-mx53.h
> >  delete mode 100644 arch/arm/include/asm/arch-mx5/iomux.h
> >  delete mode 100644 arch/arm/include/asm/arch-mx5/mx5x_pins.h
> >  create mode 100644 arch/arm/include/asm/arch-mx5/spl.h
> >  create mode 100644 arch/arm/include/asm/arch-mx6/mx6sl_pins.h
> >  rename arch/arm/include/asm/{arch-mxs => imx-common}/dma.h (93%)
> >  create mode 100644 arch/arm/include/asm/imx-common/imximage.cfg
> >  rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-apbh.h (97%)
> >  rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-bch.h (96%)
> >  rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-common.h (100%)
> >  rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-gpmi.h (99%)
> >  delete mode 100644 arch/powerpc/cpu/mpc512x/iim.c
> >  create mode 100644 board/denx/m53evk/Makefile
> >  create mode 100644 board/denx/m53evk/imximage.cfg
> >  create mode 100644 board/denx/m53evk/m53evk.c
> >  create mode 100644 board/freescale/mx6slevk/Makefile
> >  create mode 100644 board/freescale/mx6slevk/imximage.cfg
> >  create mode 100644 board/freescale/mx6slevk/mx6slevk.c
> >  create mode 100644 board/freescale/titanium/Makefile
> >  create mode 100644 board/freescale/titanium/imximage.cfg
> >  create mode 100644 board/freescale/titanium/titanium.c
> >  create mode 100644 common/cmd_fuse.c
> >  create mode 100644 doc/README.fsl_iim
> >  create mode 100644 doc/README.fuse
> >  create mode 100644 doc/README.imx25
> >  create mode 100644 doc/README.imx27
> >  create mode 100644 doc/README.imx6
> >  create mode 100644 doc/README.mxc_ocotp
> >  create mode 100644 drivers/misc/fsl_iim.c
> >  create mode 100644 drivers/misc/mxc_ocotp.c
> >  create mode 100644 drivers/video/mxsfb.c
> >  create mode 100644 include/configs/m53evk.h
> >  create mode 100644 include/configs/mx6slevk.h
> >  create mode 100644 include/configs/titanium.h
> >  rename arch/arm/include/asm/arch-mx25/sys_proto.h => include/fuse.h (55%)
> > 
> > Best regards,
> > Stefano
> > 
> 
> Applied to u-boot-arm/master (with two trivial merge resolutions),
> thanks!

Seems like the trivial merge resolution was less trivial than I thought
it was -- I accidentally removed from drivers/mtd/nand/mxc_nand_spl.c
the definitions for nand_init() and nand_deselect(). For some reason
I missed it in the MAKEALL -a arm I did. Rolling back and fixing this.

Amicalement,
Stefano Babic - May 11, 2013, 9:39 a.m.
On 11/05/2013 11:15, Albert ARIBAUD wrote:

Hi Albert,

>> Applied to u-boot-arm/master (with two trivial merge resolutions),
>> thanks!
> 
> Seems like the trivial merge resolution was less trivial than I thought
> it was -- I accidentally removed from drivers/mtd/nand/mxc_nand_spl.c
> the definitions for nand_init() and nand_deselect(). For some reason
> I missed it in the MAKEALL -a arm I did. Rolling back and fixing this.

Please make modifications on top of your current tree - after your first
e-mail, I have already pulled from u-boot-arm and pushed to the server.
If you go back, I had to rebase my tree.

Best regards,
Stefano
Albert ARIBAUD - May 11, 2013, 9:47 a.m.
Hi Stefano,

On Sat, 11 May 2013 11:39:58 +0200, Stefano Babic <sbabic@denx.de>
wrote:

> On 11/05/2013 11:15, Albert ARIBAUD wrote:
> 
> Hi Albert,
> 
> >> Applied to u-boot-arm/master (with two trivial merge resolutions),
> >> thanks!
> > 
> > Seems like the trivial merge resolution was less trivial than I thought
> > it was -- I accidentally removed from drivers/mtd/nand/mxc_nand_spl.c
> > the definitions for nand_init() and nand_deselect(). For some reason
> > I missed it in the MAKEALL -a arm I did. Rolling back and fixing this.
> 
> Please make modifications on top of your current tree - after your first
> e-mail, I have already pulled from u-boot-arm and pushed to the server.
> If you go back, I had to rebase my tree.

Argh! I had already had rolled back and have just finished testing.

I can roll forward again if you confirm that the u-boot-arm/master
branch you have is commit ec7023d.

Otherwise, please push the u-boot-arm/master your are based on onto the 
u-boot-imx repo under a new branch name, e.g.

	git push ssh://gu-imx@git.denx.de/u-boot-imx
		u-boot-arm/master:master-aa

> Best regards,
> Stefano

Amicalement,
Albert ARIBAUD - May 11, 2013, 9:47 a.m.
Hi Stefano,

On Sat, 11 May 2013 11:39:58 +0200, Stefano Babic <sbabic@denx.de>
wrote:

> On 11/05/2013 11:15, Albert ARIBAUD wrote:
> 
> Hi Albert,
> 
> >> Applied to u-boot-arm/master (with two trivial merge resolutions),
> >> thanks!
> > 
> > Seems like the trivial merge resolution was less trivial than I thought
> > it was -- I accidentally removed from drivers/mtd/nand/mxc_nand_spl.c
> > the definitions for nand_init() and nand_deselect(). For some reason
> > I missed it in the MAKEALL -a arm I did. Rolling back and fixing this.
> 
> Please make modifications on top of your current tree - after your first
> e-mail, I have already pulled from u-boot-arm and pushed to the server.
> If you go back, I had to rebase my tree.

Argh! I had already had rolled back and have just finished testing.

I can roll forward again if you confirm that the u-boot-arm/master
branch you have is commit ec7023d.

Otherwise, please push the u-boot-arm/master your are based on onto the 
u-boot-imx repo under a new branch name, e.g.

	git push ssh://gu-imx@git.denx.de/u-boot-imx
		u-boot-arm/master:master-aa

> Best regards,
> Stefano

Amicalement,
Stefano Babic - May 11, 2013, 10:50 a.m.
On 11/05/2013 11:47, Albert ARIBAUD wrote:
> Hi Stefano,
> 

Hi Albert,

> Argh! I had already had rolled back and have just finished testing.
> 
> I can roll forward again if you confirm that the u-boot-arm/master
> branch you have is commit ec7023d.

It is !

commit ec7023db8dc95966919589541f1ca09355a3f7a5
Merge: e825b10 d782c1f
Author: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date:   Sat May 11 09:25:36 2013 +0200

    Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Best regards,
Stefano
Stefano Babic - May 11, 2013, 10:58 a.m.
On 11/05/2013 12:50, Stefano Babic wrote:
> On 11/05/2013 11:47, Albert ARIBAUD wrote:
>> Hi Stefano,
>>
> 
> Hi Albert,
> 
>> Argh! I had already had rolled back and have just finished testing.
>>
>> I can roll forward again if you confirm that the u-boot-arm/master
>> branch you have is commit ec7023d.
> 
> It is !
> 
> commit ec7023db8dc95966919589541f1ca09355a3f7a5
> Merge: e825b10 d782c1f
> Author: Albert ARIBAUD <albert.u.boot@aribaud.net>
> Date:   Sat May 11 09:25:36 2013 +0200
> 
>     Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
> 

I have also pushed u-boot-arm as you suggest with the name uboot_arm on
u-boot-imx.

Best regards,
Stefano
Albert ARIBAUD - May 11, 2013, 11:01 a.m.
Hi Stefano,

On Sat, 11 May 2013 12:50:24 +0200, Stefano Babic <sbabic@denx.de>
wrote:

> On 11/05/2013 11:47, Albert ARIBAUD wrote:
> > Hi Stefano,
> > 
> 
> Hi Albert,
> 
> > Argh! I had already had rolled back and have just finished testing.
> > 
> > I can roll forward again if you confirm that the u-boot-arm/master
> > branch you have is commit ec7023d.
> 
> It is !

Ok, but just a sec. If I put a commit above this, you'll *also* have to
rebase, won't you?

(BTW, I thought rebasing was frowned upon and we should merge instead.)

Amicalement,
Albert ARIBAUD - May 11, 2013, 11:07 a.m.
Hi Stefano,

On Sat, 11 May 2013 12:58:56 +0200, Stefano Babic <sbabic@denx.de>
wrote:

> On 11/05/2013 12:50, Stefano Babic wrote:
> > On 11/05/2013 11:47, Albert ARIBAUD wrote:
> >> Hi Stefano,
> >>
> > 
> > Hi Albert,
> > 
> >> Argh! I had already had rolled back and have just finished testing.
> >>
> >> I can roll forward again if you confirm that the u-boot-arm/master
> >> branch you have is commit ec7023d.
> > 
> > It is !
> > 
> > commit ec7023db8dc95966919589541f1ca09355a3f7a5
> > Merge: e825b10 d782c1f
> > Author: Albert ARIBAUD <albert.u.boot@aribaud.net>
> > Date:   Sat May 11 09:25:36 2013 +0200
> > 
> >     Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
> > 
> 
> I have also pushed u-boot-arm as you suggest with the name uboot_arm on
> u-boot-imx.

Er... Seems like arm_master is exactly the same as u-boot-imx/master. I
thought your master was rebased upon my master?

> Best regards,
> Stefano

Amicalement,
Stefano Babic - May 11, 2013, 11:15 a.m.
On 11/05/2013 13:01, Albert ARIBAUD wrote:
>>
>> It is !
> 
> Ok, but just a sec. If I put a commit above this, you'll *also* have to
> rebase, won't you?

Well, I have not yet published any iMX patches after merging u-boot-arm
this morning. At this point, u-boot-imx is equal to u-boot-arm at commit
commit ec7023, after you pulled u-boot-imx. There is no iMX patches
after that, and that is the reason why it should work.

See u-boot-imx, master: last commit is ec7023.

If you put a commit above, I should merge again your u-boot-arm/master
(and this should go flawless) and only after that I can apply iMX
patches, that I have not yet published.

> 
> (BTW, I thought rebasing was frowned upon and we should merge instead.)

Of course ! We should only merge

Best regards,
Stefano
Stefano Babic - May 11, 2013, 11:18 a.m.
On 11/05/2013 13:07, Albert ARIBAUD wrote:
> Hi Stefano,
> 

Hi Albert,

> 
> Er... Seems like arm_master is exactly the same as u-boot-imx/master. I
> thought your master was rebased upon my master?

I haved pulled your master this morning, and there are not new iMX patches.

Best regards,
Stefano
Albert ARIBAUD - May 11, 2013, 11:26 a.m.
Hi Stefano,

On Sat, 11 May 2013 13:15:37 +0200, Stefano Babic <sbabic@denx.de>
wrote:

> On 11/05/2013 13:01, Albert ARIBAUD wrote:
> >>
> >> It is !
> > 
> > Ok, but just a sec. If I put a commit above this, you'll *also* have to
> > rebase, won't you?
> 
> Well, I have not yet published any iMX patches after merging u-boot-arm
> this morning. At this point, u-boot-imx is equal to u-boot-arm at commit
> commit ec7023, after you pulled u-boot-imx. There is no iMX patches
> after that, and that is the reason why it should work.
> 
> See u-boot-imx, master: last commit is ec7023.
> 
> If you put a commit above, I should merge again your u-boot-arm/master
> (and this should go flawless) and only after that I can apply iMX
> patches, that I have not yet published.
> 
> > 
> > (BTW, I thought rebasing was frowned upon and we should merge instead.)
> 
> Of course ! We should only merge

Ok, so I prefer getting things right before I proceed: after I merged
your PR, you did not rebase your master, you (fast-forward) merged my
master to it. What you have rebased is your next branch, right?

> Best regards,
> Stefano

Amicalement,
Stefano Babic - May 11, 2013, 11:36 a.m.
On 11/05/2013 13:26, Albert ARIBAUD wrote:
>>
>> Of course ! We should only merge
> 
> Ok, so I prefer getting things right before I proceed: after I merged
> your PR, you did not rebase your master,

Right ! Never !

> you (fast-forward) merged my
> master to it.

Correct !

> What you have rebased is your next branch, right?

Right !

Best regards,
Stefano
Albert ARIBAUD - May 11, 2013, 2:32 p.m.
Hi Stefano,

On Sat, 11 May 2013 13:36:45 +0200, Stefano Babic <sbabic@denx.de>
wrote:

> Correct !

Ok - ARM repo rolled forward to ec7023db and patch sent to the list. Ack
it and I'll apply it onto ARM repo.

Amicalement,
Albert ARIBAUD - May 11, 2013, 8:54 p.m.
Hi Albert,

On Sat, 11 May 2013 16:32:18 +0200, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Hi Stefano,
> 
> On Sat, 11 May 2013 13:36:45 +0200, Stefano Babic <sbabic@denx.de>
> wrote:
> 
> > Correct !
> 
> Ok - ARM repo rolled forward to ec7023db and patch sent to the list. Ack
> it and I'll apply it onto ARM repo.

Patch applied, ARM repo back to 100% build-clean.

Amicalement,