Skip to contentSkip to conversation

PCU_E: remove code for yet another corpse

PATCH New Wolfgang Denk 1 participant 4 messages Oct 5, 2010 – Oct 6, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 PCU_E: remove code for yet another corpse

The PCU_E board has long reached EOL, and support for it is no longer relevant in current versions of U-Boot. Remove it.

---
 MAINTAINERS                          |    1 -
 README                               |    2 +-
 arch/m68k/lib/board.c                |    4 -
 arch/powerpc/cpu/mpc8xx/cpu_init.c   |    1 -
 arch/powerpc/lib/board.c             |    4 +-
 board/siemens/pcu_e/Makefile         |   44 ---
 board/siemens/pcu_e/config.mk        |   28 --
 board/siemens/pcu_e/flash.c          |  700 ----------------------------------
 board/siemens/pcu_e/pcu_e.c          |  562 ---------------------------
 board/siemens/pcu_e/u-boot.lds       |  127 ------
 board/siemens/pcu_e/u-boot.lds.debug |  136 -------
 boards.cfg                           |    1 -
 include/commproc.h                   |    8 +-
 include/configs/pcu_e.h              |  550 --------------------------
 include/status_led.h                 |    4 +-
 15 files changed, 9 insertions(+), 2163 deletions(-)
 delete mode 100644 board/siemens/pcu_e/Makefile
 delete mode 100644 board/siemens/pcu_e/config.mk
 delete mode 100644 board/siemens/pcu_e/flash.c
 delete mode 100644 board/siemens/pcu_e/pcu_e.c
 delete mode 100644 board/siemens/pcu_e/u-boot.lds
 delete mode 100644 board/siemens/pcu_e/u-boot.lds.debug
 delete mode 100644 include/configs/pcu_e.h
MAINTAINERS +0 -1
index 5e3a3fa..210dd64 100644
@@ -117,7 +117,6 @@ Wolfgang Denk <[email protected]>
 	c2mon		MPC855
 	hermes		MPC860
 	lwmon		MPC823
-	pcu_e		MPC855
 
 	CU824		MPC8240
 	Sandpoint8240	MPC8240
README +1 -1
index 171e0d6..f997a5d 100644
@@ -1781,7 +1781,7 @@ The following options need to be configured:
 
 			ETX094, IVMS8, IVML24, SPD8xx, TQM8xxL,
 			HERMES, IP860, RPXlite, LWMON, LANTEC,
-			PCU_E, FLAGADM, TQM8260
+			FLAGADM, TQM8260
 
 - Error Recovery:
 		CONFIG_PANIC_HANG
arch/m68k/lib/board.c +0 -4
index c29f577..eba2435 100644
@@ -73,10 +73,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static char *failed = "*** failed ***\n";
 
-#ifdef	CONFIG_PCU_E
-extern flash_info_t flash_info[];
-#endif
-
 #include <environment.h>
 
 extern ulong __init_end;
arch/powerpc/cpu/mpc8xx/cpu_init.c +0 -1
index e97ae68..49b354d 100644
@@ -156,7 +156,6 @@ void cpu_init_f (volatile immap_t * immr)
     defined(CONFIG_IVMS8)	|| \
     defined(CONFIG_LWMON)	|| \
     defined(CONFIG_MHPC)	|| \
-    defined(CONFIG_PCU_E)	|| \
     defined(CONFIG_R360MPI)	|| \
     defined(CONFIG_RMU)		|| \
     defined(CONFIG_RPXCLASSIC)	|| \
arch/powerpc/lib/board.c +2 -2
index 8f6a7c9..907857b 100644
@@ -107,7 +107,7 @@ void doc_init (void);
 
 static char *failed = "*** failed ***\n";
 
-#if defined(CONFIG_OXC) || defined(CONFIG_PCU_E) || defined(CONFIG_RMU)
+#if defined(CONFIG_OXC) || defined(CONFIG_RMU)
 extern flash_info_t flash_info[];
 #endif
 
@@ -735,7 +735,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
 
 
-# if defined(CONFIG_PCU_E) || defined(CONFIG_OXC) || defined(CONFIG_RMU)
+# if defined(CONFIG_OXC) || defined(CONFIG_RMU)
 	/* flash mapped at end of memory map */
 	bd->bi_flashoffset = TEXT_BASE + flash_size;
 # elif CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE
board/siemens/pcu_e/Makefile deleted +0 -44

44 lines not on this page · raw message

