Dear Jean-Christophe PLAGNIOL-VILLARD,
In message <[EMAIL PROTECTED]> you wrote:
>
> please pull he following changes since commit
> 7c84fe6a06dad9f793ed85b39b1e6c11a7882f5c:
> Bartlomiej Sieka (1):
> Fix to the auto-update feature documentation
> (CONFIG_UPDATE_TFTP_MSEC_MAX)
>
> are available in the git repository at:
>
> git://git.denx.de/u-boot-arm.git master
I will merge your tree, but I'm not happy about it.
> Jean-Christophe PLAGNIOL-VILLARD (4):
> move README.nios_CONFIG_SYS_NIOS_CPU to doc
> FPGA: move fpga drivers to drivers/fpga
> common/Makefile: create others group for non core, environment and
> command files
> Makefile/at91sam9: move some at91sam9 to the correct subsection for
> arm926ejs
None of these patches should be present in the ARM repository.
Makefile/at91sam9 should be in the AT91 repo.
The other patches were not your responsibility. You should not have
applied these at all.
Please do NOT do this again.
> Roman Mashak (2):
> ARM/Versatile port: Removed unused functions
> ARM926EJ-S: relocate OMAP specific 'cpuinfo.c' into OMAP directory
>
> Sergey Lapin (1):
> Custom AFEB9260 board support
>
> Tomohiro Masubuchi (1):
> Change to use "do_div" macro
>
> MAINTAINERS | 4 +
> MAKEALL | 1 +
> Makefile | 22 +-
> board/afeb9260/Makefile | 56 +++++
> board/afeb9260/afeb9260.c | 243
> ++++++++++++++++++++
> board/afeb9260/config.mk | 1 +
> board/afeb9260/nand.c | 78 +++++++
> board/afeb9260/partition.c | 37 +++
> board/versatile/versatile.c | 22 --
> common/Makefile | 18 +-
> cpu/arm1136/mx31/interrupts.c | 58 ++++-
> cpu/arm926ejs/Makefile | 2 +-
> cpu/arm926ejs/omap/Makefile | 2 +-
> cpu/arm926ejs/{ => omap}/cpuinfo.c | 0
> .../README.nios_CONFIG_SYS_NIOS_CPU | 0
> {common => drivers/fpga}/ACEX1K.c | 0
> drivers/fpga/Makefile | 58 +++++
> {common => drivers/fpga}/altera.c | 0
> {common => drivers/fpga}/cyclon2.c | 0
> {common => drivers/fpga}/fpga.c | 0
> {common => drivers/fpga}/spartan2.c | 0
> {common => drivers/fpga}/spartan3.c | 0
> {common => drivers/fpga}/stratixII.c | 0
> {common => drivers/fpga}/virtex2.c | 0
> {common => drivers/fpga}/xilinx.c | 0
> include/configs/afeb9260.h | 169 ++++++++++++++
> 26 files changed, 712 insertions(+), 59 deletions(-)
> create mode 100644 board/afeb9260/Makefile
> create mode 100644 board/afeb9260/afeb9260.c
> create mode 100644 board/afeb9260/config.mk
> create mode 100644 board/afeb9260/nand.c
> create mode 100644 board/afeb9260/partition.c
> rename cpu/arm926ejs/{ => omap}/cpuinfo.c (100%)
> rename README.nios_CONFIG_SYS_NIOS_CPU =>
> doc/README.nios_CONFIG_SYS_NIOS_CPU (100%)
> rename {common => drivers/fpga}/ACEX1K.c (100%)
> create mode 100644 drivers/fpga/Makefile
> rename {common => drivers/fpga}/altera.c (100%)
> rename {common => drivers/fpga}/cyclon2.c (100%)
> rename {common => drivers/fpga}/fpga.c (100%)
> rename {common => drivers/fpga}/spartan2.c (100%)
> rename {common => drivers/fpga}/spartan3.c (100%)
> rename {common => drivers/fpga}/stratixII.c (100%)
> rename {common => drivers/fpga}/virtex2.c (100%)
> rename {common => drivers/fpga}/xilinx.c (100%)
> create mode 100644 include/configs/afeb9260.h
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
In a business, marketroids, salespukes, and lawyers have different
goals from those who actually do work and produce something. Usually,
is is the former who triumph over the latter, due to the simple rule
that those who print the money make the rules.
-- Tom Christiansen in <[EMAIL PROTECTED]>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
