public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] Please pull u-boot-ppc4xx
@ 2013-07-26  5:50 Stefan Roese
  2013-07-26 19:34 ` [U-Boot] [PATCH] powerpc/ppc4xx: Convert new gdsys files to SPDX license tags Tom Rini
  2013-07-26 23:35 ` [U-Boot] Please pull u-boot-ppc4xx Tom Rini
  0 siblings, 2 replies; 6+ messages in thread
From: Stefan Roese @ 2013-07-26  5:50 UTC (permalink / raw)
  To: u-boot

Hi Tom,

please pull the following patches:

The following changes since commit aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c:

  Merge branch 'master' of git://git.denx.de/u-boot-nds32 (2013-07-25 08:51:51 -0400)

are available in the git repository at:


  git://www.denx.de/git/u-boot-ppc4xx.git master

for you to fetch changes up to 28437154649db9f4445b93f278199e34b0447a57:

  powerpc/ppc4xx: Remove CONFIG_SYS_FLASH_PROTECTION from gdsys boards (2013-07-25 19:35:42 +0200)

----------------------------------------------------------------
Dirk Eibach (6):
      powerpc/ppc4xx: Use generic accessor functions for gdsys FPGA
      powerpc/ppc4xx: Add gdsys mclink interface
      powerpc/ppc4xx: Add fpgad command for dumping gdsys fpga registers
      powerpc/ppc4xx: Support gdsys multichannel iocon hardware
      powerpc/ppc4xx: Consider gdsys FPGA OSD size
      powerpc/ppc4xx: Remove CONFIG_SYS_FLASH_PROTECTION from gdsys boards

 board/gdsys/405ep/405ep.c        |  22 +-
 board/gdsys/405ep/dlvision-10g.c |  18 +-
 board/gdsys/405ep/io.c           |  16 +-
 board/gdsys/405ep/iocon.c        | 486 +++++++++++++++++++++++++++++++++++----
 board/gdsys/405ep/neo.c          |  13 +-
 board/gdsys/405ex/405ex.c        |  22 +-
 board/gdsys/405ex/io64.c         |  34 +--
 board/gdsys/common/Makefile      |   4 +-
 board/gdsys/common/fpga.c        |  41 ++++
 board/gdsys/common/mclink.c      | 153 ++++++++++++
 board/gdsys/common/mclink.h      |  31 +++
 board/gdsys/common/osd.c         | 118 ++++++----
 common/Makefile                  |   1 +
 common/cmd_fpgad.c               | 100 ++++++++
 include/configs/dlvision-10g.h   |   9 +-
 include/configs/dlvision.h       |   3 +-
 include/configs/io.h             |   8 +-
 include/configs/io64.h           |   6 +
 include/configs/iocon.h          |  60 ++++-
 include/configs/neo.h            |   8 +-
 include/gdsys_fpga.h             |  58 ++++-
 21 files changed, 1040 insertions(+), 171 deletions(-)
 create mode 100644 board/gdsys/common/fpga.c
 create mode 100644 board/gdsys/common/mclink.c
 create mode 100644 board/gdsys/common/mclink.h
 create mode 100644 common/cmd_fpgad.c

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

* [U-Boot] [PATCH] powerpc/ppc4xx: Convert new gdsys files to SPDX license tags
  2013-07-26  5:50 [U-Boot] Please pull u-boot-ppc4xx Stefan Roese
@ 2013-07-26 19:34 ` Tom Rini
  2013-07-26 23:16   ` Tom Rini
  2013-07-29  6:14   ` Stefan Roese
  2013-07-26 23:35 ` [U-Boot] Please pull u-boot-ppc4xx Tom Rini
  1 sibling, 2 replies; 6+ messages in thread
From: Tom Rini @ 2013-07-26 19:34 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Tom Rini <trini@ti.com>
---
 board/gdsys/common/dp501.c  |   18 +-----------------
 board/gdsys/common/fpga.c   |   18 +-----------------
 board/gdsys/common/mclink.c |   18 +-----------------
 board/gdsys/common/mclink.h |   18 +-----------------
 common/cmd_fpgad.c          |   18 +-----------------
 5 files changed, 5 insertions(+), 85 deletions(-)

diff --git a/board/gdsys/common/dp501.c b/board/gdsys/common/dp501.c
index 9aa4e3f..52f3ea1 100644
--- a/board/gdsys/common/dp501.c
+++ b/board/gdsys/common/dp501.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2012
  * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /* Parade Technologies Inc. DP501 DisplayPort DVI/HDMI Transmitter */
