Skip to contentSkip to conversation

ppc4xx: Remove IOP480 support

PATCH New Stefan Roese 3 participants 3 messages Sep 19, 2012 PowerPC

lore
Share & tools
lore

Stefan Roese

author
#0 lore raw

PATCH 1/1 ppc4xx: Remove IOP480 support

Since the IOP480 (PPC401/3 variant from PLX) is only used on 2 boards that are not actively maintained, lets remove support for it completely. This way the ppc4xx code will get a bit cleaner.

Signed-off-by Stefan Roese <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Matthias Fuchs <[email protected]>
---
 MAINTAINERS                           |   2 -
 arch/powerpc/cpu/ppc4xx/Makefile      |   1 -
 arch/powerpc/cpu/ppc4xx/cpu.c         |  16 +--
 arch/powerpc/cpu/ppc4xx/iop480_uart.c | 236 ----------------------------------
 arch/powerpc/cpu/ppc4xx/speed.c       |  17 ---
 arch/powerpc/cpu/ppc4xx/start.S       | 108 ----------------
 arch/powerpc/include/asm/cache.h      |   2 +-
 arch/powerpc/include/asm/ppc405.h     |   4 -
 boards.cfg                            |   2 -
 include/common.h                      |   2 +-
 include/configs/ADCIOP.h              | 203 -----------------------------
 include/configs/DASA_SIM.h            | 194 ----------------------------
 include/vxworks.h                     |   2 -
 13 files changed, 3 insertions(+), 786 deletions(-)
 delete mode 100644 arch/powerpc/cpu/ppc4xx/iop480_uart.c
 delete mode 100644 include/configs/ADCIOP.h
 delete mode 100644 include/configs/DASA_SIM.h
MAINTAINERS +0 -2
index aa54fe1..07dc789 100644
@@ -183,7 +183,6 @@ Thomas Frieden <[email protected]>
 
 Matthias Fuchs <[email protected]>
 
-	ADCIOP		IOP480 (PPC401)
 	APC405		PPC405GP
 	AR405		PPC405GP
 	ASH405		PPC405EP

@@ -194,7 +193,6 @@ Matthias Fuchs <[email protected]>
 	CPCI405AB	PPC405GP
 	CPCI405DT	PPC405GP
 	CPCIISER4	PPC405GP
-	DASA_SIM	IOP480 (PPC401)
 	DP405		PPC405EP
 	DU405		PPC405GP
 	DU440		PPC440EPx
arch/powerpc/cpu/ppc4xx/Makefile +0 -1
index 3d62255..8da2f86 100644
@@ -53,7 +53,6 @@ COBJS	+= ecc.o
 COBJS-$(CONFIG_CMD_ECCTEST) += cmd_ecctest.o
 COBJS	+= fdt.o
 COBJS	+= interrupts.o
-COBJS	+= iop480_uart.o
 COBJS-$(CONFIG_CMD_REGINFO) += reginfo.o
 COBJS	+= sdram.o
 COBJS	+= speed.o
arch/powerpc/cpu/ppc4xx/cpu.c +1 -15
index 67f1fff..60aba8c 100644
@@ -79,7 +79,7 @@ static int pci_async_enabled(void)
 #endif
 #endif /* CONFIG_PCI */
 
