Skip to contentSkip to conversation

ppc: Remove PCIPPC2 and PCIPPC6 boards

PATCH Superseded Stefan Roese 2 participants 2 messages Feb 7, 2013

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ppc: Remove PCIPPC2 and PCIPPC6 boards

These boards seem to be unmaintained for quite some time. So lets remove support for them completely. This also cleans up some common drivers/files.

Cc Guillaume Alexandre <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 MAINTAINERS                       |   3 -
 arch/powerpc/cpu/74xx_7xx/cpu.c   |   7 +-
 board/pcippc2/Makefile            |  47 ----
 board/pcippc2/cpc710.h            |  96 -------
 board/pcippc2/cpc710_init_ram.c   | 232 ---------------
 board/pcippc2/cpc710_pci.c        | 309 --------------------
 board/pcippc2/cpc710_pci.h        |  51 ----
 board/pcippc2/flash.c             | 573 --------------------------------------
 board/pcippc2/fpga_serial.c       | 125 ---------
 board/pcippc2/fpga_serial.h       |  33 ---
 board/pcippc2/hardware.h          |  48 ----
 board/pcippc2/i2c.c               | 257 -----------------
 board/pcippc2/i2c.h               |  36 ---
 board/pcippc2/ns16550.h           |  41 ---
 board/pcippc2/pcippc2.c           | 253 -----------------
 board/pcippc2/pcippc2.h           |  51 ----
 board/pcippc2/pcippc2_fpga.c      |  87 ------
 board/pcippc2/pcippc2_fpga.h      |  49 ----
 board/pcippc2/sconsole.c          | 162 -----------
 board/pcippc2/sconsole.h          |  48 ----
 boards.cfg                        |   2 -
 doc/driver-model/UDM-pci.txt      |   4 -
 doc/driver-model/UDM-watchdog.txt |   5 -
 drivers/rtc/mk48t59.c             |  14 -
 include/configs/PCIPPC2.h         | 251 -----------------
 include/configs/PCIPPC6.h         | 265 ------------------
 26 files changed, 3 insertions(+), 3046 deletions(-)
 delete mode 100644 board/pcippc2/Makefile
 delete mode 100644 board/pcippc2/cpc710.h
 delete mode 100644 board/pcippc2/cpc710_init_ram.c
 delete mode 100644 board/pcippc2/cpc710_pci.c
 delete mode 100644 board/pcippc2/cpc710_pci.h
 delete mode 100644 board/pcippc2/flash.c
 delete mode 100644 board/pcippc2/fpga_serial.c
 delete mode 100644 board/pcippc2/fpga_serial.h
 delete mode 100644 board/pcippc2/hardware.h
 delete mode 100644 board/pcippc2/i2c.c
 delete mode 100644 board/pcippc2/i2c.h
 delete mode 100644 board/pcippc2/ns16550.h
 delete mode 100644 board/pcippc2/pcippc2.c
 delete mode 100644 board/pcippc2/pcippc2.h
 delete mode 100644 board/pcippc2/pcippc2_fpga.c
 delete mode 100644 board/pcippc2/pcippc2_fpga.h
 delete mode 100644 board/pcippc2/sconsole.c
 delete mode 100644 board/pcippc2/sconsole.h
 delete mode 100644 include/configs/PCIPPC2.h
 delete mode 100644 include/configs/PCIPPC6.h
MAINTAINERS +0 -3
index 674780a..95bfcec 100644
@@ -150,9 +150,6 @@ Wolfgang Denk <[email protected]>
 
 	P3G4		MPC7410
 
-	PCIPPC2		MPC750
-	PCIPPC6		MPC750
-
 Phil Edworthy <[email protected]>
 
 	rsk7264		SH7264
arch/powerpc/cpu/74xx_7xx/cpu.c +3 -4
index b6a31b4..17694a1 100644
@@ -229,8 +229,7 @@ soft_restart(unsigned long addr)
 }
 
 
-#if !defined(CONFIG_PCIPPC2) && \
-    !defined(CONFIG_BAB7xx)  && \
+#if !defined(CONFIG_BAB7xx)  && \
     !defined(CONFIG_ELPPC)   && \
     !defined(CONFIG_PPMC7XX)
 /* no generic way to do board reset. simply call soft_reset. */