board/siemens/pcu_e/config.mk deleted +0 -28
deleted file mode 100644
index 10f3773..0000000
@@ -1,28 +0,0 @@
-#
-# (C) Copyright 2001
-# 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
-#
-
-#
-# Siemens PCU E Boards
-#
-
-TEXT_BASE = 0xFFF00000
board/siemens/pcu_e/flash.c deleted +0 -700

700 lines not on this page · raw message

board/siemens/pcu_e/pcu_e.c deleted +0 -562

562 lines not on this page · raw message

board/siemens/pcu_e/u-boot.lds deleted +0 -127

127 lines not on this page · raw message

board/siemens/pcu_e/u-boot.lds.debug deleted +0 -136

136 lines not on this page · raw message

boards.cfg +0 -1
index 9909685..976ab3a 100644
@@ -163,7 +163,6 @@ KUP4X		powerpc	mpc8xx		kup4x		kup
 ELPT860		powerpc	mpc8xx		elpt860		LEOX
 CCM		powerpc	mpc8xx		-		siemens
 IAD210		powerpc	mpc8xx		-		siemens
-pcu_e		powerpc	mpc8xx		-		siemens
 QS823		powerpc	mpc8xx		qs850		snmc
 QS850		powerpc	mpc8xx		qs850		snmc
 QS860T		powerpc	mpc8xx		qs860t		snmc
include/commproc.h +4 -4
index 762238e..2063761 100644
@@ -580,11 +580,11 @@ typedef struct scc_enet {
 /*********************************************************************/
 
 
-/***  CCM  and  PCU E  ***********************************************/
+/***  CCM  ***********************************************************/
 
-/* The PCU E  and  CCM  use the FEC on a MPC860T for Ethernet */
+/* The CCM  uses the FEC on a MPC860T for Ethernet */
 
-#if defined (CONFIG_PCU_E) || defined(CONFIG_CCM)
+#if defined(CONFIG_CCM)
 
 #define	FEC_ENET	/* use FEC for EThernet */
 #undef	SCC_ENET
@@ -605,7 +605,7 @@ typedef struct scc_enet {
 
 #define PD_MII_MASK	((ushort)0x1FFF)	/* PD 3...15 */
 
-#endif	/* CONFIG_PCU_E, CONFIG_CCM */
+#endif	/* CONFIG_CCM */
 
 /***  ELPT860 *********************************************************/
 
include/configs/pcu_e.h deleted +0 -550

550 lines not on this page · raw message

include/status_led.h +2 -2
index b39ca64..45fdc66 100644
@@ -190,8 +190,8 @@ void status_led_set  (int led, int state);
 
 # define STATUS_LED_BOOT	0		/* LED 0 used for boot status */
 
-/*****  PCU E  and  CCM  ************************************************/
-#elif (defined(CONFIG_PCU_E) || defined(CONFIG_CCM))
+/*****  CCM  ************************************************************/
+#elif defined(CONFIG_CCM)
 
 # define STATUS_LED_PAR		im_cpm.cp_pbpar
 # define STATUS_LED_DIR		im_cpm.cp_pbdir
Signature · 1 line
1.7.2.3
author Applied
#1 lore raw

PATCH 1/2 PCU_E: remove code for yet another corpse

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

The PCU_E board has long reached EOL, and support for it is no longer relevant in current versions of U-Boot. Remove it.

---
 MAINTAINERS                          |    1 -
 README                               |    2 +-
 arch/m68k/lib/board.c                |    4 -
 arch/powerpc/cpu/mpc8xx/cpu_init.c   |    1 -
 arch/powerpc/lib/board.c             |    4 +-
 board/siemens/pcu_e/Makefile         |   44 ---
 board/siemens/pcu_e/config.mk        |   28 --
 board/siemens/pcu_e/flash.c          |  700 ----------------------------------
 board/siemens/pcu_e/pcu_e.c          |  562 ---------------------------
 board/siemens/pcu_e/u-boot.lds       |  127 ------
 board/siemens/pcu_e/u-boot.lds.debug |  136 -------
 boards.cfg                           |    1 -
 include/commproc.h                   |    8 +-
 include/configs/pcu_e.h              |  550 --------------------------
 include/status_led.h                 |    4 +-
Quoted 8 lines
 15 files changed, 9 insertions(+), 2163 deletions(-)
 delete mode 100644 board/siemens/pcu_e/Makefile
 delete mode 100644 board/siemens/pcu_e/config.mk
 delete mode 100644 board/siemens/pcu_e/flash.c
 delete mode 100644 board/siemens/pcu_e/pcu_e.c
 delete mode 100644 board/siemens/pcu_e/u-boot.lds
 delete mode 100644 board/siemens/pcu_e/u-boot.lds.debug
 delete mode 100644 include/configs/pcu_e.h

Applied.

Best regards,

Wolfgang Denk

Signature · 6 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
The ideal situation is to have massive computing power right at home.
Something that dims the streetlights and shrinks the picture  on  the
neighbours' TVs when you boot it up.
#2 lore raw

PATCH 2/2 CCM: remove code for yet another corpse

In reply to Wolfgang Denk

The CCM board has long reached EOL, and support for it is no longer relevant in current versions of U-Boot. Remove it.

---
 MAINTAINERS                        |    2 -
 board/siemens/CCM/Makefile         |   56 ----
 board/siemens/CCM/ccm.c            |  408 --------------------------
 board/siemens/CCM/config.mk        |   28 --
 board/siemens/CCM/flash.c          |  553 ------------------------------------
 board/siemens/CCM/fpga_ccm.c       |  169 -----------
 board/siemens/CCM/u-boot.lds       |  138 ---------
 board/siemens/CCM/u-boot.lds.debug |  135 ---------
 boards.cfg                         |    1 -
 include/commproc.h                 |   28 --
 include/configs/CCM.h              |  488 -------------------------------
 include/status_led.h               |   18 +--
 12 files changed, 1 insertions(+), 2023 deletions(-)
 delete mode 100644 board/siemens/CCM/Makefile
 delete mode 100644 board/siemens/CCM/ccm.c
 delete mode 100644 board/siemens/CCM/config.mk
 delete mode 100644 board/siemens/CCM/flash.c
 delete mode 100644 board/siemens/CCM/fpga_ccm.c
 delete mode 100644 board/siemens/CCM/u-boot.lds
 delete mode 100644 board/siemens/CCM/u-boot.lds.debug
 delete mode 100644 include/configs/CCM.h
MAINTAINERS +0 -2
index 210dd64..e003226 100644
@@ -207,8 +207,6 @@ Wolfgang Grandegger <[email protected]>
 
 	ipek01		MPC5200
 
-	CCM		MPC855
-
 	PN62		MPC8240
 	IPHASE4539	MPC8260
 	SCM		MPC8260
board/siemens/CCM/Makefile deleted +0 -56

56 lines not on this page · raw message

board/siemens/CCM/ccm.c deleted +0 -408

408 lines not on this page · raw message

board/siemens/CCM/config.mk deleted +0 -28
deleted file mode 100644
index 9c72c79..0000000
@@ -1,28 +0,0 @@
-#
-# (C) Copyright 2001
-# 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
-#
-
-#
-# TQM8xxL boards
-#
-
-TEXT_BASE = 0x40000000
board/siemens/CCM/flash.c deleted +0 -553

553 lines not on this page · raw message

board/siemens/CCM/fpga_ccm.c deleted +0 -169

169 lines not on this page · raw message

board/siemens/CCM/u-boot.lds deleted +0 -138

138 lines not on this page · raw message

board/siemens/CCM/u-boot.lds.debug deleted +0 -135

135 lines not on this page · raw message

boards.cfg +0 -1
index 976ab3a..202de1a 100644
@@ -161,7 +161,6 @@ mgsuvd		powerpc	mpc8xx		km8xx		keymile
 KUP4K		powerpc	mpc8xx		kup4k		kup
 KUP4X		powerpc	mpc8xx		kup4x		kup
 ELPT860		powerpc	mpc8xx		elpt860		LEOX
-CCM		powerpc	mpc8xx		-		siemens
 IAD210		powerpc	mpc8xx		-		siemens
 QS823		powerpc	mpc8xx		qs850		snmc
 QS850		powerpc	mpc8xx		qs850		snmc
include/commproc.h +0 -28
index 2063761..a69a809 100644
@@ -579,34 +579,6 @@ typedef struct scc_enet {
 
 /*********************************************************************/
 
-
-/***  CCM  ***********************************************************/
-
-/* The CCM  uses the FEC on a MPC860T for Ethernet */
-
-#if defined(CONFIG_CCM)
-
-#define	FEC_ENET	/* use FEC for EThernet */
-#undef	SCC_ENET
-
-#define PD_MII_TXD1	((ushort)0x1000)	/* PD  3 */
-#define PD_MII_TXD2	((ushort)0x0800)	/* PD  4 */
-#define PD_MII_TXD3	((ushort)0x0400)	/* PD  5 */
-#define PD_MII_RX_DV	((ushort)0x0200)	/* PD  6 */
-#define PD_MII_RX_ERR	((ushort)0x0100)	/* PD  7 */
-#define PD_MII_RX_CLK	((ushort)0x0080)	/* PD  8 */
-#define PD_MII_TXD0	((ushort)0x0040)	/* PD  9 */
-#define PD_MII_RXD0	((ushort)0x0020)	/* PD 10 */
-#define PD_MII_TX_ERR	((ushort)0x0010)	/* PD 11 */
-#define PD_MII_MDC	((ushort)0x0008)	/* PD 12 */
-#define PD_MII_RXD1	((ushort)0x0004)	/* PD 13 */
-#define PD_MII_RXD2	((ushort)0x0002)	/* PD 14 */
-#define PD_MII_RXD3	((ushort)0x0001)	/* PD 15 */
-
-#define PD_MII_MASK	((ushort)0x1FFF)	/* PD 3...15 */
-
-#endif	/* CONFIG_CCM */
-
 /***  ELPT860 *********************************************************/
 
 #ifdef CONFIG_ELPT860
include/configs/CCM.h deleted +0 -488

488 lines not on this page · raw message

include/status_led.h +1 -17
index 45fdc66..360195c 100644
@@ -190,22 +190,6 @@ void status_led_set  (int led, int state);
 
 # define STATUS_LED_BOOT	0		/* LED 0 used for boot status */
 
-/*****  CCM  ************************************************************/
-#elif defined(CONFIG_CCM)
-
-# define STATUS_LED_PAR		im_cpm.cp_pbpar
-# define STATUS_LED_DIR		im_cpm.cp_pbdir
-# define STATUS_LED_ODR		im_cpm.cp_pbodr
-# define STATUS_LED_DAT		im_cpm.cp_pbdat
-
-# define STATUS_LED_BIT		0x00010000	/* green LED is on PB.15 */
-# define STATUS_LED_PERIOD	(CONFIG_SYS_HZ / 2)
-# define STATUS_LED_STATE	STATUS_LED_BLINKING
-
-# define STATUS_LED_ACTIVE	1		/* LED on for bit == 1 */
-
-# define STATUS_LED_BOOT	0		/* LED 0 used for boot status */
-
 /*****  ICU862   ********************************************************/
 #elif defined(CONFIG_ICU862)
 
@@ -270,7 +254,7 @@ void status_led_set  (int led, int state);
 # define STATUS_LED_BOOT	0		/* LED 0 used for boot status */
 
 /*****  KUP4K, KUP4X  ****************************************************/
-#elif defined(CONFIG_KUP4K) || defined(CONFIG_KUP4X) || defined(CONFIG_CCM)
+#elif defined(CONFIG_KUP4K) || defined(CONFIG_KUP4X)
 
 # define STATUS_LED_PAR		im_ioport.iop_papar
 # define STATUS_LED_DIR		im_ioport.iop_padir
Signature · 1 line
1.7.2.3
author Applied
#3 lore raw

PATCH 2/2 CCM: remove code for yet another corpse

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

The CCM board has long reached EOL, and support for it is no longer relevant in current versions of U-Boot. Remove it.

---
 MAINTAINERS                        |    2 -
 board/siemens/CCM/Makefile         |   56 ----
 board/siemens/CCM/ccm.c            |  408 --------------------------
 board/siemens/CCM/config.mk        |   28 --
 board/siemens/CCM/flash.c          |  553 ------------------------------------
 board/siemens/CCM/fpga_ccm.c       |  169 -----------
 board/siemens/CCM/u-boot.lds       |  138 ---------
 board/siemens/CCM/u-boot.lds.debug |  135 ---------
 boards.cfg                         |    1 -
 include/commproc.h                 |   28 --
 include/configs/CCM.h              |  488 -------------------------------
 include/status_led.h               |   18 +--
 12 files changed, 1 insertions(+), 2023 deletions(-)
Quoted 8 lines
 delete mode 100644 board/siemens/CCM/Makefile
 delete mode 100644 board/siemens/CCM/ccm.c
 delete mode 100644 board/siemens/CCM/config.mk
 delete mode 100644 board/siemens/CCM/flash.c
 delete mode 100644 board/siemens/CCM/fpga_ccm.c
 delete mode 100644 board/siemens/CCM/u-boot.lds
 delete mode 100644 board/siemens/CCM/u-boot.lds.debug
 delete mode 100644 include/configs/CCM.h

Applied.

Best regards,

Wolfgang Denk

Signature · 4 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
Madness takes its toll. Please have exact change.