mbox

[U-Boot] Pull request: u-boot-nds32

Message ID CACCg+XPfsaHVvUSoS18ey=2euTSZTzuR1pUT+W6Qt3ndAnzmdw@mail.gmail.com
State Accepted
Delegated to: Wolfgang Denk
Headers show

Pull-request

git://git.denx.de/u-boot-nds32.git master

Message

Macpaul Lin Nov. 1, 2011, 5:05 a.m. UTC
Dear Wolfgang,

Please pull these 3 patches to your tree.

Thanks,
Macpaul

The following changes since commit ce5207e191c59b3135303fd03b98dd2ac3701ba2:

  e1000: Allow direct access to the E1000 SPI EEPROM device
(2011-10-28 00:37:01 +0200)

are available in the git repository at:
  git://git.denx.de/u-boot-nds32.git master

Macpaul Lin (3):
      nds32: Use getenv_ulong() in place of getenv(), strtoul
      nds32: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
      nds32: asm/io.h: add __iormb __iowmb and inline io support

 arch/nds32/include/asm/cache.h |   11 ++++++
 arch/nds32/include/asm/io.h    |   72 +++++++++++++++++++++++++++++-----------
 arch/nds32/lib/board.c         |   12 +-----
 3 files changed, 65 insertions(+), 30 deletions(-)


--
Best regards,
Macpaul Lin

Comments

Wolfgang Denk Nov. 3, 2011, 6:34 p.m. UTC | #1
Dear =?UTF-8?B?6aas5YWL5rOh?=,

In message <CACCg+XPfsaHVvUSoS18ey=2euTSZTzuR1pUT+W6Qt3ndAnzmdw@mail.gmail.com> you wrote:
> 
> The following changes since commit ce5207e191c59b3135303fd03b98dd2ac3701ba2:
> 
>   e1000: Allow direct access to the E1000 SPI EEPROM device
> (2011-10-28 00:37:01 +0200)
> 
> are available in the git repository at:
>   git://git.denx.de/u-boot-nds32.git master
> 
> Macpaul Lin (3):
>       nds32: Use getenv_ulong() in place of getenv(), strtoul
>       nds32: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
>       nds32: asm/io.h: add __iormb __iowmb and inline io support
> 
>  arch/nds32/include/asm/cache.h |   11 ++++++
>  arch/nds32/include/asm/io.h    |   72 +++++++++++++++++++++++++++++-----------
>  arch/nds32/lib/board.c         |   12 +-----
>  3 files changed, 65 insertions(+), 30 deletions(-)

Applied, thanks.


Can you please deleted tag 'NIOS2-5_0_0' from your tree?  Thanks.


Best regards,

Wolfgang Denk
Macpaul Lin Nov. 4, 2011, 7:02 a.m. UTC | #2
Hi Wolfgang

2011/11/4 Wolfgang Denk <wd@denx.de>:
> Dear =?UTF-8?B?6aas5YWL5rOh?=,
>
> In message <CACCg+XPfsaHVvUSoS18ey=2euTSZTzuR1pUT+W6Qt3ndAnzmdw@mail.gmail.com> you wrote:
>>
>> are available in the git repository at:
>>   git://git.denx.de/u-boot-nds32.git master
>
> Applied, thanks.
>
>
> Can you please deleted tag 'NIOS2-5_0_0' from your tree?  Thanks.
>

This tag has been deleted and updated to custodian repo in
git://git.denx.de/u-boot-nds32.git

However, I've found there is an error when I push to custodian repo.
error: refs/tags/2009.01-rc2 does not point to a valid object!
Should I delete this tag, too?

Thanks.
Mike Frysinger Nov. 4, 2011, 9:19 p.m. UTC | #3
On Friday 04 November 2011 03:02:21 馬克泡 wrote:
> However, I've found there is an error when I push to custodian repo.
> error: refs/tags/2009.01-rc2 does not point to a valid object!
> Should I delete this tag, too?

2009.01-rc2 is not a tag that came from Wolfgang's tree (the official tag would 
have been "v2009.01-rc2"), so that means it's a tag of your own.  whether you 
delete it is up to you.

seems the nds32 tree is missing a lot of tags from Wolfgang's tree ... try 
doing `git push --tags` ?
-mike
Macpaul Lin Nov. 5, 2011, 1:31 a.m. UTC | #4
Hi Mike,

2011/11/5 Mike Frysinger <vapier@gentoo.org>:
> 2009.01-rc2 is not a tag that came from Wolfgang's tree (the official tag would
> have been "v2009.01-rc2"), so that means it's a tag of your own.  whether you
> delete it is up to you.
>
> seems the nds32 tree is missing a lot of tags from Wolfgang's tree ... try
> doing `git push --tags` ?
> -mike
>

I've never set up this tag whether in local or in remote.
(Andestech commit the u-boot code back to mainline since 2010.)
It comes every time when I clone the code from remote custodian's tree.
I'll delete it and add Wolfgang's tag to nds32 tree.
Thanks!