mbox

[U-Boot] Pull request: u-boot-nios/master

Message ID 87d2zl7j6x.fsf@darkstar.wytron.com.tw
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

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

Message

Thomas Chou Nov. 10, 2012, 12:09 p.m. UTC 
Hi Tom,

Please add these patches to fix the compilation error of nios2 arch
after v2013.01-rc1.

Best regards,
Thomas


The following changes since commit 59852d03867108217fe88e3bfc3e1e9cedfe63c5:

  Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze (2012-11-09 08:47:25 -0700)

are available in the git repository at:


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

for you to fetch changes up to db71964235c1dfa13ec398da483b0bdbbf31d5b7:

  nios2: remove asm/status_led.h (2012-11-10 19:45:58 +0800)

----------------------------------------------------------------
Thomas Chou (2):
      nios2: use builtin functions for control registers access
      nios2: remove asm/status_led.h

 arch/nios2/include/asm/status_led.h | 31 -------------------------------
 include/configs/PK1C20.h            |  1 +
 include/configs/nios2-generic.h     |  1 +
 include/nios2.h                     | 12 ++----------
 include/status_led.h                |  3 ---
 5 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 arch/nios2/include/asm/status_led.h

Comments

Tom Rini Nov. 19, 2012, 7:59 p.m. UTC | #1 
On Sat, Nov 10, 2012 at 08:09:58PM +0800, Thomas Chou wrote:

> Hi Tom,
> 
> Please add these patches to fix the compilation error of nios2 arch
> after v2013.01-rc1.
> 
> Best regards,
> Thomas
> 
> 
> The following changes since commit 59852d03867108217fe88e3bfc3e1e9cedfe63c5:
> 
>   Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze (2012-11-09 08:47:25 -0700)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/u-boot-nios.git master
> 
> for you to fetch changes up to db71964235c1dfa13ec398da483b0bdbbf31d5b7:
> 
>   nios2: remove asm/status_led.h (2012-11-10 19:45:58 +0800)
> 
> ----------------------------------------------------------------
> Thomas Chou (2):
>       nios2: use builtin functions for control registers access
>       nios2: remove asm/status_led.h
> 
>  arch/nios2/include/asm/status_led.h | 31 -------------------------------
>  include/configs/PK1C20.h            |  1 +
>  include/configs/nios2-generic.h     |  1 +
>  include/nios2.h                     | 12 ++----------
>  include/status_led.h                |  3 ---
>  5 files changed, 4 insertions(+), 44 deletions(-)
>  delete mode 100644 arch/nios2/include/asm/status_led.h

Applied to u-boot/master, thanks!