| Message ID | 530481C5.5080907@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Stefano, On Wed, 19 Feb 2014 11:04:53 +0100, Stefano Babic <sbabic@denx.de> wrote: > Hi Albert, > > please pull from u-boot-imx, thanks ! > > > The following changes since commit e97f9d817e600cd6f43d1d0da76f5787e33a5c56: > > Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' (2014-01-29 > 14:07:50 +0100) > > are available in the git repository at: > > > git://www.denx.de/git/u-boot-imx.git master > > for you to fetch changes up to da781c60e5d55904d77931fcb63f25e65e2228be: > > imx6 SION bit has to be on for the pins that are used as ENET_REF_CLK > (2014-02-19 10:57:25 +0100) > > ---------------------------------------------------------------- > Andy Ng (1): > imx6 SION bit has to be on for the pins that are used as ENET_REF_CLK > > Anson Huang (2): > imx6: ensure AHB clock is 132MHz in low freq boot mode > imx6: make sure MMDC_CHx_MASK is clear to avoid warm reset failure > > Eric Nelson (1): > i.MX6: nitrogen6x: pedantic: BOOT_FROM==spi, not sd > > Fabio Estevam (8): > nitrogen6x: README: Only calling 'make' is enough > nitrogen6x: README: Do not refer to MAINTAINERS file > mx6sl: Adjust fdt_addr to avoid address overlapping > hummingboard: Return from cpu_eth_init() directly > imx: Introduce a header for the imx cpu versions > mx6: Distinguish mx6dual from mx6quad > mx6qsabreauto: Update imximage.cfg > mx6: Enable L2 cache support > > Marek Vasut (7): > ARM: armv7: Make indirect vector addresses globl > ARM: mx6: Add PCI express clock configuration > ARM: mx6: Add PCI express driver > ARM: mx6: Enable PCIe on Sabrelite > ARM: m53evk: Rename mxc-nand to mxc_nand > ARM: m53evk: Enable CONFIG_REGEX > pci: mx6: Implement reset callback > > Markus Niebel (2): > ARM: imx6: fix wrong fec clk > NET: fec_mxc: fix MDIO clock prescaler calculation > > Otavio Salvador (11): > cgtqmx6eval: Set default environment to use zImage > hummingboard: Set default environment to use zImage > mx23evk: Set default environment to use zImage > mx28evk: Set default environment to use zImage > mx51evk: Set default environment to use zImage > mx53loco: Set default environment to use zImage > mx6qarm2: Set default environment to use zImage > mx6sabre_common: Set default environment to use zImage > mx6slevk: Set default environment to use zImage > udoo: Set default environment to use zImage > vf610twr: Set default environment to use zImage > > Stefano Babic (2): > Merge branch 'master' of git://git.denx.de/u-boot-arm > Merge branch 'master' of git://git.denx.de/u-boot-arm > > arch/arm/cpu/armv7/mx6/clock.c | 77 +++- > arch/arm/cpu/armv7/mx6/soc.c | 103 ++++- > arch/arm/cpu/armv7/start.S | 7 + > arch/arm/imx-common/cpu.c | 2 + > arch/arm/include/asm/arch-imx/cpu.h | 13 + > arch/arm/include/asm/arch-mx5/sys_proto.h | 7 +- > arch/arm/include/asm/arch-mx6/clock.h | 1 + > arch/arm/include/asm/arch-mx6/imx-regs.h | 1 + > arch/arm/include/asm/arch-mx6/iomux.h | 27 ++ > arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 6 +- > arch/arm/include/asm/arch-mx6/mx6q_pins.h | 6 +- > arch/arm/include/asm/arch-mx6/sys_proto.h | 8 +- > arch/arm/include/asm/pl310.h | 21 + > board/boundary/nitrogen6x/README | 4 +- > board/boundary/nitrogen6x/nitrogen6dl.cfg | 2 +- > board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 2 +- > board/boundary/nitrogen6x/nitrogen6q.cfg | 2 +- > board/boundary/nitrogen6x/nitrogen6q2g.cfg | 2 +- > board/boundary/nitrogen6x/nitrogen6s.cfg | 2 +- > board/boundary/nitrogen6x/nitrogen6s1g.cfg | 2 +- > board/freescale/mx6qsabreauto/imximage.cfg | 136 +++--- > board/solidrun/hummingboard/hummingboard.c | 6 +- > drivers/net/fec_mxc.c | 8 +- > drivers/pci/Makefile | 1 + > drivers/pci/pcie_imx.c | 606 > +++++++++++++++++++++++++++ > include/configs/cgtqmx6eval.h | 14 +- > include/configs/hummingboard.h | 20 +- > include/configs/m53evk.h | 6 +- > include/configs/mx23evk.h | 12 +- > include/configs/mx28evk.h | 26 +- > include/configs/mx51evk.h | 20 +- > include/configs/mx53loco.h | 20 +- > include/configs/mx6_common.h | 5 + > include/configs/mx6qarm2.h | 10 +- > include/configs/mx6sabre_common.h | 20 +- > include/configs/mx6slevk.h | 22 +- > include/configs/nitrogen6x.h | 11 + > include/configs/udoo.h | 20 +- > include/configs/vf610twr.h | 20 +- > 39 files changed, 1049 insertions(+), 229 deletions(-) > create mode 100644 arch/arm/include/asm/arch-imx/cpu.h > create mode 100644 drivers/pci/pcie_imx.c > > > Applied to u-boot-arm/master, thanks! Amicalement,
Hi Albert, please pull from u-boot-imx, thanks ! The following changes since commit e97f9d817e600cd6f43d1d0da76f5787e33a5c56: Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' (2014-01-29 14:07:50 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to da781c60e5d55904d77931fcb63f25e65e2228be: imx6 SION bit has to be on for the pins that are used as ENET_REF_CLK (2014-02-19 10:57:25 +0100) ---------------------------------------------------------------- Andy Ng (1): imx6 SION bit has to be on for the pins that are used as ENET_REF_CLK Anson Huang (2): imx6: ensure AHB clock is 132MHz in low freq boot mode imx6: make sure MMDC_CHx_MASK is clear to avoid warm reset failure Eric Nelson (1): i.MX6: nitrogen6x: pedantic: BOOT_FROM==spi, not sd Fabio Estevam (8): nitrogen6x: README: Only calling 'make' is enough nitrogen6x: README: Do not refer to MAINTAINERS file mx6sl: Adjust fdt_addr to avoid address overlapping hummingboard: Return from cpu_eth_init() directly imx: Introduce a header for the imx cpu versions mx6: Distinguish mx6dual from mx6quad mx6qsabreauto: Update imximage.cfg mx6: Enable L2 cache support Marek Vasut (7): ARM: armv7: Make indirect vector addresses globl ARM: mx6: Add PCI express clock configuration ARM: mx6: Add PCI express driver ARM: mx6: Enable PCIe on Sabrelite ARM: m53evk: Rename mxc-nand to mxc_nand ARM: m53evk: Enable CONFIG_REGEX pci: mx6: Implement reset callback Markus Niebel (2): ARM: imx6: fix wrong fec clk NET: fec_mxc: fix MDIO clock prescaler calculation Otavio Salvador (11): cgtqmx6eval: Set default environment to use zImage hummingboard: Set default environment to use zImage mx23evk: Set default environment to use zImage mx28evk: Set default environment to use zImage mx51evk: Set default environment to use zImage mx53loco: Set default environment to use zImage mx6qarm2: Set default environment to use zImage mx6sabre_common: Set default environment to use zImage mx6slevk: Set default environment to use zImage udoo: Set default environment to use zImage vf610twr: Set default environment to use zImage Stefano Babic (2): Merge branch 'master' of git://git.denx.de/u-boot-arm Merge branch 'master' of git://git.denx.de/u-boot-arm arch/arm/cpu/armv7/mx6/clock.c | 77 +++- arch/arm/cpu/armv7/mx6/soc.c | 103 ++++- arch/arm/cpu/armv7/start.S | 7 + arch/arm/imx-common/cpu.c | 2 + arch/arm/include/asm/arch-imx/cpu.h | 13 + arch/arm/include/asm/arch-mx5/sys_proto.h | 7 +- arch/arm/include/asm/arch-mx6/clock.h | 1 + arch/arm/include/asm/arch-mx6/imx-regs.h | 1 + arch/arm/include/asm/arch-mx6/iomux.h | 27 ++ arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 6 +- arch/arm/include/asm/arch-mx6/mx6q_pins.h | 6 +- arch/arm/include/asm/arch-mx6/sys_proto.h | 8 +- arch/arm/include/asm/pl310.h | 21 + board/boundary/nitrogen6x/README | 4 +- board/boundary/nitrogen6x/nitrogen6dl.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6q.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6q2g.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6s.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6s1g.cfg | 2 +- board/freescale/mx6qsabreauto/imximage.cfg | 136 +++--- board/solidrun/hummingboard/hummingboard.c | 6 +- drivers/net/fec_mxc.c | 8 +- drivers/pci/Makefile | 1 + drivers/pci/pcie_imx.c | 606 +++++++++++++++++++++++++++ include/configs/cgtqmx6eval.h | 14 +- include/configs/hummingboard.h | 20 +- include/configs/m53evk.h | 6 +- include/configs/mx23evk.h | 12 +- include/configs/mx28evk.h | 26 +- include/configs/mx51evk.h | 20 +- include/configs/mx53loco.h | 20 +- include/configs/mx6_common.h | 5 + include/configs/mx6qarm2.h | 10 +- include/configs/mx6sabre_common.h | 20 +- include/configs/mx6slevk.h | 22 +- include/configs/nitrogen6x.h | 11 + include/configs/udoo.h | 20 +- include/configs/vf610twr.h | 20 +- 39 files changed, 1049 insertions(+), 229 deletions(-) create mode 100644 arch/arm/include/asm/arch-imx/cpu.h create mode 100644 drivers/pci/pcie_imx.c