-#if defined(CONFIG_PCI) && !defined(CONFIG_IOP480) && \
+#if defined(CONFIG_PCI) && \
     !defined(CONFIG_405) && !defined(CONFIG_405EX)
 int pci_arbiter_enabled(void)
 {

@@ -303,7 +303,6 @@ int checkcpu (void)
 	u32 reg;
 #endif
 
-#if !defined(CONFIG_IOP480)
 	char addstr[64] = "";
 	sys_info_t sys_info;
 	int cpu_num;

@@ -671,14 +670,6 @@ int checkcpu (void)
 	printf ("       16 kB I-Cache %d kB D-Cache",
 		((pvr | 0x00000001) == PVR_405GPR_RB) ? 16 : 8);
 #endif
-#endif /* !defined(CONFIG_IOP480) */
-
-#if defined(CONFIG_IOP480)
-	printf ("PLX IOP480 (PVR=%08x)", pvr);
-	printf (" at %s MHz:", strmhz(buf, clock));
-	printf (" %u kB I-Cache", 4);
-	printf (" %u kB D-Cache", 2);
-#endif
 
 #endif /* !defined(CONFIG_405) */
 

@@ -723,15 +714,10 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  */
 unsigned long get_tbclk (void)
 {
-#if !defined(CONFIG_IOP480)
 	sys_info_t  sys_info;
 
 	get_sys_info(&sys_info);
 	return (sys_info.freqProcessor);
-#else
-	return (66000000);
-#endif
-
 }
arch/powerpc/cpu/ppc4xx/iop480_uart.c deleted +0 -236

236 lines not on this page · raw message

arch/powerpc/cpu/ppc4xx/speed.c +0 -17
index 09d6671..6156ac9 100644
@@ -1190,22 +1190,12 @@ void get_sys_info (sys_info_t * sysInfo)
 
 int get_clocks (void)
 {
-#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || \
-    defined(CONFIG_405EP) || defined(CONFIG_405EZ) || \
-    defined(CONFIG_405EX) || defined(CONFIG_405) || \
-    defined(CONFIG_440)
 	sys_info_t sys_info;
 
 	get_sys_info (&sys_info);
 	gd->cpu_clk = sys_info.freqProcessor;
 	gd->bus_clk = sys_info.freqPLB;
 
-#endif	/* defined(CONFIG_405GP) || defined(CONFIG_405CR) */
-
-#ifdef CONFIG_IOP480
-	gd->cpu_clk = 66000000;
-	gd->bus_clk = 66000000;
-#endif
 	return (0);
 }
 

@@ -1226,11 +1216,6 @@ ulong get_bus_freq (ulong dummy)
 
 	get_sys_info (&sys_info);
 	val = sys_info.freqPLB;
-
-#elif defined(CONFIG_IOP480)
-
-	val = 66;
-
 #else
 # error get_bus_freq() not implemented
 #endif

@@ -1238,7 +1223,6 @@ ulong get_bus_freq (ulong dummy)
 	return val;
 }
 
-#if !defined(CONFIG_IOP480)
 ulong get_OPB_freq (void)
 {
 	PPC4xx_SYS_INFO sys_info;

@@ -1247,4 +1231,3 @@ ulong get_OPB_freq (void)
 
 	return sys_info.freqOPB;
 }
-#endif
arch/powerpc/cpu/ppc4xx/start.S +0 -108

114 lines not on this page · raw message

arch/powerpc/include/asm/cache.h +1 -1
index e6b8f69..5f9c640 100644
@@ -8,7 +8,7 @@
 #include <asm/processor.h>
 
 /* bytes per L1 cache line */
-#if defined(CONFIG_8xx) || defined(CONFIG_IOP480)
+#if defined(CONFIG_8xx)
 #define	L1_CACHE_SHIFT	4
 #elif defined(CONFIG_PPC64BRIDGE)
 #define L1_CACHE_SHIFT	7
arch/powerpc/include/asm/ppc405.h +0 -4
index 14a7a37..892848a 100644
@@ -28,11 +28,7 @@
 #define PPC_128MB_SACR_BIT(addr)	((addr) >> 27)
 #define PPC_128MB_SACR_VALUE(addr)	PPC_REG_VAL(PPC_128MB_SACR_BIT(addr),1)
 
-#ifndef CONFIG_IOP480
 #define CONFIG_SYS_DCACHE_SIZE		(16 << 10)	/* For AMCC 405 CPUs */
