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

login
register
mail settings
Submitter Reinhard Meyer
Date Dec. 6, 2010, 9:43 a.m.
Message ID <4CFCB04B.10406@emk-elektronik.de>
Download mbox
Permalink /patch/74327/
State Not Applicable
Delegated to: Wolfgang Denk
Headers show

Pull-request

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

Comments

Reinhard Meyer - Dec. 6, 2010, 9:43 a.m.
Dear Wolfgang, Albert,

The following changes since commit 49733aa0b9d29803384ad4bce74985f4bbe7e9aa:
  Wolfgang Denk (1):
        Merge branch 'master' of /home/wd/git/u-boot/custodians

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: add configure target for RAM boot
      MAKEALL: fix AT91
      arm920t/at91/timer: replace bss variables by gd
      at91rm9200ek: fix SDRAM initialistation values

 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

I think this time, it's still Wolfgang doing the pull to ARM, right?

Best Regards,
Reinhard
Albert ARIBAUD - Dec. 6, 2010, 9:55 a.m.
Hi Reinhard,

Le 06/12/2010 10:43, Reinhard Meyer a écrit :

> I think this time, it's still Wolfgang doing the pull to ARM, right?

Correct.

> Best Regards,
> Reinhard

Amicalement,
Wolfgang Denk - Dec. 6, 2010, 11:05 p.m.
Dear Reinhard Meyer,

In message <4CFCB04B.10406@emk-elektronik.de> you wrote:
> Dear Wolfgang, Albert,
> 
> The following changes since commit 49733aa0b9d29803384ad4bce74985f4bbe7e9aa:
>   Wolfgang Denk (1):
>         Merge branch 'master' of /home/wd/git/u-boot/custodians
> 
> 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: add configure target for RAM boot
>       MAKEALL: fix AT91
>       arm920t/at91/timer: replace bss variables by gd
>       at91rm9200ek: fix SDRAM initialistation values
> 
>  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

Hm... what I see looks quite different:

 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 +
 arch/powerpc/cpu/mpc83xx/start.S                  |    8 +
 arch/powerpc/lib/board.c                          |   11 +
 arch/sh/cpu/sh2/start.S                           |    8 +-
 arch/sh/cpu/sh3/start.S                           |    8 +-
 arch/sh/cpu/sh4/start.S                           |   10 +-
 board/atmel/at91rm9200ek/config.mk                |    2 -
 board/emk/top9000/Makefile                        |   54 ++++
 board/emk/top9000/spi.c                           |   61 ++++
 board/emk/top9000/top9000.c                       |  290 +++++++++++++++++++
 board/freescale/mpc8641hpcn/mpc8641hpcn.c         |    3 -
 board/freescale/p2020ds/p2020ds.c                 |    3 -
 boards.cfg                                        |    5 +-
 common/hwconfig.c                                 |   14 +-
 drivers/mmc/gen_atmel_mci.c                       |    1 +
 include/configs/MPC8360EMDS.h                     |    4 +-
 include/configs/MPC8536DS.h                       |    5 +-
 include/configs/MPC8569MDS.h                      |    3 +-
 include/configs/P1_P2_RDB.h                       |    5 +-
 include/configs/at91rm9200ek.h                    |   18 ++-
 include/configs/atngw100.h                        |    2 -
 include/configs/mimc200.h                         |    2 -
 include/configs/r7780mp.h                         |    1 -
 include/configs/top9000.h                         |  314 +++++++++++++++++++++
 include/pci_ids.h                                 |    1 +
 30 files changed, 820 insertions(+), 77 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


Please try and figure out why we now see entries like this one:

Author: andreas.devel@googlemail.com <andreas.devel@googlemail.com>

As far as I can tell, Andreas' submissions on the mailing list look like this:

From: Andreas Bießmann <andreas.devel@googlemail.com>

The patchwork entry looks also clean to me:

http://patchwork.ozlabs.org/patch/73644/


Not pulled.

Best regards,

Wolfgang Denk
Reinhard Meyer - Dec. 6, 2010, 11:43 p.m.
Dear Wolfgang Denk,
>
> In message<4CFCB04B.10406@emk-elektronik.de>  you wrote:
>> Dear Wolfgang, Albert,
>>
>> The following changes since commit 49733aa0b9d29803384ad4bce74985f4bbe7e9aa:
>>    Wolfgang Denk (1):
>>          Merge branch 'master' of /home/wd/git/u-boot/custodians
>>
>> 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: add configure target for RAM boot
>>        MAKEALL: fix AT91
>>        arm920t/at91/timer: replace bss variables by gd
>>        at91rm9200ek: fix SDRAM initialistation values
>>
>>   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
>
> Hm... what I see looks quite different:
>
>   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 +
>   arch/powerpc/cpu/mpc83xx/start.S                  |    8 +
>   arch/powerpc/lib/board.c                          |   11 +
>   arch/sh/cpu/sh2/start.S                           |    8 +-
>   arch/sh/cpu/sh3/start.S                           |    8 +-
>   arch/sh/cpu/sh4/start.S                           |   10 +-
>   board/atmel/at91rm9200ek/config.mk                |    2 -
>   board/emk/top9000/Makefile                        |   54 ++++
>   board/emk/top9000/spi.c                           |   61 ++++
>   board/emk/top9000/top9000.c                       |  290 +++++++++++++++++++
>   board/freescale/mpc8641hpcn/mpc8641hpcn.c         |    3 -
>   board/freescale/p2020ds/p2020ds.c                 |    3 -
>   boards.cfg                                        |    5 +-
>   common/hwconfig.c                                 |   14 +-
>   drivers/mmc/gen_atmel_mci.c                       |    1 +
>   include/configs/MPC8360EMDS.h                     |    4 +-
>   include/configs/MPC8536DS.h                       |    5 +-
>   include/configs/MPC8569MDS.h                      |    3 +-
>   include/configs/P1_P2_RDB.h                       |    5 +-
>   include/configs/at91rm9200ek.h                    |   18 ++-
>   include/configs/atngw100.h                        |    2 -
>   include/configs/mimc200.h                         |    2 -
>   include/configs/r7780mp.h                         |    1 -
>   include/configs/top9000.h                         |  314 +++++++++++++++++++++
>   include/pci_ids.h                                 |    1 +
>   30 files changed, 820 insertions(+), 77 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

