[U-Boot] Please pull u-boot-atmel/for2010.12

Message ID 4CFE576D.4000202@emk-elektronik.de
State Not Applicable
Delegated to: Wolfgang Denk
Headers show


git://git.denx.de/u-boot-atmel.git for2010.12


Reinhard Meyer Dec. 7, 2010, 3:49 p.m.
Dear Wolfgang Denk,
> Well, the point is that your referenc ist not the ARM tree, but you
> pulled inbetween and thus have stuff in your tree that is not present
> in u-boot-arm # master yet - so when I pull from your repo, I will get
> all this stuff as well.

Umm, thats true. I pulled from u-boot.git/master to my master.
I will repull/rebase that to u-boot-arm. Did not think about that.
Previously I was just lucky that u-boot-arm was identical to u-boot :) 
Solves one mystery.

>> For Andreas' patches, it seems that Signed-off-by: lines with non-ASCII characters in the name do cause
>> trouble and git-am choses to use the e-mail address instead.
> I don't think that this is a problem with git-am.
> When I use git-am to apply one of Andreas' patches, I will get a
> warning but only for the body of the commit message (for the SoB line,
> to be precise):
> ...
> Applying: at91rm9200ek: add configure target for RAM boot
> Warning: commit message does not conform to UTF-8.
> You may want to amend it after fixing the message, or set the config
> variable i18n.commitencoding to the encoding your project uses.
> But except from that it works fine, and it shows 
> Author: Andreas Bießmann <andreas.devel@googlemail.com>  2010-11-30 20:45:03
> Committer: Wolfgang Denk <wd@denx.de>  2010-12-07 15:28:06
> I get identical results when downloading the mbox file from patchwork
> or when using the file in my local mailing list archive.

What I get when I do that (after save to disk the mbox files):

reinhard@sieb:~/embedded/u-boot-atmel$ git-am ../u-boot-patches/*.patch
Applying at91rm9200ek: fix SDRAM initialistation values
Applying at91rm9200ek: add configure target for RAM boot
Applying MAKEALL: fix AT91
Applying arm920t/at91/reset: board_reset: define weak symbol
Applying arm920t/at91/timer: replace bss variables by gd
reinhard@sieb:~/embedded/u-boot-atmel$ gitk
reinhard@sieb:~/embedded/u-boot-atmel$ git-request-pull master git://git.denx.de/u-boot-atmel.git to2010.12 >pull.txt
reinhard@sieb:~/embedded/u-boot-atmel$ cat pull.txt
The following changes since commit 52eb2c79110151b9017a0829c4d44ee7b8e2ca04:
  Wolfgang Denk (1):
        Merge branch 'master' of git://git.denx.de/u-boot-samsung

are available in the git repository at:

  git://git.denx.de/u-boot-atmel.git for2010.12

Andreas Bießmann (1):
      arm920t/at91/reset: board_reset: define weak symbol

Reinhard Meyer (3):
      AT91: gen_atmel_mci.c: fix bug when Slot B is used
      AT91: fix EMAC gpio init in at91sam9260_devices.c
      AT91: add TOP9000 support

andreas.devel@googlemail.com (4):
      at91rm9200ek: fix SDRAM initialistation values
      at91rm9200ek: add configure target for RAM boot
      MAKEALL: fix AT91
      arm920t/at91/timer: replace bss variables by gd

 MAINTAINERS                                       |    3 +-
 MAKEALL                                           |   18 +-
 arch/arm/cpu/arm920t/at91/reset.c                 |    8 +-
 arch/arm/cpu/arm920t/at91/timer.c                 |   29 +-
 arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c |    5 +
 arch/arm/include/asm/global_data.h                |    1 +
 board/atmel/at91rm9200ek/config.mk                |    2 -
 board/emk/top9000/Makefile                        |   54 ++++
 board/emk/top9000/spi.c                           |   61 ++++
 board/emk/top9000/top9000.c                       |  290 +++++++++++++++++++
 boards.cfg                                        |    5 +-
 drivers/mmc/gen_atmel_mci.c                       |    1 +
 include/configs/at91rm9200ek.h                    |   18 ++-
 include/configs/top9000.h                         |  314 +++++++++++++++++++++
 14 files changed, 771 insertions(+), 38 deletions(-)
 delete mode 100644 board/atmel/at91rm9200ek/config.mk
 create mode 100644 board/emk/top9000/Makefile
 create mode 100644 board/emk/top9000/spi.c
 create mode 100644 board/emk/top9000/top9000.c
 create mode 100644 include/configs/top9000.h

The ones he sent via the googlemail.com account still look funny for the Author part.
But does that really matter. The commit itself, including the Signed-off-by line os fine.

Best Regards,