diff --git a/board/gdsys/common/fpga.c b/board/gdsys/common/fpga.c
index e3af6cb..e10c105 100644
--- a/board/gdsys/common/fpga.c
+++ b/board/gdsys/common/fpga.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2013
  * Dirk Eibach,  Guntermann & Drunck GmbH, eibach at gdsys.de
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/gdsys/common/mclink.c b/board/gdsys/common/mclink.c
index e0382a3..9f230c9 100644
--- a/board/gdsys/common/mclink.c
+++ b/board/gdsys/common/mclink.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2012
  * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/gdsys/common/mclink.h b/board/gdsys/common/mclink.h
index 47a62b4..febd46a 100644
--- a/board/gdsys/common/mclink.h
+++ b/board/gdsys/common/mclink.h
@@ -2,23 +2,7 @@
  * (C) Copyright 2012
  * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach at gdsys.cc
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _MCLINK_H_
diff --git a/common/cmd_fpgad.c b/common/cmd_fpgad.c
index 07536ff..1b25ed8 100644
--- a/common/cmd_fpgad.c
+++ b/common/cmd_fpgad.c
@@ -6,23 +6,7 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-- 
1.7.9.5

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

* [U-Boot] [PATCH] powerpc/ppc4xx: Convert new gdsys files to SPDX license tags
  2013-07-26 19:34 ` [U-Boot] [PATCH] powerpc/ppc4xx: Convert new gdsys files to SPDX license tags Tom Rini
@ 2013-07-26 23:16   ` Tom Rini
  2013-07-29  6:14   ` Stefan Roese
  1 sibling, 0 replies; 6+ messages in thread
From: Tom Rini @ 2013-07-26 23:16 UTC (permalink / raw)
  To: u-boot

On Fri, Jul 26, 2013 at 03:34:02PM -0400, Tom Rini wrote:

> Signed-off-by: Tom Rini <trini@ti.com>
> ---
>  board/gdsys/common/dp501.c  |   18 +-----------------
>  board/gdsys/common/fpga.c   |   18 +-----------------
>  board/gdsys/common/mclink.c |   18 +-----------------
>  board/gdsys/common/mclink.h |   18 +-----------------
>  common/cmd_fpgad.c          |   18 +-----------------
>  5 files changed, 5 insertions(+), 85 deletions(-)

Applied to u-boot/master.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130726/1437de25/attachment.pgp>

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

* [U-Boot] Please pull u-boot-ppc4xx
  2013-07-26  5:50 [U-Boot] Please pull u-boot-ppc4xx Stefan Roese
  2013-07-26 19:34 ` [U-Boot] [PATCH] powerpc/ppc4xx: Convert new gdsys files to SPDX license tags Tom Rini