-#else
-#define CONFIG_SYS_DCACHE_SIZE		(2 << 10)	/* For PLX IOP480(403)*/
-#endif
 
 /* DCR registers */
 #define PLB0_ACR	0x0087
boards.cfg +0 -2
index b4e0d3c..343859e 100644
@@ -1017,7 +1017,6 @@ PPChameleonEVB_HI_25         powerpc     ppc4xx      PPChameleonEVB      dave
 PPChameleonEVB_HI_33         powerpc     ppc4xx      PPChameleonEVB      dave           -           PPChameleonEVB:PPCHAMELEON_MODULE_MODEL=2,PPCHAMELEON_CLK_33
 PPChameleonEVB_ME_25         powerpc     ppc4xx      PPChameleonEVB      dave           -           PPChameleonEVB:PPCHAMELEON_MODULE_MODEL=1,PPCHAMELEON_CLK_25
 PPChameleonEVB_ME_33         powerpc     ppc4xx      PPChameleonEVB      dave           -           PPChameleonEVB:PPCHAMELEON_MODULE_MODEL=1,PPCHAMELEON_CLK_33
-ADCIOP                       powerpc     ppc4xx      adciop              esd
 APC405                       powerpc     ppc4xx      apc405              esd
 AR405                        powerpc     ppc4xx      ar405               esd
 ASH405                       powerpc     ppc4xx      ash405              esd

@@ -1029,7 +1028,6 @@ CPCI4052                     powerpc     ppc4xx      cpci405             esd
 CPCI405AB                    powerpc     ppc4xx      cpci405             esd
 CPCI405DT                    powerpc     ppc4xx      cpci405             esd
 CPCIISER4                    powerpc     ppc4xx      cpciiser4           esd
-DASA_SIM                     powerpc     ppc4xx      dasa_sim            esd
 DP405                        powerpc     ppc4xx      dp405               esd
 DU405                        powerpc     ppc4xx      du405               esd
 DU440                        powerpc     ppc4xx      du440               esd
include/common.h +1 -1
index 55025c0..100e550 100644
@@ -670,7 +670,7 @@ static inline ulong get_ddr_freq(ulong dummy)
 }
 #endif
 
-#if defined(CONFIG_4xx) || defined(CONFIG_IOP480)
+#if defined(CONFIG_4xx)
 #  if defined(CONFIG_440)
 #	if defined(CONFIG_440SPE)
 	 unsigned long determine_sysper(void);
include/configs/ADCIOP.h deleted +0 -203

203 lines not on this page · raw message

include/configs/DASA_SIM.h deleted +0 -194

194 lines not on this page · raw message

include/vxworks.h +0 -2
index 917a9ff..736e3b5 100644
@@ -39,8 +39,6 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 #ifndef CONFIG_SYS_VXWORKS_BOOT_DEVICE
 #if defined(CONFIG_4xx)
 #define		CONFIG_SYS_VXWORKS_BOOT_DEVICE "emac(0,0)"
-#elif defined(CONFIG_IOP480)
-#define		CONFIG_SYS_VXWORKS_BOOT_DEVICE "dc(0,0)"
 #else
 #define		CONFIG_SYS_VXWORKS_BOOT_DEVICE "eth(0,0)"
 #endif
Signature · 1 line
1.7.12.1
#2 lore raw

PATCH 1/1 ppc4xx: Remove IOP480 support

Dear Matthias Fuchs,

Quoted 5 lines · Stefan Roese
Quoted 4 lines

Since the IOP480 (PPC401/3 variant from PLX) is only used on 2 boards that are not actively maintained, lets remove support for it completely. This way the ppc4xx code will get a bit cleaner.

Quoted 7 lines
Quoted 1 line
Signed-off-by Stefan Roese <[email protected]>

Thanks for this outstanding cleanup.

Matthias

Acked-by Matthias Fuchs <[email protected]>

Definitelly

Acked-by Marek Vasut <[email protected]>

Best regards,
Marek Vasut