Hi Albert,

please pull from u-boot-imx, master. Conflicts are fixed, request pull is generated from u-boot/master, as I merged it (so you see also the commits you have already merged into u-boot-arm from my previous pull request):

The following changes since commit fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:

Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07 08:47:59 -0700)

are available in the git repository at:

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

for you to fetch changes up to 05a860c228fe6c8f2e7aced8cc8ef88bc1038363:

Merge branch 'master' of git://git.denx.de/u-boot into master (2012-12-08 12:02:45 +0100)

----------------------------------------------------------------

Benoît Thébaudeau (16): mx31: Move EHCI definitions to ehci-fsl.h ehci-mxc: Clean up ehci-mx5: Clean up ehci-mx5: Fix OC_DIS usage ehci-mx5: Fix OPM usage ehci-mx5: Fix *PM usage for i.MX53 ehci-mx5: Add missing OC_DIS for i.MX53 ehci-mxc: Make EHCI power/oc polarities configurable ehci-mxc: Make i.MX25 EHCI configurable ehci-mxc: Define host offsets ehci-mxc: Add support for i.MX35 mx35pdk: Add support for OTG ehci-mx5/6: Make board_ehci_hcd_init() optional ehci-mxc: Fix host power mask bit for i.MX35 ehci-mxc: Fix host power mask bit for i.MX25 mx5: Mark lowlevel_init board-specific code

Fabio Estevam (24): mx25pdk: Include CONFIG_MX25 mx25pdk: Add esdhc support pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH mx25: Place common functions into sys_proto.h pmic: Add support for mc34704 mx25pdk: Add Ethernet support mx53loco: Allow booting a zImage kernel mx25pdk: Allow booting a zImage kernel mx51evk: Allow booting a zImage kernel mx35pdk: Allow booting a zImage kernel mx6qsabre_common: Allow booting a zImage kernel mx5: Align SPI CS naming with i.MX53 reference manual mx5: Print CSPI clock in 'clock' command spi: mxc_spi: Fix handling of chip select spi: mxc_spi: Fix spi clock glitch durant reset mx6: clock: Only show CSPI clock if CSPI is enabled mx28evk: Configure CONFIG_BOOTDELAY to one second mx53loco: Configure CONFIG_BOOTDELAY to one second mx6qsabrelite: Configure CONFIG_BOOTDELAY to one second mx6qsabre_common: Configure CONFIG_BOOTDELAY to one second mx51evk: Configure CONFIG_BOOTDELAY to one second mx25pdk: Configure CONFIG_BOOTDELAY to one second mx31pdk: Configure CONFIG_BOOTDELAY to one second mx35pdk: Configure CONFIG_BOOTDELAY to one second

Marek Vasut (8): mx28: Fix typo in POWER_MINPWR_VBG_OFF mx28: Fix typo in POWER_DCLIMITS_NEGLIMIT_OFFSET mx28: Remove SET, CLR, TOG ops from PLLxCTRL1 registers mx28: Rename regs-power.h to regs-power-mx28.h mxs: Silence elftosb mxs: Implement common function to setup VDDx mxs: Properly setup VDDD in power supply setup code mxs: Staticize SPL functions

Otavio Salvador (1): mxs: SPL: Generalize memory initialization

Stefano Babic (9): ARM: Fix start.S when used with SPL in arm1136 MX35: add LOW_LEVEL_SRAM_STACK to use SPL_FRAMEWORK MX35: Add soc_boot_mode and soc_boot_device to MX35 SPL: Added SPL target for mx35 SOC to SPL Makefile ARM: Add SPL target to arm1136 MX35: add support for woodburn board MX5: added CONFIG_PMIC_FSL_MC13892 to mx53evk Merge git://git.denx.de/u-boot Merge branch 'master' of git://git.denx.de/u-boot into master

Troy Kisky (4): mx6: soc: update get_cpu_rev and get_imx_type for mx6solo/sololite mx6: use CONFIG_MX6 instead of CONFIG_MX6Q imx-common: cpu: add imx_ddr_size arch-mx6: add mx6dl_pins.h

