[U-Boot] [PATCH v2 14/14] powerpc: Remove 8260 remainders
Christophe Leroy
christophe.leroy at c-s.fr
Thu Jul 13 13:10:10 UTC 2017
commit 2eb48ff7a210d ("powerpc, 8260: remove support for mpc8260")
removed support for 8260 CPU.
This patch remove some remainders.
Signed-off-by: Christophe Leroy <christophe.leroy at c-s.fr>
---
MAINTAINERS | 6 ------
arch/powerpc/include/asm/processor.h | 14 --------------
drivers/i2c/soft_i2c.c | 4 ----
drivers/serial/serial.c | 3 ---
include/ioports.h | 7 ++-----
5 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1e8d7d9bb6..1778a76736 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -324,12 +324,6 @@ S: Maintained
T: git git://git.denx.de/u-boot-mpc8xx.git
F: arch/powerpc/cpu/mpc8xx/
-POWERPC MPC82XX
-M: Wolfgang Denk <wd at denx.de>
-S: Maintained
-T: git git://git.denx.de/u-boot-mpc82xx.git
-F: arch/powerpc/cpu/mpc82*/
-
POWERPC MPC83XX
M: Mario Six <mario.six at gdsys.cc>
S: Maintained
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 30ac4f8c10..baf38f8441 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -978,18 +978,6 @@
#define PVR_850 PVR_821
#define PVR_860 PVR_821
#define PVR_7400 0x000C0000
-#define PVR_8240 0x00810100
-
-/*
- * PowerQUICC II family processors report different PVR values depending
- * on silicon process (HiP3, HiP4, HiP7, etc.)
- */
-#define PVR_8260 PVR_8240
-#define PVR_8260_HIP3 0x00810101
-#define PVR_8260_HIP4 0x80811014
-#define PVR_8260_HIP7 0x80822011
-#define PVR_8260_HIP7R1 0x80822013
-#define PVR_8260_HIP7RA 0x80822014
/*
* MPC 52xx
@@ -1345,8 +1333,6 @@ void ll_puts(const char *);
void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
int prt_83xx_rsr(void);
-int prt_8260_rsr(void);
-int prt_8260_clks(void);
#endif /* ndef ASSEMBLY*/
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index a21e4a2627..4fd5551a22 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -17,10 +17,6 @@
*/
#include <common.h>
-#ifdef CONFIG_MPC8260 /* only valid for MPC8260 */
-#include <ioports.h>
-#include <asm/io.h>
-#endif
#if defined(CONFIG_AT91FAMILY)
#include <asm/io.h>
#include <asm/arch/hardware.h>
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 87542f92df..cc4bdcb834 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -133,9 +133,6 @@ serial_initfunc(marvell_serial_initialize);
serial_initfunc(max3100_serial_initialize);
serial_initfunc(mcf_serial_initialize);
serial_initfunc(ml2_serial_initialize);
-serial_initfunc(mpc5xx_serial_initialize);
-serial_initfunc(mpc8260_scc_serial_initialize);
-serial_initfunc(mpc8260_smc_serial_initialize);
serial_initfunc(mpc85xx_serial_initialize);
serial_initfunc(mpc8xx_serial_initialize);
serial_initfunc(mxc_serial_initialize);
diff --git a/include/ioports.h b/include/ioports.h
index 1134ea5208..1cd3ceb37a 100644
--- a/include/ioports.h
+++ b/include/ioports.h
@@ -1,14 +1,12 @@
/*
- * definitions for MPC8260 I/O Ports
- *
- * (in addition to those provided in <asm/immap_8260.h>)
+ * definitions for MPC8xxx I/O Ports
*
* Murray.Jensen at cmst.csiro.au, 20-Oct-00
*/
/*
* this structure mirrors the layout of the five port registers in
- * the internal memory map - see iop8260_t in <asm/immap_8260.h>
+ * the internal memory map
*/
typedef struct {
unsigned int pdir; /* Port Data Direction Register (35-3) */
@@ -46,7 +44,6 @@ typedef struct {
/*
* a table that contains configuration information for all 32 pins
- * of all four MPC8260 I/O ports.
*
* NOTE: in the second dimension of this table, index 0 refers to pin 31
* and index 31 refers to pin 0. this made the code in the table look more
--
2.12.0
More information about the U-Boot
mailing list