Have a look at:

http://git.denx.de/?p=u-boot/u-boot-atmel.git;a=shortlog;h=refs/heads/for2010.12

There it does not show the extra files you seem to see.

Please verify that.

> Please try and figure out why we now see entries like this one:
>
> Author: andreas.devel@googlemail.com<andreas.devel@googlemail.com>
>
> As far as I can tell, Andreas' submissions on the mailing list look like this:
>
> From: Andreas Bießmann<andreas.devel@googlemail.com>
>
> The patchwork entry looks also clean to me:
>
> http://patchwork.ozlabs.org/patch/73644/
>

Andreas did indeed post from two different e-mail accounts. I used the patchwork
"Download mbox" function to get the patches. Apparently the "sharp S" in one
of the two e-mail addresses he uses bites the system.

I don't know how to fix that. If we use patchwork it makes no sense to dig out
the e-mails with patches from an e-mail archive.

> Not pulled.

Understandable, but at a loss to what's going wrong here.

Best regards,
Reinhard Meyer
Reinhard Meyer - Dec. 7, 2010, 1:23 p.m.
> Dear Wolfgang Denk,
>> In message<4CFCB04B.10406@emk-elektronik.de>  you wrote:
>>> Dear Wolfgang, Albert,
>>>
>>> The following changes since commit 49733aa0b9d29803384ad4bce74985f4bbe7e9aa:
>>>    Wolfgang Denk (1):
>>>          Merge branch 'master' of /home/wd/git/u-boot/custodians
>>>
>>> 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: add configure target for RAM boot
>>>        MAKEALL: fix AT91
>>>        arm920t/at91/timer: replace bss variables by gd
>>>        at91rm9200ek: fix SDRAM initialistation values
>>>
>>>   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
>> Hm... what I see looks quite different:
>>
>>   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 +
>>   arch/powerpc/cpu/mpc83xx/start.S                  |    8 +
>>   arch/powerpc/lib/board.c                          |   11 +
>>   arch/sh/cpu/sh2/start.S                           |    8 +-
>>   arch/sh/cpu/sh3/start.S                           |    8 +-
>>   arch/sh/cpu/sh4/start.S                           |   10 +-
>>   board/atmel/at91rm9200ek/config.mk                |    2 -
>>   board/emk/top9000/Makefile                        |   54 ++++
>>   board/emk/top9000/spi.c                           |   61 ++++
>>   board/emk/top9000/top9000.c                       |  290 +++++++++++++++++++
>>   board/freescale/mpc8641hpcn/mpc8641hpcn.c         |    3 -
>>   board/freescale/p2020ds/p2020ds.c                 |    3 -
>>   boards.cfg                                        |    5 +-
>>   common/hwconfig.c                                 |   14 +-
>>   drivers/mmc/gen_atmel_mci.c                       |    1 +
>>   include/configs/MPC8360EMDS.h                     |    4 +-
>>   include/configs/MPC8536DS.h                       |    5 +-
>>   include/configs/MPC8569MDS.h                      |    3 +-
>>   include/configs/P1_P2_RDB.h                       |    5 +-
>>   include/configs/at91rm9200ek.h                    |   18 ++-
>>   include/configs/atngw100.h                        |    2 -
>>   include/configs/mimc200.h                         |    2 -
>>   include/configs/r7780mp.h                         |    1 -
>>   include/configs/top9000.h                         |  314 +++++++++++++++++++++
>>   include/pci_ids.h                                 |    1 +
>>   30 files changed, 820 insertions(+), 77 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
> 
> Have a look at:
> 
> http://git.denx.de/?p=u-boot/u-boot-atmel.git;a=shortlog;h=refs/heads/for2010.12
> 
> There it does not show the extra files you seem to see.
> 
> Please verify that.

Hello Wolfgang,

did you find out what happened here? I can clearly see in my local tree and also in the webinterface
of the u-boot-atmel.git at your server that there are exactly 8 commits between
49733aa0b9d29803384ad4bce74985f4bbe7e9aa and top of for2010.12. None of them affects the extra files
you seem to see locally.

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'll hand edit the "ß" to "ss" and it is ok.

Best Regards,
Reinhard
Wolfgang Denk - Dec. 7, 2010, 2:36 p.m.
Dear Reinhard Meyer,

In message <4CFE3553.7080601@emk-elektronik.de> you wrote:
>
> did you find out what happened here? I can clearly see in my local tree and also in the webinterface
> of the u-boot-atmel.git at your server that there are exactly 8 commits between
> 49733aa0b9d29803384ad4bce74985f4bbe7e9aa and top of for2010.12. None of them affects the extra files
> you seem to see locally.

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.

> 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.


Thi sis not a git-am issue, but something on your end.


> I'll hand edit the "ß" to "ss" and it is ok.

I see no reason for doing this.

Best regards,

Wolfgang Denk