@@ -288,13 +287,13 @@ unsigned long get_tbclk(void)
 /* ------------------------------------------------------------------------- */
 
 #if defined(CONFIG_WATCHDOG)
-#if !defined(CONFIG_PCIPPC2) && !defined(CONFIG_BAB7xx)
+#if !defined(CONFIG_BAB7xx)
 void
 watchdog_reset(void)
 {
 
 }
-#endif  /* !CONFIG_PCIPPC2 && !CONFIG_BAB7xx */
+#endif  /* !CONFIG_BAB7xx */
 #endif	/* CONFIG_WATCHDOG */
 
 /* ------------------------------------------------------------------------- */
board/pcippc2/Makefile deleted +0 -47

47 lines not on this page · raw message

board/pcippc2/cpc710.h deleted +0 -96

96 lines not on this page · raw message

board/pcippc2/cpc710_init_ram.c deleted +0 -232

232 lines not on this page · raw message

board/pcippc2/cpc710_pci.c deleted +0 -309

309 lines not on this page · raw message

board/pcippc2/cpc710_pci.h deleted +0 -51

51 lines not on this page · raw message

board/pcippc2/flash.c deleted +0 -573

573 lines not on this page · raw message

board/pcippc2/fpga_serial.c deleted +0 -125

125 lines not on this page · raw message

board/pcippc2/fpga_serial.h deleted +0 -33
deleted file mode 100644
index 106fbf7..0000000
@@ -1,33 +0,0 @@
-/*
- * (C) Copyright 2002
- * 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
- */
-
-#ifndef _FPGA_SERIAL_H_
-#define _FPGA_SERIAL_H_
-
-extern void	fpga_serial_init	(int);
-extern void	fpga_serial_putc	(char);
-extern int	fpga_serial_getc	(void);
-extern int	fpga_serial_tstc	(void);
-extern void	fpga_serial_setbrg	(void);
-
-#endif
board/pcippc2/hardware.h deleted +0 -48

48 lines not on this page · raw message

board/pcippc2/i2c.c deleted +0 -257

257 lines not on this page · raw message

board/pcippc2/i2c.h deleted +0 -36
deleted file mode 100644
index 1224b42..0000000
@@ -1,36 +0,0 @@
-/*
- * (C) Copyright 2002
- * Wolfgang Denk, DENX Software Engineering, [email protected].
- *
- * 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
- */
-
-#ifndef _I2C_H_
-#define _I2C_H_
-
-#include <common.h>
-
-extern int	i2c_read_byte	(u8 *		data,
-				 u8		dev,
-				 u8 offset);
-
-extern unsigned int i2c_reset (void);
-
-
-#endif
board/pcippc2/ns16550.h deleted +0 -41

41 lines not on this page · raw message

board/pcippc2/pcippc2.c deleted +0 -253

253 lines not on this page · raw message

board/pcippc2/pcippc2.h deleted +0 -51

51 lines not on this page · raw message

board/pcippc2/pcippc2_fpga.c deleted +0 -87

87 lines not on this page · raw message

board/pcippc2/pcippc2_fpga.h deleted +0 -49

49 lines not on this page · raw message

board/pcippc2/sconsole.c deleted +0 -162

162 lines not on this page · raw message

board/pcippc2/sconsole.h deleted +0 -48

48 lines not on this page · raw message

boards.cfg +0 -2
index 318301a..fc09934 100644
@@ -459,8 +459,6 @@ openrisc-generic             openrisc    or1200      openrisc-generic    openris
 EVB64260                     powerpc     74xx_7xx    evb64260            -              -           EVB64260
 EVB64260_750CX               powerpc     74xx_7xx    evb64260            -              -           EVB64260
 P3G4                         powerpc     74xx_7xx    evb64260
-PCIPPC2                      powerpc     74xx_7xx    pcippc2
-PCIPPC6                      powerpc     74xx_7xx    pcippc2
 ppmc7xx                      powerpc     74xx_7xx
 ZUMA                         powerpc     74xx_7xx    evb64260
 ELPPC                        powerpc     74xx_7xx    elppc               eltec