@ 2013-07-26 23:35 ` Tom Rini
  1 sibling, 0 replies; 6+ messages in thread
From: Tom Rini @ 2013-07-26 23:35 UTC (permalink / raw)
  To: u-boot

On Fri, Jul 26, 2013 at 07:50:44AM +0200, Stefan Roese wrote:

> Hi Tom,
> 
> please pull the following patches:
> 
> The following changes since commit aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-nds32 (2013-07-25 08:51:51 -0400)
> 
> are available in the git repository at:
> 
> 
>   git://www.denx.de/git/u-boot-ppc4xx.git master
> 
> for you to fetch changes up to 28437154649db9f4445b93f278199e34b0447a57:
> 
>   powerpc/ppc4xx: Remove CONFIG_SYS_FLASH_PROTECTION from gdsys boards (2013-07-25 19:35:42 +0200)
> 
> ----------------------------------------------------------------
> Dirk Eibach (6):
>       powerpc/ppc4xx: Use generic accessor functions for gdsys FPGA
>       powerpc/ppc4xx: Add gdsys mclink interface
>       powerpc/ppc4xx: Add fpgad command for dumping gdsys fpga registers
>       powerpc/ppc4xx: Support gdsys multichannel iocon hardware
>       powerpc/ppc4xx: Consider gdsys FPGA OSD size
>       powerpc/ppc4xx: Remove CONFIG_SYS_FLASH_PROTECTION from gdsys boards
> 
>  board/gdsys/405ep/405ep.c        |  22 +-
>  board/gdsys/405ep/dlvision-10g.c |  18 +-
>  board/gdsys/405ep/io.c           |  16 +-
>  board/gdsys/405ep/iocon.c        | 486 +++++++++++++++++++++++++++++++++++----
>  board/gdsys/405ep/neo.c          |  13 +-
>  board/gdsys/405ex/405ex.c        |  22 +-
>  board/gdsys/405ex/io64.c         |  34 +--
>  board/gdsys/common/Makefile      |   4 +-
>  board/gdsys/common/fpga.c        |  41 ++++
>  board/gdsys/common/mclink.c      | 153 ++++++++++++
>  board/gdsys/common/mclink.h      |  31 +++
>  board/gdsys/common/osd.c         | 118 ++++++----
>  common/Makefile                  |   1 +
>  common/cmd_fpgad.c               | 100 ++++++++
>  include/configs/dlvision-10g.h   |   9 +-
>  include/configs/dlvision.h       |   3 +-
>  include/configs/io.h             |   8 +-
>  include/configs/io64.h           |   6 +
>  include/configs/iocon.h          |  60 ++++-
>  include/configs/neo.h            |   8 +-
>  include/gdsys_fpga.h             |  58 ++++-
>  21 files changed, 1040 insertions(+), 171 deletions(-)
>  create mode 100644 board/gdsys/common/fpga.c
>  create mode 100644 board/gdsys/common/mclink.c
>  create mode 100644 board/gdsys/common/mclink.h
>  create mode 100644 common/cmd_fpgad.c

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130726/0bc8c3a8/attachment.pgp>

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

* [U-Boot] [PATCH] powerpc/ppc4xx: Convert new gdsys files to SPDX license tags
  2013-07-26 19:34 ` [U-Boot] [PATCH] powerpc/ppc4xx: Convert new gdsys files to SPDX license tags Tom Rini
  2013-07-26 23:16   ` Tom Rini
@ 2013-07-29  6:14   ` Stefan Roese
  2013-07-29 12:33     ` Tom Rini
  1 sibling, 1 reply; 6+ messages in thread
From: Stefan Roese @ 2013-07-29  6:14 UTC (permalink / raw)
  To: u-boot

Hi Tom,

On 07/26/2013 09:34 PM, Tom Rini wrote:
> Signed-off-by: Tom Rini <trini@ti.com>
> ---
>  board/gdsys/common/dp501.c  |   18 +-----------------
>  board/gdsys/common/fpga.c   |   18 +-----------------
>  board/gdsys/common/mclink.c |   18 +-----------------
>  board/gdsys/common/mclink.h |   18 +-----------------
>  common/cmd_fpgad.c          |   18 +-----------------
>  5 files changed, 5 insertions(+), 85 deletions(-)

Ah, sorry. I missed those. Will you apply this patch directly or should
I send a pull-request?

Thanks,
Stefan

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

* [U-Boot] [PATCH] powerpc/ppc4xx: Convert new gdsys files to SPDX license tags
  2013-07-29  6:14   ` Stefan Roese
@ 2013-07-29 12:33     ` Tom Rini
  0 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2013-07-29 12:33 UTC (permalink / raw)
  To: u-boot

On Mon, Jul 29, 2013 at 08:14:19AM +0200, Stefan Roese wrote:
> Hi Tom,
> 
> On 07/26/2013 09:34 PM, Tom Rini wrote:
> > Signed-off-by: Tom Rini <trini@ti.com>
> > ---
> >  board/gdsys/common/dp501.c  |   18 +-----------------
> >  board/gdsys/common/fpga.c   |   18 +-----------------
> >  board/gdsys/common/mclink.c |   18 +-----------------
> >  board/gdsys/common/mclink.h |   18 +-----------------
> >  common/cmd_fpgad.c          |   18 +-----------------
> >  5 files changed, 5 insertions(+), 85 deletions(-)
> 
> Ah, sorry. I missed those. Will you apply this patch directly or should
> I send a pull-request?

Applied directly so we're good.  Thanks.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130729/d0ee32a3/attachment.pgp>

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

end of thread, other threads:[~2013-07-29 12:33 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-26  5:50 [U-Boot] Please pull u-boot-ppc4xx Stefan Roese
2013-07-26 19:34 ` [U-Boot] [PATCH] powerpc/ppc4xx: Convert new gdsys files to SPDX license tags Tom Rini
2013-07-26 23:16   ` Tom Rini
2013-07-29  6:14   ` Stefan Roese
2013-07-29 12:33     ` Tom Rini
2013-07-26 23:35 ` [U-Boot] Please pull u-boot-ppc4xx Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox