From patchwork Tue Dec 7 15:49:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Reinhard Meyer X-Patchwork-Id: 74562 X-Patchwork-Delegate: wd@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 02FC2B70A5 for ; Wed, 8 Dec 2010 02:49:07 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7C5BD28114; Tue, 7 Dec 2010 16:49:05 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YFlbF+okwfLp; Tue, 7 Dec 2010 16:49:05 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6E81828108; Tue, 7 Dec 2010 16:49:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EF10928108 for ; Tue, 7 Dec 2010 16:48:59 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O83hc6rkVXE0 for ; Tue, 7 Dec 2010 16:48:59 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.17.8]) by theia.denx.de (Postfix) with ESMTP id 039CF28107 for ; Tue, 7 Dec 2010 16:48:57 +0100 (CET) Received: from [127.0.0.1] (p5B2029A0.dip0.t-ipconnect.de [91.32.41.160]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MZQdt-1P5J2K19oL-00LGyU; Tue, 07 Dec 2010 16:48:57 +0100 Message-ID: <4CFE576D.4000202@emk-elektronik.de> Date: Tue, 07 Dec 2010 16:49:01 +0100 From: Reinhard Meyer User-Agent: Thunderbird 2.0.0.24 (Windows/20100228) MIME-Version: 1.0 To: Wolfgang Denk References: <4CFCB04B.10406@emk-elektronik.de> <20101206230546.22160659@gemini.denx.de> <4CFD752C.6070400@emk-elektronik.de> <4CFE3553.7080601@emk-elektronik.de> <20101207143613.18CEE139FDE@gemini.denx.de> In-Reply-To: <20101207143613.18CEE139FDE@gemini.denx.de> X-Provags-ID: V02:K0:zm8jEv8yNCUjCB0/daC6uFSW3nI2qS2XtaXZfhaSm2O j2twYL5Qhtjx8W8h95u9pms8QLdZG8DseH06qXFKaRySJsUxUs nA7+UmL0qtPzzqNN0C2RGPCAIJDTqPlz2NgbataqJ/7oKXc+sg qlmQoD+V5wgk7PLxhfz7OeErypw7dO+Sk/7tkSwbF1N2HFh8Nm 4dpPSE5C4jHe8RvHGy4oSBFJBHX7PaOs+jaZ1e4rmg= Cc: u-boot Subject: Re: [U-Boot] Please pull u-boot-atmel/for2010.12 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 2010-11-30 20:45:03 > Committer: Wolfgang Denk 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 reinhard@sieb:~/embedded/u-boot-atmel$ 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, Reinhard