doc/driver-model/UDM-pci.txt +0 -4
index b65e9ea..c2cf2d5 100644
@@ -240,10 +240,6 @@ III) Analysis of in-tree drivers
     ----------------
       Standard driver, uses indirect functions.
 
-    8) pcippc2/cpc710_pci.c
-    -----------------------
-      Standard driver, uses indirect functions, has two busses.
-
     9) Marvell/db64360/pci.c
     ------------------------
       Standard driver, uses dword for read/write ops, has two busses.
doc/driver-model/UDM-watchdog.txt +0 -5
index 271bd26..7db3286 100644
@@ -292,11 +292,6 @@ III) Analysis of in-tree drivers
   Only function proxy call. Code cleanup needed.
 
 
-  45) board/pcippc2/pcippc2.c
-  ---------------------------
-  The driver is standard HW watchdog. Simple conversion is possible.
-
-
   46) board/pcs440ep/pcs440ep.c
   -----------------------------
   The driver is standard HW watchdog. Simple conversion is possible.
drivers/rtc/mk48t59.c +0 -14
index e285823..3af2623 100644
@@ -49,20 +49,6 @@ static void rtc_write (short reg, uchar val)
 	out8(RTC_PORT_DATA, val);
 }
 
-#elif defined(CONFIG_PCIPPC2)
-
-#include "../board/pcippc2/pcippc2.h"
-
-static uchar rtc_read (short reg)
-{
-	return in8(RTC(reg));
-}
-
-static void rtc_write (short reg, uchar val)
-{
-	out8(RTC(reg),val);
-}
-
 #elif defined(CONFIG_EVAL5200)
 
 static uchar rtc_read (short reg)
include/configs/PCIPPC2.h deleted +0 -251

251 lines not on this page · raw message

include/configs/PCIPPC6.h deleted +0 -265

169 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.8.1.2

Part of the diff is not shown here. View the raw message.

#1 lore raw

PATCH 1/1 ppc: Remove PCIPPC2 and PCIPPC6 boards

Dear Stefan Roese,

Quoted 26 lines · In message <[email protected]> you wrote:

These boards seem to be unmaintained for quite some time. So lets remove support for them completely. This also cleans up some common drivers/files.

Cc Guillaume Alexandre <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 MAINTAINERS                       |   3 -
 arch/powerpc/cpu/74xx_7xx/cpu.c   |   7 +-
 board/pcippc2/Makefile            |  47 ----
 board/pcippc2/cpc710.h            |  96 -------
 board/pcippc2/cpc710_init_ram.c   | 232 ---------------
 board/pcippc2/cpc710_pci.c        | 309 --------------------
 board/pcippc2/cpc710_pci.h        |  51 ----
 board/pcippc2/flash.c             | 573 --------------------------------------
 board/pcippc2/fpga_serial.c       | 125 ---------
 board/pcippc2/fpga_serial.h       |  33 ---
 board/pcippc2/hardware.h          |  48 ----
 board/pcippc2/i2c.c               | 257 -----------------
 board/pcippc2/i2c.h               |  36 ---
 board/pcippc2/ns16550.h           |  41 ---
 board/pcippc2/pcippc2.c           | 253 -----------------
 board/pcippc2/pcippc2.h           |  51 ----
 board/pcippc2/pcippc2_fpga.c      |  87 ------
 board/pcippc2/pcippc2_fpga.h      |  49 ----
Quoted 8 lines
 board/pcippc2/sconsole.c          | 162 -----------
 board/pcippc2/sconsole.h          |  48 ----
 boards.cfg                        |   2 -
 doc/driver-model/UDM-pci.txt      |   4 -
 doc/driver-model/UDM-watchdog.txt |   5 -
 drivers/rtc/mk48t59.c             |  14 -
 include/configs/PCIPPC2.h         | 251 -----------------
 include/configs/PCIPPC6.h         | 265 ------------------

Please also make appropriate entries in doc/README.scrapyard

Except for this:

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A consultant is a person who borrows your watch, tells you what  time
it is, pockets the watch, and sends you a bill for it.