All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] Pull request: u-boot-nds32
@ 2013-07-24  4:11 Macpaul Lin
  2013-07-24 13:39 ` [U-Boot] [PATCH] nds32: Update <asm/io.h> and <asm/setup.h> with SPDX license identifiers Tom Rini
  2013-07-25  8:49 ` [U-Boot] Pull request: u-boot-nds32 Macpaul Lin
  0 siblings, 2 replies; 4+ messages in thread
From: Macpaul Lin @ 2013-07-24  4:11 UTC (permalink / raw)
  To: u-boot

Hi Tom,

Please pull the following patch from u-boot-nds32 into your tree.
Thanks!

The following changes since commit 62c175fbb8a0f9a926c88294ea9f7e88eb898f6c:

  Prepare v2013.07 (2013-07-23 07:58:13 -0400)

are available in the git repository at:

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

for you to fetch changes up to 4fc967051396e8e82138c65fd65a353f73e51b89:

  nds32: ag101/ag102: Fix setting lastdec and now values (2013-07-24
11:50:28 +0800)

----------------------------------------------------------------
Axel Lin (1):
      nds32: ag101/ag102: Fix setting lastdec and now values

Gabor Juhos (6):
      nds32: introduce macros for bit manipulation
      mmc: ftsdc010_mci: fix build error if CONFIG_FTSDC010_SDIO is not defined
      block: constify sect_buf argument of ide_write_data
      pci: add prototype for pci_ftpci_init() function
      pci: move pci_ftpci100.h to include/faraday/ftpci100.h
      nds32: adp-ag102: use 'faraday/ftpci100.h' for pci_ftpci_init

ken kuo (3):
      nds32: Enable two banks of SDRAM on Andes board
      nds32: Enable SDIO and EXT2 command support for Andes board
      nds32: Enable the function of passing parameters to Linux

 arch/nds32/cpu/n1213/ag101/lowlevel_init.S               |   6 +++++-
 arch/nds32/cpu/n1213/ag101/timer.c                       |   7 ++++---
 arch/nds32/cpu/n1213/ag102/timer.c                       |   7 ++++---
 arch/nds32/include/asm/io.h                              |  37
+++++++++++++++++++++++++++++++++
 arch/nds32/include/asm/setup.h                           | 192
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 board/AndesTech/adp-ag101/adp-ag101.c                    |  10 ++++++++-
 board/AndesTech/adp-ag101p/adp-ag101p.c                  |  10 ++++++++-
 board/AndesTech/adp-ag102/adp-ag102.c                    |   3 +--
 doc/driver-model/UDM-block.txt                           |   2 +-
 drivers/block/ftide020.c                                 |   2 +-
 drivers/mmc/ftsdc010_mci.c                               |   6 +++++-
 drivers/pci/pci_ftpci100.c                               |   4 ++--
 include/common.h                                         |   1 +
 include/configs/adp-ag101.h                              |  19
++++++++++++++++-
 include/configs/adp-ag101p.h                             |  18
++++++++++++++++-
 drivers/pci/pci_ftpci100.h => include/faraday/ftpci100.h |   2 ++
 include/ide.h                                            |   2 +-
 17 files changed, 309 insertions(+), 19 deletions(-)
 create mode 100644 arch/nds32/include/asm/setup.h
 rename drivers/pci/pci_ftpci100.h => include/faraday/ftpci100.h (98%)

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot] [PATCH] nds32: Update <asm/io.h> and <asm/setup.h> with SPDX license identifiers
  2013-07-24  4:11 [U-Boot] Pull request: u-boot-nds32 Macpaul Lin
@ 2013-07-24 13:39 ` Tom Rini
  2013-07-25  9:42   ` Macpaul Lin
  2013-07-25  8:49 ` [U-Boot] Pull request: u-boot-nds32 Macpaul Lin
  1 sibling, 1 reply; 4+ messages in thread
From: Tom Rini @ 2013-07-24 13:39 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Tom Rini <trini@ti.com>
---
 arch/nds32/include/asm/io.h    |    4 +---
 arch/nds32/include/asm/setup.h |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/nds32/include/asm/io.h b/arch/nds32/include/asm/io.h
index 254c8f9..04708e9 100644
--- a/arch/nds32/include/asm/io.h
+++ b/arch/nds32/include/asm/io.h
@@ -7,9 +7,7 @@
  * Shawn Lin, Andes Technology Corporation <nobuhiro@andestech.com>
  * Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier:	GPL-2.0
  *
  * Modifications:
  *  16-Sep-1996	RMK	Inlined the inx/outx functions & optimised for both
diff --git a/arch/nds32/include/asm/setup.h b/arch/nds32/include/asm/setup.h
index 0a14ea0..833d979 100644
--- a/arch/nds32/include/asm/setup.h
+++ b/arch/nds32/include/asm/setup.h
@@ -5,9 +5,7 @@
  *  Copyright (C) 2008 Andes Technology Corporation
  *	Copyright (C) 2013 Ken Kuo (ken_kuo at andestech.com)
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier:	GPL-2.0
  *
  *  Structure passed to kernel to tell it about the
  *  hardware it's running on.  See Documentation/arm/Setup
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [U-Boot] Pull request: u-boot-nds32
  2013-07-24  4:11 [U-Boot] Pull request: u-boot-nds32 Macpaul Lin
  2013-07-24 13:39 ` [U-Boot] [PATCH] nds32: Update <asm/io.h> and <asm/setup.h> with SPDX license identifiers Tom Rini
@ 2013-07-25  8:49 ` Macpaul Lin
  1 sibling, 0 replies; 4+ messages in thread
From: Macpaul Lin @ 2013-07-25  8:49 UTC (permalink / raw)
  To: u-boot

Hi Tom

2013/7/24 Macpaul Lin <macpaul@gmail.com>:
> Hi Tom,
>
> Please pull the following patch from u-boot-nds32 into your tree.
> Thanks!
>

Because of there are new patches and compile error fix, please ignore
this pull-request. I'll review those new patches and resend this
pull-request later. Thanks!


-- 
Best regards,
Macpaul Lin

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot] [PATCH] nds32: Update <asm/io.h> and <asm/setup.h> with SPDX license identifiers
  2013-07-24 13:39 ` [U-Boot] [PATCH] nds32: Update <asm/io.h> and <asm/setup.h> with SPDX license identifiers Tom Rini
@ 2013-07-25  9:42   ` Macpaul Lin
  0 siblings, 0 replies; 4+ messages in thread
From: Macpaul Lin @ 2013-07-25  9:42 UTC (permalink / raw)
  To: u-boot

Hi Tom,

2013/7/24 Tom Rini <trini@ti.com>:
> Signed-off-by: Tom Rini <trini@ti.com>
> ---
>  arch/nds32/include/asm/io.h    |    4 +---
>  arch/nds32/include/asm/setup.h |    4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)
>

Applied to u-boot-nds32.
Thanks!

-- 
Best regards,
Macpaul Lin

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-07-25  9:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-24  4:11 [U-Boot] Pull request: u-boot-nds32 Macpaul Lin
2013-07-24 13:39 ` [U-Boot] [PATCH] nds32: Update <asm/io.h> and <asm/setup.h> with SPDX license identifiers Tom Rini
2013-07-25  9:42   ` Macpaul Lin
2013-07-25  8:49 ` [U-Boot] Pull request: u-boot-nds32 Macpaul Lin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.