MAINTAINERS | 1 + Makefile | 3 +- arch/arm/cpu/arm1136/config.mk | 3 + arch/arm/cpu/arm1136/mx35/Makefile | 1 + arch/arm/cpu/arm1136/mx35/generic.c | 75 +++++ arch/arm/cpu/arm1136/mx35/mx35_sdram.c | 137 +++++++++ arch/arm/cpu/arm1136/start.S | 31 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 62 ++++ arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 4 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 38 +-- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 305 +++++++------------ arch/arm/cpu/armv7/mx5/clock.c | 4 +- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 2 +- arch/arm/cpu/armv7/mx6/clock.c | 2 + arch/arm/cpu/armv7/mx6/soc.c | 32 +- arch/arm/imx-common/cpu.c | 66 ++++- arch/arm/include/asm/arch-mx25/imx-regs.h | 5 +- arch/arm/include/asm/arch-mx25/sys_proto.h | 3 + arch/arm/include/asm/arch-mx31/imx-regs.h | 27 +- arch/arm/include/asm/arch-mx35/imx-regs.h | 4 + arch/arm/include/asm/arch-mx35/mmc_host_def.h | 31 ++ arch/arm/include/asm/arch-mx35/spl.h | 38 +++ arch/arm/include/asm/arch-mx5/mx5x_pins.h | 6 +- arch/arm/include/asm/arch-mx5/sys_proto.h | 10 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 149 ++++++++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 10 +- arch/arm/include/asm/arch-mxs/imx-regs.h | 7 +- arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h | 6 +- .../arch-mxs/{regs-power.h => regs-power-mx28.h} | 4 +- board/freescale/mx25pdk/mx25pdk.c | 114 +++++++ board/freescale/mx31ads/u-boot.lds | 2 + board/freescale/mx35pdk/lowlevel_init.S | 4 + board/freescale/mx35pdk/mx35pdk.c | 21 ++ board/syteco/zmx25/zmx25.c | 1 + board/woodburn/Makefile | 43 +++ board/woodburn/imximage.cfg | 4 + board/woodburn/lowlevel_init.S | 38 +++ board/woodburn/woodburn.c | 265 +++++++++++++++++ boards.cfg | 2 + doc/README.imx5 | 5 + drivers/gpio/mxc_gpio.c | 6 +- drivers/power/power_fsl.c | 8 +- drivers/spi/mxc_spi.c | 9 +- drivers/usb/host/ehci-mx5.c | 146 +++++++-- drivers/usb/host/ehci-mx6.c | 5 + drivers/usb/host/ehci-mxc.c | 225 ++++++++++---- drivers/video/ipu_regs.h | 2 +- include/configs/mx25pdk.h | 42 ++- include/configs/mx28evk.h | 2 +- include/configs/mx31pdk.h | 2 +- include/configs/mx35pdk.h | 18 +- include/configs/mx51_efikamx.h | 1 + include/configs/mx51evk.h | 5 +- include/configs/mx53evk.h | 1 + include/configs/mx53loco.h | 4 +- include/configs/mx6qarm2.h | 1 + include/configs/mx6qsabre_common.h | 4 +- include/configs/mx6qsabrelite.h | 3 +- include/configs/vision2.h | 1 + include/configs/woodburn.h | 34 +++ include/configs/woodburn_common.h | 313 ++++++++++++++++++++ include/configs/woodburn_sd.h | 60 ++++ include/configs/zmx25.h | 6 +- include/mc34704.h | 49 +++ include/usb/ehci-fsl.h | 28 +- nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 + spl/Makefile | 6 + 69 files changed, 2159 insertions(+), 393 deletions(-) create mode 100644 arch/arm/cpu/arm1136/mx35/mx35_sdram.c create mode 100644 arch/arm/cpu/arm1136/u-boot-spl.lds create mode 100644 arch/arm/include/asm/arch-mx35/mmc_host_def.h create mode 100644 arch/arm/include/asm/arch-mx35/spl.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl_pins.h rename arch/arm/include/asm/arch-mxs/{regs-power.h => regs-power-mx28.h} (99%) create mode 100644 board/woodburn/Makefile create mode 100644 board/woodburn/imximage.cfg create mode 100644 board/woodburn/lowlevel_init.S create mode 100644 board/woodburn/woodburn.c create mode 100644 include/configs/woodburn.h create mode 100644 include/configs/woodburn_common.h create mode 100644 include/configs/woodburn_sd.h create mode 100644 include/mc34704.h

Regards, Stefano

Am 21/12/2012 21:46, schrieb Albert ARIBAUD:

Hi Stefano,

Hi Albert,

Hmm, your request says master but the 'up to' points to 'master merge'. As master has a few more commits including changes to woodburn boards that makes them use the new power interface, I guess I should ignore the 'up to' and simply use master (b874df74...)?

Yes, please use master (b874df74af..), thanks.

Stefano