[U-Boot] Pull request: u-boot-arm/master (updated)
Hi again Wolfgang,
This pull request obsoletes and replaces the one made earlier today.
The following changes since commit b1af6f532e0d348b153d5c148369229d24af361a:
Prepare v2011.06 (2011-06-27 22:22:42 +0200)
are available in the git repository at: git://git.denx.de/u-boot-arm.git master
Andreas Bießmann (1): atstk100x: switch to common cfi driver
Aneesh V (9): arm: make default implementation of cache_flush() weakly linked armv7: cache maintenance operations for armv7 armv7: rename cache related CONFIG flags armv7: integrate cache maintenance support arm: minor fixes for cache and mmu handling armv7: add PL310 support to u-boot armv7: adapt omap4 to the new cache maintenance framework armv7: adapt omap3 to the new cache maintenance framework armv7: adapt s5pc1xx to the new cache maintenance framework
David Müller (ELSOFT AG) (3): VCMA9: remove unneeded config.mk VCMA9: use CFI driver (and remove the old one) VCMA9: various cleanups/code style fixes
Fabio Estevam (5): MX5: Make the weim structure complete MX5: Add iomux structure MX5: Introduce a function for setting the chip select size MX53: Add initial support for MX53ARD vision2: Fix build due to WEIM registers name change
Holger Brunck (4): arm/kirkwood: if CONFIG_SOFT_I2C is set don't set CONFIG_I2C_MVTWSI arm/km: fix u-boot.kwb build breakage arm/km: remove unneeded define arm/km: replace suenx targets with km_kirkwood
Igor Grinberg (1): arm: omap2: apollon: fix broken build
John Rigby (1): OMAP[34]: fix broken timer
Matthias Weisser (1): arm: Update jadecpu board
Simon Guinot (1): Add support for Network Space v2 and parents
Tom Warren (2): GPIO: Tegra2: add GPIO driver for Tegra2 arm: Tegra2: GPIO: enable GPIO for Tegra2 boards
Valentin Longchamp (3): arm/km: use board KM_ENV_BUS for CONFIG_I2C_ENV_EEPROM_BUS arm/km: ethernet support for mgcoge3un arm/km: add support for portl2 board
andreas.devel@googlemail.com (8): at91rm9200.h: fix ATMEL_PMX_AA_TXD2 arm920t/at91: add clock.c arm920t/at91: use new clock.c features arm920t/at91: add at91rm9200_devices.c at91rm9200ek: use atmel_usart eb_cpux9k2: use atmel_usart cpuat91: use atmel_usart driver/serial: delete at91rm9200_usart
esw@bus-elektronik.de (1): Fix compiler error for cpu at91sam9, if lowlevel init is enabled
MAINTAINERS | 14 +- MAKEALL | 3 +- README | 11 + arch/arm/cpu/arm1136/start.S | 4 +- arch/arm/cpu/arm920t/at91/Makefile | 3 + arch/arm/cpu/arm920t/at91/at91rm9200_devices.c | 85 ++++ arch/arm/cpu/arm920t/at91/clock.c | 160 +++++++ arch/arm/cpu/arm920t/at91/cpu.c | 43 ++ arch/arm/cpu/arm926ejs/at91/clock.c | 35 +-- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/cache_v7.c | 394 ++++++++++++++++ arch/arm/cpu/armv7/cpu.c | 50 +-- arch/arm/cpu/armv7/mx5/soc.c | 30 ++ arch/arm/cpu/armv7/omap-common/timer.c | 7 +- arch/arm/cpu/armv7/omap3/Makefile | 1 - arch/arm/cpu/armv7/omap3/board.c | 136 +++++- arch/arm/cpu/armv7/omap3/cache.S | 263 ----------- arch/arm/cpu/armv7/omap3/lowlevel_init.S | 32 ++ arch/arm/cpu/armv7/omap4/board.c | 12 + arch/arm/cpu/armv7/omap4/lowlevel_init.S | 9 + arch/arm/cpu/armv7/s5pc1xx/cache.S | 88 +---- arch/arm/cpu/armv7/start.S | 18 +- arch/arm/include/asm/arch-at91/at91rm9200.h | 12 +- arch/arm/include/asm/arch-at91/at91sam9_sdramc.h | 2 +- arch/arm/include/asm/arch-at91/clk.h | 42 ++- arch/arm/include/asm/arch-kirkwood/config.h | 2 + arch/arm/include/asm/arch-mx5/imx-regs.h | 159 ++++++- arch/arm/include/asm/arch-mx5/sys_proto.h | 2 +- arch/arm/include/asm/arch-omap3/omap3.h | 20 + arch/arm/include/asm/arch-omap3/sys_proto.h | 10 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 2 +- arch/arm/include/asm/arch-s5pc1xx/sys_proto.h | 3 - arch/arm/include/asm/arch-tegra2/gpio.h | 250 ++++++++++- arch/arm/include/asm/armv7.h | 67 +++ arch/arm/include/asm/global_data.h | 2 +- arch/arm/include/asm/gpio.h | 38 ++ arch/arm/include/asm/pl310.h | 73 +++ arch/arm/include/asm/utils.h | 56 +++ arch/arm/lib/Makefile | 3 +- arch/arm/lib/board.c | 8 +- arch/arm/lib/cache-cp15.c | 22 +- arch/arm/lib/cache-pl310.c | 115 +++++ arch/arm/lib/cache.c | 20 +- board/BuS/eb_cpux9k2/cpux9k2.c | 7 + board/LaCie/netspace_v2/Makefile | 49 ++ board/LaCie/netspace_v2/kwbimage.cfg | 162 +++++++ board/LaCie/netspace_v2/netspace_v2.c | 142 ++++++ board/LaCie/netspace_v2/netspace_v2.h | 42 ++ board/armltd/integrator/split_by_variant.sh | 8 +- board/atmel/at91rm9200ek/at91rm9200ek.c | 7 + board/atmel/atstk1000/Makefile | 1 - board/atmel/atstk1000/flash.c | 232 --------- board/eukrea/cpuat91/cpuat91.c | 8 + board/freescale/mx53ard/Makefile | 48 ++ board/freescale/mx53ard/imximage_dd3.cfg | 96 ++++ board/freescale/mx53ard/mx53ard.c | 306 ++++++++++++ board/keymile/km_arm/km_arm.c | 45 ++- board/mpl/vcma9/Makefile | 4 +- board/mpl/vcma9/cmd_vcma9.c | 56 +-- board/mpl/vcma9/config.mk | 24 - board/mpl/vcma9/flash.c | 432 ----------------- board/mpl/vcma9/lowlevel_init.S | 549 +++++++++++++++++----- board/mpl/vcma9/vcma9.c | 284 +++-------- board/mpl/vcma9/vcma9.h | 121 +---- board/syteco/jadecpu/config.mk | 1 - board/syteco/jadecpu/jadecpu.c | 5 +- board/ttcontrol/vision2/vision2.c | 10 +- boards.cfg | 9 +- common/cmd_bdinfo.c | 2 +- drivers/gpio/Makefile | 1 + drivers/gpio/tegra2_gpio.c | 255 ++++++++++ drivers/serial/Makefile | 1 - drivers/serial/at91rm9200_usart.c | 126 ----- include/common.h | 5 +- include/configs/B2.h | 3 +- include/configs/VCMA9.h | 249 +++++----- include/configs/apollon.h | 4 + include/configs/assabet.h | 2 +- include/configs/at91rm9200ek.h | 10 +- include/configs/atstk1002.h | 9 +- include/configs/atstk1003.h | 9 +- include/configs/atstk1004.h | 9 +- include/configs/atstk1006.h | 9 +- include/configs/ca9x4_ct_vxp.h | 2 +- include/configs/cerf250.h | 2 +- include/configs/cpuat91.h | 12 +- include/configs/cradle.h | 2 +- include/configs/csb226.h | 2 +- include/configs/dnp1110.h | 2 +- include/configs/eb_cpux9k2.h | 10 +- include/configs/efikamx.h | 2 +- include/configs/evb4510.h | 3 +- include/configs/gcplus.h | 2 +- include/configs/innokom.h | 2 +- include/configs/jadecpu.h | 24 +- include/configs/jornada.h | 2 +- include/configs/km/km_arm.h | 32 +- include/configs/{suen3.h => km_kirkwood.h} | 18 +- include/configs/lart.h | 2 +- include/configs/lubbock.h | 2 +- include/configs/mgcoge3un.h | 6 + include/configs/mx51evk.h | 2 +- include/configs/mx53ard.h | 198 ++++++++ include/configs/mx53evk.h | 2 +- include/configs/netspace_v2.h | 162 +++++++ include/configs/omap4_panda.h | 8 +- include/configs/omap4_sdp4430.h | 8 +- include/configs/pleb2.h | 2 +- include/configs/portl2.h | 81 ++++ include/configs/pxa255_idp.h | 2 +- include/configs/s5pc210_universal.h | 2 +- include/configs/shannon.h | 2 +- include/configs/suen8.h | 50 -- include/configs/tegra2-common.h | 4 +- include/configs/trizepsiv.h | 2 +- include/configs/vision2.h | 2 +- include/configs/xaeniax.h | 2 +- include/configs/xm250.h | 2 +- include/configs/zylonite.h | 2 +- 119 files changed, 4218 insertions(+), 2092 deletions(-) create mode 100644 arch/arm/cpu/arm920t/at91/at91rm9200_devices.c create mode 100644 arch/arm/cpu/arm920t/at91/clock.c create mode 100644 arch/arm/cpu/arm920t/at91/cpu.c create mode 100644 arch/arm/cpu/armv7/cache_v7.c delete mode 100644 arch/arm/cpu/armv7/omap3/cache.S create mode 100644 arch/arm/include/asm/armv7.h create mode 100644 arch/arm/include/asm/gpio.h create mode 100644 arch/arm/include/asm/pl310.h create mode 100644 arch/arm/include/asm/utils.h create mode 100644 arch/arm/lib/cache-pl310.c create mode 100644 board/LaCie/netspace_v2/Makefile create mode 100644 board/LaCie/netspace_v2/kwbimage.cfg create mode 100644 board/LaCie/netspace_v2/netspace_v2.c create mode 100644 board/LaCie/netspace_v2/netspace_v2.h delete mode 100644 board/atmel/atstk1000/flash.c create mode 100644 board/freescale/mx53ard/Makefile create mode 100644 board/freescale/mx53ard/imximage_dd3.cfg create mode 100644 board/freescale/mx53ard/mx53ard.c delete mode 100644 board/mpl/vcma9/config.mk delete mode 100644 board/mpl/vcma9/flash.c delete mode 100644 board/syteco/jadecpu/config.mk create mode 100644 drivers/gpio/tegra2_gpio.c delete mode 100644 drivers/serial/at91rm9200_usart.c rename include/configs/{suen3.h => km_kirkwood.h} (77%) create mode 100644 include/configs/mx53ard.h create mode 100644 include/configs/netspace_v2.h create mode 100644 include/configs/portl2.h delete mode 100644 include/configs/suen8.h
Amicalement,
Dear all,
Am 30.06.2011 um 13:16 schrieb Albert ARIBAUD:
<snip>
Andreas Bießmann (1): atstk100x: switch to common cfi driver
<snip>
andreas.devel@googlemail.com (8): at91rm9200.h: fix ATMEL_PMX_AA_TXD2 arm920t/at91: add clock.c arm920t/at91: use new clock.c features arm920t/at91: add at91rm9200_devices.c at91rm9200ek: use atmel_usart eb_cpux9k2: use atmel_usart cpuat91: use atmel_usart driver/serial: delete at91rm9200_usart
why is in the second block my clear name replaced by email address (as in the commits in atmel/master) but the mails have correct (UTF8-formattet) clear name in 'From:'?
regards
Andreas Bießmann
Le 01/07/2011 08:22, Andreas Bießmann a écrit :
Dear all,
Am 30.06.2011 um 13:16 schrieb Albert ARIBAUD:
<snip>
Andreas Bießmann (1): atstk100x: switch to common cfi driver
<snip>
andreas.devel@googlemail.com (8): at91rm9200.h: fix ATMEL_PMX_AA_TXD2 arm920t/at91: add clock.c arm920t/at91: use new clock.c features arm920t/at91: add at91rm9200_devices.c at91rm9200ek: use atmel_usart eb_cpux9k2: use atmel_usart cpuat91: use atmel_usart driver/serial: delete at91rm9200_usart
why is in the second block my clear name replaced by email address (as in the commits in atmel/master) but the mails have correct (UTF8-formattet) clear name in 'From:'?
Hmm... Sorry for not having noticed this. Apparently, it is already so in u-boot-atmel/. I have just created a branch out of the current u-boot/master, run 'pwclient get 100074' and 'git am', and your name appears as normal.
Reinhard, what commands did you use to applie these patches?
Wolfgang, please hold the pulling until we sort this out. Sorry for the repeated inconvenience. :(
regards
Andreas Bießmann
Amicalement,
Dear All,
Le 01/07/2011 08:22, Andreas Bießmann a écrit :
Dear all,
Am 30.06.2011 um 13:16 schrieb Albert ARIBAUD:
<snip>
Andreas Bießmann (1): atstk100x: switch to common cfi driver
Patchwork says: Signed-off-by: Andreas Bießmann andreas.devel@googlemail.com
Saved mbix file starts like:
From patchwork Tue Jun 28 14:15:58 2011
Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [U-Boot] atstk100x: switch to common cfi driver Date: Tue, 28 Jun 2011 04:15:58 -0000 From: =?utf-8?q?Andreas_Bie=C3=9Fmann_=3Cbiessmann=40corscience=2Ede=3E?= X-Patchwork-Id: 102387 Message-Id: 1309270558-25351-1-git-send-email-biessmann@corscience.de To: u-boot@lists.denx.de Cc: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= biessmann@corscience.de
This patch removes the board implemenatation for flash driver which can now safely switched to the common cfi driver.
Compile tested for all atstk100x boards, runtime tested on atstk1002.
Signed-off-by: Andreas Bießmann biessmann@corscience.de
<snip>
andreas.devel@googlemail.com (8): at91rm9200.h: fix ATMEL_PMX_AA_TXD2 arm920t/at91: add clock.c arm920t/at91: use new clock.c features arm920t/at91: add at91rm9200_devices.c at91rm9200ek: use atmel_usart eb_cpux9k2: use atmel_usart cpuat91: use atmel_usart driver/serial: delete at91rm9200_usart
Patchworks says: Signed-off-by: Andreas Bießmann biessmann@corscience.de
Saved mbox file starts like:
From patchwork Sun Jun 12 11:49:13 2011
Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [U-Boot,atmel/next,3/7] arm920t/at91: add at91rm9200_devices.c Date: Sun, 12 Jun 2011 01:49:13 -0000 From: =?utf-8?q?Andreas_Bie=C3=9Fmann_=3Candreas=2Edevel=40googlemail=2Ecom?= =?utf-8?q?=3E?= X-Patchwork-Id: 100078 Message-Id: 1307879357-97986-4-git-send-email-andreas.devel@googlemail.com To: u-boot@lists.denx.de, Reinhard Meyer u-boot@emk-elektronik.de
This is a copy of arm926ejs/at91 api for perpherial initialisation. At the moment we just need the usart part of the api.
Signed-off-by: Andreas Bießmann andreas.devel@googlemail.com
why is in the second block my clear name replaced by email address (as in the commits in atmel/master) but the mails have correct (UTF8-formattet) clear name in 'From:'?
Hmm... Sorry for not having noticed this. Apparently, it is already so in u-boot-atmel/. I have just created a branch out of the current u-boot/master, run 'pwclient get 100074' and 'git am', and your name appears as normal.
Reinhard, what commands did you use to applie these patches?
ALWAYS using patchworks: Download mbox, git-am <the downloaded file>.
Apparently it makes a difference where the mail originated from.
Reinhard
Am 01.07.2011 12:05, schrieb Reinhard Meyer:
...
why is in the second block my clear name replaced by email address (as in the commits in atmel/master) but the mails have correct (UTF8-formattet) clear name in 'From:'?
Hmm... Sorry for not having noticed this. Apparently, it is already so in u-boot-atmel/. I have just created a branch out of the current u-boot/master, run 'pwclient get 100074' and 'git am', and your name appears as normal.
Reinhard, what commands did you use to applie these patches?
ALWAYS using patchworks: Download mbox, git-am <the downloaded file>.
Apparently it makes a difference where the mail originated from.
I downloaded pwclient, used 'pwclient get' and 'git-am' and get the same different results, depending on where the patch mail originated from. I used patches 100071 and 102387 to test.
git is version 1.5.6.5
Reinhard
Dear Reinhard Meyer,
Am 01.07.2011 12:47, schrieb Reinhard Meyer:
Am 01.07.2011 12:05, schrieb Reinhard Meyer:
<snip>
git is version 1.5.6.5
can you please try a more recent version?
(squeeze is out since February the 6th this year ;)
regards
Andreas Bießmann
Dear Andreas Bießmann,
Dear Reinhard Meyer,
Am 01.07.2011 12:47, schrieb Reinhard Meyer:
Am 01.07.2011 12:05, schrieb Reinhard Meyer:
<snip>
git is version 1.5.6.5
can you please try a more recent version?
(squeeze is out since February the 6th this year ;)
my time is *very* limited right now, and I honestly am not up to updating git every few months...
Best Regards, Reinhard
Dear Reinhard Meyer,
Am 01.07.2011 13:07, schrieb Reinhard Meyer:
Dear Andreas Bießmann,
Dear Reinhard Meyer,
Am 01.07.2011 12:47, schrieb Reinhard Meyer:
Am 01.07.2011 12:05, schrieb Reinhard Meyer:
<snip>
git is version 1.5.6.5
can you please try a more recent version?
(squeeze is out since February the 6th this year ;)
my time is *very* limited right now,
like most of us ...
and I honestly am not up to updating git every few months...
But 1.5.6.5 is really old version. I do have an old virtual machine running lenny and give it a try. I will check, if git version is the root cause of this problem (what I think it is). You could - if you really have lenny installed - give lenny-backports repository a try: http://packages.debian.org/lenny-backports/git
regards
Andreas Bießmann
Dear Reinhard Meyer,
Am 01.07.2011 13:14, schrieb Andreas Bießmann:
Dear Reinhard Meyer,
Am 01.07.2011 13:07, schrieb Reinhard Meyer:
Dear Andreas Bießmann,
Dear Reinhard Meyer,
Am 01.07.2011 12:47, schrieb Reinhard Meyer:
Am 01.07.2011 12:05, schrieb Reinhard Meyer:
<snip>
git is version 1.5.6.5
can you please try a more recent version?
(squeeze is out since February the 6th this year ;)
my time is *very* limited right now,
like most of us ...
and I honestly am not up to updating git every few months...
But 1.5.6.5 is really old version. I do have an old virtual machine running lenny and give it a try. I will check, if git version is the root cause of this problem (what I think it is). You could - if you really have lenny installed - give lenny-backports repository a try: http://packages.debian.org/lenny-backports/git
I can reproduce this behaviour with my lenny vm. I strongly suggest you update your git to a more recent version. You will get similar problems in future. If you really have debian lenny running and fear the move to current stable you could give lenny-backports a try, there is git 1.7.2.3 with some debian changes available and will _not_ pull a lot of libc changes in.
regards
Andreas Bießmann
Dear Andreas Bießmann,
Dear Reinhard Meyer,
Am 01.07.2011 13:07, schrieb Reinhard Meyer:
Dear Andreas Bießmann,
Dear Reinhard Meyer,
Am 01.07.2011 12:47, schrieb Reinhard Meyer:
Am 01.07.2011 12:05, schrieb Reinhard Meyer:
<snip>
git is version 1.5.6.5
can you please try a more recent version?
(squeeze is out since February the 6th this year ;)
my time is *very* limited right now,
like most of us ...
and I honestly am not up to updating git every few months...
But 1.5.6.5 is really old version. I do have an old virtual machine running lenny and give it a try. I will check, if git version is the root cause of this problem (what I think it is). You could - if you really have lenny installed - give lenny-backports repository a try: http://packages.debian.org/lenny-backports/git
If I remember correctly, I installed that version not even a year ago.
On another thought, I long wanted to move from a "real" machine to a virtual one, therefore I already have ubuntu-10.10 running in a VM and the git there is 1.7.1. I *just* have to move all other relevant files there ;) I think getting it *all* up would take a good afternoon ;)
I'll see what I can do.
Best Regards, Reinhard
Am 01.07.2011 13:47, schrieb Reinhard Meyer:
Dear Andreas Bießmann,
Dear Reinhard Meyer,
Am 01.07.2011 13:07, schrieb Reinhard Meyer:
<snip>
If I remember correctly, I installed that version not even a year ago.
Well ... git is moving fast ;)
On another thought, I long wanted to move from a "real" machine to a virtual one, therefore I already have ubuntu-10.10 running in a VM and the git there is 1.7.1.
That sounds really good.
I *just* have to move all other relevant files there ;) I think getting it *all* up would take a good afternoon ;)
I'll see what I can do.
good luck.
regards
Andreas Bießmann
Hi Reinhard,
Le 01/07/2011 13:47, Reinhard Meyer a écrit :
I *just* have to move all other relevant files there ;) I think getting it *all* up would take a good afternoon ;) I'll see what I can do.
Are you going to fix the author names in your pull request? If not, I'll fix that locally in u-boot-arm and re-issue a pull request -- unless wolfgang NAKs me doing it.
Best Regards, Reinhard
Amicalement,
Dear Reinhard Meyer,
Am 01.07.2011 12:05, schrieb Reinhard Meyer:
Dear All,
Le 01/07/2011 08:22, Andreas Bießmann a écrit :
Dear all,
Am 30.06.2011 um 13:16 schrieb Albert ARIBAUD:
<snip>
Andreas Bießmann (1): atstk100x: switch to common cfi driver
Patchwork says: Signed-off-by: Andreas Bießmann andreas.devel@googlemail.com
Saved mbix file starts like:
From patchwork Tue Jun 28 14:15:58 2011 Content-Type: text/plain; charset="utf-8"
<snip>
Signed-off-by: Andreas Bießmann biessmann@corscience.de
<snip>
Patchworks says: Signed-off-by: Andreas Bießmann biessmann@corscience.de
Saved mbox file starts like:
From patchwork Sun Jun 12 11:49:13 2011 Content-Type: text/plain; charset="utf-8"
<snip>
Signed-off-by: Andreas Bießmann andreas.devel@googlemail.com
Reinhard, what commands did you use to applie these patches?
ALWAYS using patchworks: Download mbox, git-am <the downloaded file>.
Apparently it makes a difference where the mail originated from.
Well, if I load the two patchwork ID's 100078 and 102387 both patches are correctly UTF-8 coded. In your mail the 'ß' is due to wrong conversion on your box -> (charset=windows-1252 == ISO-8859-1 but the mail contains the correctly UTF-8 coded char 'ß')
try the following: ---8<--- echo -e '\xc3\x9f\x0a' | iconv -f ISO-8859-1 -t UTF-8 echo ß | iconv -f ISO-8859-1 -t UTF-8 --->8---
It should show the same two chars 'ß' (if your shell environment is set to UTF-8) ...
I guess it has something to do with wrong shell environment settings/misconfigured git/ ... but indeed it is something on your side Reinhard.
I do not insist on modified commits, therefore it could be pulled in mainline. But for the future, Reinhard please check your environment.
regards
Andreas Bießmann
Hi all,
Le 01/07/2011 12:55, Andreas Bießmann a écrit :
I do not insist on modified commits, therefore it could be pulled in mainline. But for the future, Reinhard please check your environment.
We are right at the beginning of the merge window, so the pull is not urgent, and I prefer that we have proper patch author attribution, name included. If Reinhard can identify the issue and wishes to re-issue a pull request (based on the same u-boot-arm commit as the original one), that's fine with me, I'll wait.
regards
Andreas Bießmann
Amicalement,
Le 01/07/2011 12:05, Reinhard Meyer a écrit :
why is in the second block my clear name replaced by email address (as in the commits in atmel/master) but the mails have correct (UTF8-formattet) clear name in 'From:'?
Hmm... Sorry for not having noticed this. Apparently, it is already so in u-boot-atmel/. I have just created a branch out of the current u-boot/master, run 'pwclient get 100074' and 'git am', and your name appears as normal.
Reinhard, what commands did you use to applie these patches?
ALWAYS using patchworks: Download mbox, git-am<the downloaded file>.
Apparently it makes a difference where the mail originated from.
If you mean it makes a difference whether you download the mbox or use pwclient, I just tried both and got exactly the same .patch file (except for an added "From patchwork" line at the top, due to the mbox format, and a git am of either file results in Andreas' full name and address being shown as author, as expected.
Seems like either "your" and "my" .patch files differ in some way, or our setups (system, locale, git configuration).
Reinhard
Amicalement,
Am 01.07.2011 12:59, schrieb Albert ARIBAUD:
Le 01/07/2011 12:05, Reinhard Meyer a écrit :
why is in the second block my clear name replaced by email address (as in the commits in atmel/master) but the mails have correct (UTF8-formattet) clear name in 'From:'?
Hmm... Sorry for not having noticed this. Apparently, it is already so in u-boot-atmel/. I have just created a branch out of the current u-boot/master, run 'pwclient get 100074' and 'git am', and your name appears as normal.
Reinhard, what commands did you use to applie these patches?
ALWAYS using patchworks: Download mbox, git-am<the downloaded file>.
Apparently it makes a difference where the mail originated from.
If you mean it makes a difference whether you download the mbox or use pwclient, I just tried both and got exactly the same .patch file (except for an added "From patchwork" line at the top, due to the mbox format, and a git am of either file results in Andreas' full name and address being shown as author, as expected.
Seems like either "your" and "my" .patch files differ in some way, or our setups (system, locale, git configuration).
Reinhard
Amicalement,
I mean that it makes no difference whether I get the .patch files by "mbox" or by "pwclient".
What makes a difference is whether the patch was sent via googlemail or not.
Apparently the subtle differences lead to different interpretation by git-am.
If that is a configuration issue, I do now know where to look at.
Reinhard
Hallo Andreas,
Le 01/07/2011 08:22, Andreas Bießmann a écrit :
Dear all,
Am 30.06.2011 um 13:16 schrieb Albert ARIBAUD:
<snip>
Andreas Bießmann (1): atstk100x: switch to common cfi driver
<snip>
andreas.devel@googlemail.com (8): at91rm9200.h: fix ATMEL_PMX_AA_TXD2 arm920t/at91: add clock.c arm920t/at91: use new clock.c features arm920t/at91: add at91rm9200_devices.c at91rm9200ek: use atmel_usart eb_cpux9k2: use atmel_usart cpuat91: use atmel_usart driver/serial: delete at91rm9200_usart
why is in the second block my clear name replaced by email address (as in the commits in atmel/master) but the mails have correct (UTF8-formattet) clear name in 'From:'?
I was starting to fix the commits in the second block but I notice that they mention a different e-mail address for you than the first, isolated commit, which has "Andreas Bießmann biessmann@corscience.de".
Do you confirm that this is normal? And if not, which address is the correct one?
regards
Andreas Bießmann
Amicalement,
Dear Albert Aribaud,
Am 03.07.2011 um 22:04 schrieb Albert ARIBAUD:
Hallo Andreas,
Le 01/07/2011 08:22, Andreas Bießmann a écrit :
Dear all,
Am 30.06.2011 um 13:16 schrieb Albert ARIBAUD:
<snip>
Andreas Bießmann (1): atstk100x: switch to common cfi driver
<snip>
andreas.devel@googlemail.com (8): at91rm9200.h: fix ATMEL_PMX_AA_TXD2 arm920t/at91: add clock.c arm920t/at91: use new clock.c features arm920t/at91: add at91rm9200_devices.c at91rm9200ek: use atmel_usart eb_cpux9k2: use atmel_usart cpuat91: use atmel_usart driver/serial: delete at91rm9200_usart
why is in the second block my clear name replaced by email address (as in the commits in atmel/master) but the mails have correct (UTF8-formattet) clear name in 'From:'?
I was starting to fix the commits in the second block but I notice that they mention a different e-mail address for you than the first, isolated commit, which has "Andreas Bießmann biessmann@corscience.de".
the first one (corscience.de) is also correct. I get paid for some of my u-boot contribution (especially the avr32 stuff) and like to separate the stuff I do at work and the stuff I do for my own (gmail address).
regards
Andreas Bießmann
Le 03/07/2011 22:23, Andreas Bießmann a écrit :
Dear Albert Aribaud,
Am 03.07.2011 um 22:04 schrieb Albert ARIBAUD:
Hallo Andreas,
Le 01/07/2011 08:22, Andreas Bießmann a écrit :
Dear all,
Am 30.06.2011 um 13:16 schrieb Albert ARIBAUD:
<snip>
Andreas Bießmann (1): atstk100x: switch to common cfi driver
<snip>
andreas.devel@googlemail.com (8): at91rm9200.h: fix ATMEL_PMX_AA_TXD2 arm920t/at91: add clock.c arm920t/at91: use new clock.c features arm920t/at91: add at91rm9200_devices.c at91rm9200ek: use atmel_usart eb_cpux9k2: use atmel_usart cpuat91: use atmel_usart driver/serial: delete at91rm9200_usart
why is in the second block my clear name replaced by email address (as in the commits in atmel/master) but the mails have correct (UTF8-formattet) clear name in 'From:'?
I was starting to fix the commits in the second block but I notice that they mention a different e-mail address for you than the first, isolated commit, which has "Andreas Bießmannbiessmann@corscience.de".
the first one (corscience.de) is also correct. I get paid for some of my u-boot contribution (especially the avr32 stuff) and like to separate the stuff I do at work and the stuff I do for my own (gmail address).
Ok, then, I'll keep the addresses as-is, and just add "Andreas Bießman" where it is missing before the address.
regards
Andreas Bießmann
Amicalement,
participants (3)
-
Albert ARIBAUD -
Andreas Bießmann -
Reinhard Meyer