On Wed, Aug 20, 2014 at 04:13:34PM +0200, Stefano Babic wrote: > Hi Albert, > > please pull from u-boot-imx, thanks ! > > The following changes since commit 1899fac925eda817e12234aef3d01d354788662e: > > Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master' > (2014-08-09 16:48:34 +0200) > > are available in the git repository at: > > > git://www.denx.de/git/u-boot-imx.git master > > for you to fetch changes up to d145878d59c80a44d8c6e6d606b898ab87d205ee: > > mx6sxsabresd: Add Ethernet support (2014-08-20 13:15:23 +0200) > > ---------------------------------------------------------------- > Fabio Estevam (18): > mx6: Add support for the mx6solox variant > mx6sx: Add pin definitions > mx6: clock: Do not enable sata and ipu clocks > mx6sx: Add initial support for mx6sxsabresd board > mx6: soc: Do not apply the PFD erratum for mx6solox > mx6sxsabresd: Add PFUZE100 PMIC support > mx6: Remove duplication of iomuxc structure > mx6: Adjust the GPR offset for mx6solox > mx6: imx-regs: Remove unused 'omux' field from iomux struct > mx6: crm_regs: Fix CDCDR_SPDIF0_CLK_PODF mask and offset > mx6: crm_regs: Fix MXC_CCM_CLPCR_WB_PER_AT_LPM definition > mx6: crm_regs: Fix MXC_CCM_CIMR_MASK_PERIPH2_CLK_SEL_LOADED > pmic: pmic_pfuze100: Use a shorter name for PMIC name > mx31pdk: Change maintainer > mx6sxsabresd: Update DDR initialization > mx6sxsabresd: Convert to the new Kconfig style > mx6sx: Adjust enable_fec_anatop_clock() for mx6solox > mx6sxsabresd: Add Ethernet support > > Gabriel Huau (1): > mx6: add support of multi-processor command > > Heiko Schocher (6): > imx6: add gpr2 usb_otg_id iomux select control define > i.MX6: define struct pwm_regs and PWMCR_* defines > pwm, imx6: add support for pwm modul on imx6 > i.MX6: add enable_spi_clk() > spi: add config option to enable the WP pin function on st micron > flashes > arm, imx6: add aristainetos board > > Iain Paton (2): > embestmx6boards: convert to generic board > embest/mx6boards: only toggle eMMC usdhc3 RST line on MarSboard > > Magnus Lilja (1): > i.MX31 PDK: Enable generic board for i.MX31 PDK > > Marek Vasut (6): > arm: mxs: Scrub useless ifdef > arm: m53evk: Fix RTC bus number > ARM: mx5: Fix CHSCCDR name > ARM: mx6: Prevent overflow in DRAM size detection > ARM: mx6: Handle the MMDCx_MDCTL COL field caprices > ARM: mx6: Enable Thumb build for SPL > > Markus Niebel (1): > Add TQ Systems TQMa6 board support > > Stefano Babic (4): > Merge branch 'master' of git://git.denx.de/u-boot > Merge branch 'master' of git://git.denx.de/u-boot-arm > Merge branch 'master' of git://git.denx.de/u-boot-arm > Update aristainetos board to Kconfig > > Tim Harvey (11): > pci: mx6: fix occasional link failures > imx: ventana: set dynamic env var for flash layout > imx: ventana: remove caam disable per eeprom bit > imx: ventana: add appropriate delay following GSC i2c write > imx: ventana: add video enable gpio pinmux for GW54xx > imx: ventana: add missing crlf to print > imx: ventana: configure i2c_dis# pin properly for gw53xx > imx: ventana: enable SION bit on gpio outputs > imx: ventana: add iomux for PCISKT_WDIS# gpio > imx: ventana: leave PCI reset de-asserted if PCI enabled > imx: ventana: add econfig command > > README | 15 + > arch/arm/Kconfig | 8 + > arch/arm/cpu/armv7/mx6/Makefile | 1 + > arch/arm/cpu/armv7/mx6/clock.c | 51 ++- > arch/arm/cpu/armv7/mx6/ddr.c | 8 +- > arch/arm/cpu/armv7/mx6/mp.c | 87 ++++++ > arch/arm/cpu/armv7/mx6/soc.c | 36 +++ > arch/arm/imx-common/cpu.c | 7 + > arch/arm/imx-common/sata.c | 3 +- > arch/arm/include/asm/arch-imx/cpu.h | 3 +- > arch/arm/include/asm/arch-mx5/crm_regs.h | 2 +- > arch/arm/include/asm/arch-mx6/clock.h | 1 + > arch/arm/include/asm/arch-mx6/crm_regs.h | 179 ++++++++++- > arch/arm/include/asm/arch-mx6/imx-regs.h | 168 +++++++++- > arch/arm/include/asm/arch-mx6/iomux.h | 10 + > arch/arm/include/asm/arch-mx6/mx6-ddr.h | 4 + > arch/arm/include/asm/arch-mx6/mx6-pins.h | 2 + > arch/arm/include/asm/arch-mx6/mx6sx-ddr.h | 45 +++ > arch/arm/include/asm/arch-mx6/mx6sx_pins.h | 1675 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > arch/arm/include/asm/arch-mx6/sys_proto.h | 1 + > board/aristainetos/Kconfig | 19 ++ > board/aristainetos/MAINTAINERS | 6 + > board/aristainetos/Makefile | 9 + > board/aristainetos/aristainetos.c | 519 > +++++++++++++++++++++++++++++++ > board/aristainetos/aristainetos.cfg | 33 ++ > board/aristainetos/clocks.cfg | 24 ++ > board/aristainetos/ddr-setup.cfg | 61 ++++ > board/aristainetos/mt41j128M.cfg | 70 +++++ > board/boundary/nitrogen6x/nitrogen6x.c | 3 +- > board/embest/mx6boards/mx6boards.c | 1 + > board/freescale/mx31pdk/MAINTAINERS | 2 +- > board/freescale/mx6sabresd/mx6sabresd.c | 2 +- > board/freescale/mx6slevk/mx6slevk.c | 3 +- > board/freescale/mx6sxsabresd/Kconfig | 23 ++ > board/freescale/mx6sxsabresd/MAINTAINERS | 6 + > board/freescale/mx6sxsabresd/Makefile | 6 + > board/freescale/mx6sxsabresd/imximage.cfg | 132 ++++++++ > board/freescale/mx6sxsabresd/mx6sxsabresd.c | 295 ++++++++++++++++++ > board/gateworks/gw_ventana/eeprom.c | 168 +++++++++- > board/gateworks/gw_ventana/gsc.c | 2 +- > board/gateworks/gw_ventana/gw_ventana.c | 271 +++++++--------- > board/gateworks/gw_ventana/ventana_eeprom.h | 11 + > board/solidrun/hummingboard/hummingboard.c | 3 +- > board/tqc/tqma6/tqma6.c | 262 ++++++++++++++++ > board/tqc/tqma6/tqma6_bb.h | 30 ++ > board/tqc/tqma6/tqma6_mba6.c | 361 +++++++++++++++++++++ > board/tqc/tqma6/tqma6q.cfg | 125 ++++++++ > board/tqc/tqma6/tqma6s.cfg | 125 ++++++++ > common/board_f.c | 8 +- > configs/aristainetos_defconfig | 3 + > configs/mx6sxsabresd_defconfig | 3 + > drivers/Makefile | 1 + > drivers/mtd/spi/sf_internal.h | 4 + > drivers/mtd/spi/sf_probe.c | 30 ++ > drivers/pci/pcie_imx.c | 8 +- > drivers/power/pmic/pmic_pfuze100.c | 2 +- > drivers/pwm/Makefile | 13 + > drivers/pwm/pwm-imx-util.c | 73 +++++ > drivers/pwm/pwm-imx-util.h | 16 + > drivers/pwm/pwm-imx.c | 59 ++++ > include/configs/aristainetos.h | 325 +++++++++++++++++++ > include/configs/embestmx6boards.h | 2 + > include/configs/gw_ventana.h | 5 +- > include/configs/imx6_spl.h | 1 + > include/configs/m53evk.h | 2 +- > include/configs/mx31pdk.h | 2 + > include/configs/mx6_common.h | 2 + > include/configs/mx6sxsabresd.h | 216 +++++++++++++ > include/configs/mxs.h | 2 - > include/configs/tqma6.h | 483 > ++++++++++++++++++++++++++++ > 73 files changed, 6001 insertions(+), 205 deletions(-) > create mode 100644 arch/arm/cpu/armv7/mx6/mp.c > create mode 100644 arch/arm/include/asm/arch-mx6/mx6sx-ddr.h > create mode 100644 arch/arm/include/asm/arch-mx6/mx6sx_pins.h > create mode 100644 board/aristainetos/Kconfig > create mode 100644 board/aristainetos/MAINTAINERS > create mode 100644 board/aristainetos/Makefile > create mode 100644 board/aristainetos/aristainetos.c > create mode 100644 board/aristainetos/aristainetos.cfg > create mode 100644 board/aristainetos/clocks.cfg > create mode 100644 board/aristainetos/ddr-setup.cfg > create mode 100644 board/aristainetos/mt41j128M.cfg > create mode 100644 board/freescale/mx6sxsabresd/Kconfig > create mode 100644 board/freescale/mx6sxsabresd/MAINTAINERS > create mode 100644 board/freescale/mx6sxsabresd/Makefile > create mode 100644 board/freescale/mx6sxsabresd/imximage.cfg > create mode 100644 board/freescale/mx6sxsabresd/mx6sxsabresd.c > create mode 100644 board/tqc/tqma6/Makefile > create mode 100644 board/tqc/tqma6/README > create mode 100644 board/tqc/tqma6/clocks.cfg > create mode 100644 board/tqc/tqma6/tqma6.c > create mode 100644 board/tqc/tqma6/tqma6_bb.h > create mode 100644 board/tqc/tqma6/tqma6_mba6.c > create mode 100644 board/tqc/tqma6/tqma6q.cfg > create mode 100644 board/tqc/tqma6/tqma6s.cfg > create mode 100644 configs/aristainetos_defconfig > create mode 100644 configs/mx6sxsabresd_defconfig > create mode 100644 drivers/pwm/Makefile > create mode 100644 drivers/pwm/pwm-imx-util.c > create mode 100644 drivers/pwm/pwm-imx-util.h > create mode 100644 drivers/pwm/pwm-imx.c > create mode 100644 include/configs/aristainetos.h > create mode 100644 include/configs/mx6sxsabresd.h > create mode 100644 include/configs/tqma6.h
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot