[U-Boot] Please pull u-boot-ppc4xx
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
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@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@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@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@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@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>
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.
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
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.
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!
participants (2)
-
Stefan Roese -
Tom Rini