Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Wolfgang Denk, > In message<4cfc0966.4010...@emk-elektronik.de> you wrote: >> >> What's possible in git-rebase should be possible in git-am, too. > > git-rebase will also show merge conflicts in such cases. I'm not not what you are trying to say here, since I stated that I wished git-am would

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Reinhard Meyer, In message <4cfc0966.4010...@emk-elektronik.de> you wrote: > > What's possible in git-rebase should be possible in git-am, too. git-rebase will also show merge conflicts in such cases. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk &

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Albert ARIBAUD, > Le 05/12/2010 20:14, Reinhard Meyer a écrit : > >> Sorry, the branch name might be a misnomer. As soon as I got two other >> patches applied, >> I'll issue a pull request. > > You mean your /next branch will be merged to your /master and you'll request > a pull of /master ?

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Wolfgang Denk, > Dear Reinhard Meyer, > > In message<4cfc031f.9020...@emk-elektronik.de> you wrote: >> >>> First, try to figure out why this happen. >> >> Simply because boards.cfg was completely resorted (a few days ago) since the >> patch was made--- > > Well, the changes to boards.cfg are

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Reinhard Meyer, In message <4cfc031f.9020...@emk-elektronik.de> you wrote: > > > First, try to figure out why this happen. > > Simply because boards.cfg was completely resorted (a few days ago) since the > patch was made--- Well, the changes to boards.cfg are usually one-liners, so it's ea

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Wolfgang Denk, > Dear Reinhard Meyer, > > In message<4cfbe49b@emk-elektronik.de> you wrote: >> >> Sorry, the branch name might be a misnomer. As soon as I got two other patc= >> hes applied, >> I'll issue a pull request. > > OK. >> >> Maybe one of you can give me a hint how to fix the iss

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Reinhard Meyer, In message <4cfbe49b@emk-elektronik.de> you wrote: > > Sorry, the branch name might be a misnomer. As soon as I got two other patc= > hes applied, > I'll issue a pull request. OK. > > Maybe one of you can give me a hint how to fix the issue when a patch does > not apply:

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Le 05/12/2010 20:14, Reinhard Meyer a écrit : > Sorry, the branch name might be a misnomer. As soon as I got two other > patches applied, > I'll issue a pull request. You mean your /next branch will be merged to your /master and you'll request a pull of /master ? > How do I resolve this? When t

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

On 05.12.2010 19:05, Andreas Bießmann wrote: > Dear Albert, dear Reinhard, > > Am 05.12.2010 um 18:56 schrieb Albert ARIBAUD: > >> Le 05/12/2010 18:43, Andreas Bießmann a écrit : >>> Dear Reinhard Meyer, >>> >>> Am 05.12.2010 um 10:53 schrieb Reinhard Meyer: >>> >>> [snip summary for 'get at91rm920

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Albert, dear Reinhard, Am 05.12.2010 um 18:56 schrieb Albert ARIBAUD: > Le 05/12/2010 18:43, Andreas Bießmann a écrit : >> Dear Reinhard Meyer, >> >> Am 05.12.2010 um 10:53 schrieb Reinhard Meyer: >> >> [snip summary for 'get at91rm9200ek working with ARM relocation'] >> >>> Applied all f

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Le 05/12/2010 18:43, Andreas Bießmann a écrit : > Dear Reinhard Meyer, > > Am 05.12.2010 um 10:53 schrieb Reinhard Meyer: > > [snip summary for 'get at91rm9200ek working with ARM relocation'] > >> Applied all four to u-boot-atmel/next. > > I assume these do not go into v2010.12, is that correct? I

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Reinhard Meyer, Am 05.12.2010 um 10:53 schrieb Reinhard Meyer: [snip summary for 'get at91rm9200ek working with ARM relocation'] > Applied all four to u-boot-atmel/next. I assume these do not go into v2010.12, is that correct? regards Andreas Bießmann

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Andreas Bießmann, > Dear all, > > this is mostly a copy of > http://article.gmane.org/gmane.comp.boot-loaders.u-boot/89888 > > This series have two relevant changes. Cause of defining the weak symbol > board_reset the previous patch 'arm920t: fix linker skript for -pie linking' > is not long

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Reinhard Meyer, Am 30.11.2010 um 20:58 schrieb Reinhard Meyer: > Dear Andreas Bießmann, > Does that base on current u-boot/master? Yes, it is. > I will pull current master, and rebase at91,at91-next on it, also delete the > then > obsolete two patches currently at at91. Then your patches

Re: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear Andreas Bießmann, > Dear all, > > this is mostly a copy of > http://article.gmane.org/gmane.comp.boot-loaders.u-boot/89888 > > This series have two relevant changes. Cause of defining the weak symbol > board_reset the previous patch 'arm920t: fix linker skript for -pie linking' > is not longer

[U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

Dear all, this is mostly a copy of http://article.gmane.org/gmane.comp.boot-loaders.u-boot/89888 This series have two relevant changes. Cause of defining the weak symbol board_reset the previous patch 'arm920t: fix linker skript for -pie linking' is not longer needed. So 'arm920t/at91/reset: boar