This series has been updated to merge cleanly on top of Scotts nand tree which had earlier mxc nand conflicts
The whole series is included for completeness even though most patches have not changed.
Changes since v2:
0001-mxc_serial-replace-platform-specific-clock.patch unchanged 0002-arm926ejs-add-nand_spl-boot-support.patch unchanged 0003-Add-MX25-support-to-nand_spl-fsl-nfc-driver.patch unchanged 0004-Nand-mxc_nand-add-v1.1-controller-support.patch updated to apply cleanly to current nand tree 0005-fec_mxc-cleanup-and-factor-out-imx27-dependencies.patch unchanged 0006-Add-support-for-Freescale-MX25-SOC.patch unchanged 0007-fec_mxc-add-imx25-support.patch small changes associated with the nand changes 0008-Add-support-for-KARO-TX25-board.patch small changes associated with the nand changes (this was 0009 in previous series, the previous 0008 has already been merged)
John Rigby (8): mxc_serial replace platform specific clock arm926ejs: add nand_spl boot support Add MX25 support to nand_spl fsl nfc driver Nand mxc_nand add v1.1 controller support fec_mxc: cleanup and factor out MX27 dependencies Add support for Freescale MX25 SOC fec_mxc: add MX25 support Add support for KARO TX25 board
MAINTAINERS | 4 + Makefile | 4 + board/karo/tx25/Makefile | 51 +++ board/karo/tx25/config.mk | 5 + board/karo/tx25/lowlevel_init.S | 131 +++++++ board/karo/tx25/tx25.c | 176 +++++++++ cpu/arm926ejs/mx25/Makefile | 46 +++ cpu/arm926ejs/mx25/generic.c | 263 +++++++++++++ cpu/arm926ejs/mx25/reset.c | 56 +++ cpu/arm926ejs/mx25/timer.c | 187 +++++++++ cpu/arm926ejs/mx27/generic.c | 5 + cpu/arm926ejs/start.S | 42 ++- drivers/mtd/nand/mxc_nand.c | 617 ++++++++++++++++++++++++++---- drivers/net/fec_mxc.c | 57 ++- drivers/net/fec_mxc.h | 32 ++- drivers/serial/serial_mxc.c | 16 +- include/asm-arm/arch-mx25/clock.h | 36 ++ include/asm-arm/arch-mx25/imx-regs.h | 316 +++++++++++++++ include/asm-arm/arch-mx25/imx25-pinmux.h | 421 ++++++++++++++++++++ include/asm-arm/arch-mx27/clock.h | 3 + include/asm-arm/arch-mx31/mx31.h | 1 + include/configs/mx31pdk.h | 4 + include/configs/tx25.h | 179 +++++++++ include/fsl_nfc.h | 78 ++++- nand_spl/board/karo/tx25/Makefile | 78 ++++ nand_spl/board/karo/tx25/config.mk | 1 + nand_spl/board/karo/tx25/u-boot.lds | 58 +++ nand_spl/nand_boot_fsl_nfc.c | 72 +++- 28 files changed, 2812 insertions(+), 127 deletions(-) create mode 100644 board/karo/tx25/Makefile create mode 100644 board/karo/tx25/config.mk create mode 100644 board/karo/tx25/lowlevel_init.S create mode 100644 board/karo/tx25/tx25.c create mode 100644 cpu/arm926ejs/mx25/Makefile create mode 100644 cpu/arm926ejs/mx25/generic.c create mode 100644 cpu/arm926ejs/mx25/reset.c create mode 100644 cpu/arm926ejs/mx25/timer.c create mode 100644 include/asm-arm/arch-mx25/clock.h create mode 100644 include/asm-arm/arch-mx25/imx-regs.h create mode 100644 include/asm-arm/arch-mx25/imx25-pinmux.h create mode 100644 include/configs/tx25.h create mode 100644 nand_spl/board/karo/tx25/Makefile create mode 100644 nand_spl/board/karo/tx25/config.mk create mode 100644 nand_spl/board/karo/tx25/u-boot.lds