Hi Andreas, On Sun, 12 May 2013 17:01:39 +0200, Andreas Bießmann <andreas.de...@googlemail.com> wrote:
> Dear Albert Aribaud, > > please pull the following changes from u-boot-atmel/master into > u-boot-arm/master. > > The following changes since commit cac423a730d3506154744485af1bbc1cd3a1e6a8: > > Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' (2013-05-11 > 22:24:28 +0200) > > are available in the git repository at: > > > git://git.denx.de/u-boot-atmel.git master > > for you to fetch changes up to d0a51373131c4ba565a2391d5ed78b87c406ce98: > > at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 > +0200) > > ---------------------------------------------------------------- > Andreas Bießmann (1): > at91sam9260ek: move board id setup to config header > > Bo Shen (3): > spi: atmel_spi: using ip version to check whether has wdrbt > mmc: atmel_mci: using IP version for different setting > mmc: atmel_mci: add mmc card support > > Wu, Josh (4): > arm: at91: add at91sam9n12 register definition > arm: at91: add at91sam9n12ek board support > arm: at91: enable mci support for at91sam9g20ek. > arm: at91: add at91sam9g20ek_mmc_config, which can save environment in > mmc card > > MAINTAINERS | 3 + > arch/arm/cpu/arm926ejs/at91/Makefile | 1 + > arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | 4 + > arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c | 177 +++++++++++++++ > arch/arm/cpu/arm926ejs/at91/clock.c | 4 +- > arch/arm/include/asm/arch-at91/at91_common.h | 1 + > arch/arm/include/asm/arch-at91/at91sam9_matrix.h | 2 +- > arch/arm/include/asm/arch-at91/at91sam9x5.h | 19 +- > arch/arm/include/asm/arch-at91/at91sam9x5_matrix.h | 17 +- > arch/arm/include/asm/arch-at91/hardware.h | 2 +- > board/atmel/at91sam9260ek/at91sam9260ek.c | 22 +- > board/atmel/at91sam9n12ek/Makefile | 52 +++++ > board/atmel/at91sam9n12ek/at91sam9n12ek.c | 228 +++++++++++++++++++ > boards.cfg | 4 + > drivers/mmc/gen_atmel_mci.c | 47 +++- > drivers/spi/atmel_spi.c | 15 +- > drivers/spi/atmel_spi.h | 2 +- > include/atmel_mci.h | 2 + > include/configs/at91sam9260ek.h | 52 ++++- > include/configs/at91sam9n12ek.h | 232 > ++++++++++++++++++++ > 20 files changed, 852 insertions(+), 34 deletions(-) > create mode 100644 arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c > create mode 100644 board/atmel/at91sam9n12ek/Makefile > create mode 100644 board/atmel/at91sam9n12ek/at91sam9n12ek.c > create mode 100644 include/configs/at91sam9n12ek.h Applied to u-boot-arm/master, thanks! Amicalement, -- Albert. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot