[U-Boot] Please pull u-boot-atmel/for2010.12
Reinhard Meyer
u-boot at emk-elektronik.de
Tue Dec 7 14:23:31 CET 2010
> Dear Wolfgang Denk,
>> In message<4CFCB04B.10406 at 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 at 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
More information about the U-Boot
mailing list