[U-Boot] [PATCH 29/29] Remove include/mpc512x.h

Wolfgang Denk wd at denx.de
Sat May 9 21:51:08 CEST 2009


After removing the last reference to it, we can finally ditch
include/mpc512x.h

Signed-off-by: Wolfgang Denk <wd at denx.de>
Cc: John Rigby <jcrigby at gmail.com>
---
 include/common.h  |    1 -
 include/mpc512x.h |  385 -----------------------------------------------------
 2 files changed, 0 insertions(+), 386 deletions(-)
 delete mode 100644 include/mpc512x.h

diff --git a/include/common.h b/include/common.h
index 30fff7d..636631f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -66,7 +66,6 @@ typedef volatile unsigned char	vu_char;
 #elif defined(CONFIG_MPC5xxx)
 #include <mpc5xxx.h>
 #elif defined(CONFIG_MPC512X)
-#include <mpc512x.h>
 #include <asm/immap_512x.h>
 #elif defined(CONFIG_MPC8220)
 #include <asm/immap_8220.h>
diff --git a/include/mpc512x.h b/include/mpc512x.h
deleted file mode 100644
index e4c1d2f..0000000
--- a/include/mpc512x.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Copyright (C) 2004-2006 Freescale Semiconductor, Inc.
- * (C) Copyright 2007 DENX Software Engineering
- *
- * 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.
- *
- * Derived from the MPC83xx header.
- */
-
-#ifndef __MPC512X_H__
-#define __MPC512X_H__
-
-#include <config.h>
-#if defined(CONFIG_E300)
-#include <asm/e300.h>
-#endif
-
-/* LAWBAR - Local Access Window Base Address Register
- */
-#define LPBAW			0x0020		/* Register offset to immr */
-#define LPCS0AW			0x0024
-#define LPCS1AW			0x0028
-#define LPCS2AW			0x002C
-#define LPCS3AW			0x0030
-#define LPCS4AW			0x0034
-#define LPCS5AW			0x0038
-#define LPCS6AW			0x003C
-#define LPCA7AW			0x0040
-#define SRAMBAR			0x00C4
-
-#define LPC_OFFSET		0x10000
-
-#define CS0_CONFIG		0x00000
-#define CS1_CONFIG		0x00004
-#define CS2_CONFIG		0x00008
-#define CS3_CONFIG		0x0000C
-#define CS4_CONFIG		0x00010
-#define CS5_CONFIG		0x00014
-#define CS6_CONFIG		0x00018
-#define CS7_CONFIG		0x0001C
-#define CS_ALE_TIMING_CONFIG	0x00034
-
-#define CS_CTRL			0x00020
-#define CS_CTRL_ME		0x01000000	/* CS Master Enable bit */
-#define CS_CTRL_IE		0x08000000	/* CS Interrupt Enable bit */
-
-/* SPRIDR - System Part and Revision ID Register
- */
-#define SPRIDR_PARTID		0xFFFF0000	/* Part Identification */
-#define SPRIDR_REVID		0x0000FFFF	/* Revision Identification */
-
-#define SPR_5121E		0x80180000
-
-/* SPCR - System Priority Configuration Register
- */
-#define SPCR_PCIHPE			0x10000000	/* PCI Highest Priority Enable */
-#define SPCR_PCIHPE_SHIFT		(31-3)
-#define SPCR_PCIPR			0x03000000	/* PCI bridge system bus request priority */
-#define SPCR_PCIPR_SHIFT		(31-7)
-#define SPCR_TBEN_SHIFT			(31-9)
-#define SPCR_COREPR			0x00300000	/* E300 PowerPC Core system bus request priority */
-#define SPCR_COREPR_SHIFT		(31-11)
-
-/* SWCRR - System Watchdog Control Register
- */
-#define SWCRR				0x0904		/* Register offset to immr */
-#define SWCRR_SWTC			0xFFFF0000	/* Software Watchdog Time Count */
-#define SWCRR_SWEN			0x00000004	/* Watchdog Enable bit */
-#define SWCRR_SWRI			0x00000002	/* Software Watchdog Reset/Interrupt Select bit */
-#define SWCRR_SWPR			0x00000001	/* Software Watchdog Counter Prescale bit */
-#define SWCRR_RES			~(SWCRR_SWTC | SWCRR_SWEN | SWCRR_SWRI | SWCRR_SWPR)
-
-/* SWCNR - System Watchdog Counter Register
- */
-#define SWCNR				0x0908		/* Register offset to immr */
-#define SWCNR_SWCN			0x0000FFFF	/* Software Watchdog Count mask */
-#define SWCNR_RES			~(SWCNR_SWCN)
-
-/* SWSRR - System Watchdog Service Register
- */
-#define SWSRR				0x090E		/* Register offset to immr */
-
-/* ACR - Arbiter Configuration Register
- */
-#define ACR_COREDIS			0x10000000	/* Core disable */
-#define ACR_COREDIS_SHIFT		(31-7)
-#define ACR_PIPE_DEP			0x00070000	/* Pipeline depth */
-#define ACR_PIPE_DEP_SHIFT		(31-15)
-#define ACR_PCI_RPTCNT			0x00007000	/* PCI repeat count */
-#define ACR_PCI_RPTCNT_SHIFT		(31-19)
-#define ACR_RPTCNT			0x00000700	/* Repeat count */
-#define ACR_RPTCNT_SHIFT		(31-23)
-#define ACR_APARK			0x00000030	/* Address parking */
-#define ACR_APARK_SHIFT			(31-27)
-#define ACR_PARKM			0x0000000F	/* Parking master */
-#define ACR_PARKM_SHIFT			(31-31)
-
-/* ATR - Arbiter Timers Register
- */
-#define ATR_DTO				0x00FF0000	/* Data time out */
-#define ATR_ATO				0x000000FF	/* Address time out */
-
-/* AER - Arbiter Event Register
- */
-#define AER_ETEA			0x00000020	/* Transfer error */
-#define AER_RES				0x00000010	/* Reserved transfer type */
-#define AER_ECW				0x00000008	/* External control word transfer type */
-#define AER_AO				0x00000004	/* Address Only transfer type */
-#define AER_DTO				0x00000002	/* Data time out */
-#define AER_ATO				0x00000001	/* Address time out */
-
-/* AEATR - Arbiter Event Address Register
- */
-#define AEATR_EVENT			0x07000000	/* Event type */
-#define AEATR_MSTR_ID			0x001F0000	/* Master Id */
-#define AEATR_TBST			0x00000800	/* Transfer burst */
-#define AEATR_TSIZE			0x00000700	/* Transfer Size */
-#define AEATR_TTYPE			0x0000001F	/* Transfer Type */
-
-/* SCCR - System Clock Control Registers
- */
-
-/* IO Control Register
- */
-#define IOCTL_MEM		0x000
-#define IOCTL_GP		0x004
-#define IOCTL_LPC_CLK		0x008
-#define IOCTL_LPC_OE		0x00C
-#define IOCTL_LPC_RWB		0x010
-#define IOCTL_LPC_ACK		0x014
-#define IOCTL_LPC_CS0		0x018
-#define IOCTL_NFC_CE0		0x01C
-#define IOCTL_LPC_CS1		0x020
-#define IOCTL_LPC_CS2		0x024
-#define IOCTL_LPC_AX03		0x028
-#define IOCTL_EMB_AX02		0x02C
-#define IOCTL_EMB_AX01		0x030
-#define IOCTL_EMB_AX00		0x034
-#define IOCTL_EMB_AD31		0x038
-#define IOCTL_EMB_AD30		0x03C
-#define IOCTL_EMB_AD29		0x040
-#define IOCTL_EMB_AD28		0x044
-#define IOCTL_EMB_AD27		0x048
-#define IOCTL_EMB_AD26		0x04C
-#define IOCTL_EMB_AD25		0x050
-#define IOCTL_EMB_AD24		0x054
-#define IOCTL_EMB_AD23		0x058
-#define IOCTL_EMB_AD22		0x05C
-#define IOCTL_EMB_AD21		0x060
-#define IOCTL_EMB_AD20		0x064
-#define IOCTL_EMB_AD19		0x068
-#define IOCTL_EMB_AD18		0x06C
-#define IOCTL_EMB_AD17		0x070
-#define IOCTL_EMB_AD16		0x074
-#define IOCTL_EMB_AD15		0x078
-#define IOCTL_EMB_AD14		0x07C
-#define IOCTL_EMB_AD13		0x080
-#define IOCTL_EMB_AD12		0x084
-#define IOCTL_EMB_AD11		0x088
-#define IOCTL_EMB_AD10		0x08C
-#define IOCTL_EMB_AD09		0x090
-#define IOCTL_EMB_AD08		0x094
-#define IOCTL_EMB_AD07		0x098
-#define IOCTL_EMB_AD06		0x09C
-#define IOCTL_EMB_AD05		0x0A0
-#define IOCTL_EMB_AD04		0x0A4
-#define IOCTL_EMB_AD03		0x0A8
-#define IOCTL_EMB_AD02		0x0AC
-#define IOCTL_EMB_AD01		0x0B0
-#define IOCTL_EMB_AD00		0x0B4
-#define IOCTL_PATA_CE1		0x0B8
-#define IOCTL_PATA_CE2		0x0BC
-#define IOCTL_PATA_ISOLATE	0x0C0
-#define IOCTL_PATA_IOR		0x0C4
-#define IOCTL_PATA_IOW		0x0C8
-#define IOCTL_PATA_IOCHRDY	0x0CC
-#define IOCTL_PATA_INTRQ	0x0D0
-#define IOCTL_PATA_DRQ		0x0D4
-#define IOCTL_PATA_DACK		0x0D8
-#define IOCTL_NFC_WP		0x0DC
-#define IOCTL_NFC_RB		0x0E0
-#define IOCTL_NFC_ALE		0x0E4
-#define IOCTL_NFC_CLE		0x0E8
-#define IOCTL_NFC_WE		0x0EC
-#define IOCTL_NFC_RE		0x0F0
-#define IOCTL_PCI_AD31		0x0F4
-#define IOCTL_PCI_AD30		0x0F8
-#define IOCTL_PCI_AD29		0x0FC
-#define IOCTL_PCI_AD28		0x100
-#define IOCTL_PCI_AD27		0x104
-#define IOCTL_PCI_AD26		0x108
-#define IOCTL_PCI_AD25		0x10C
-#define IOCTL_PCI_AD24		0x110
-#define IOCTL_PCI_AD23		0x114
-#define IOCTL_PCI_AD22		0x118
-#define IOCTL_PCI_AD21		0x11C
-#define IOCTL_PCI_AD20		0x120
-#define IOCTL_PCI_AD19		0x124
-#define IOCTL_PCI_AD18		0x128
-#define IOCTL_PCI_AD17		0x12C
-#define IOCTL_PCI_AD16		0x130
-#define IOCTL_PCI_AD15		0x134
-#define IOCTL_PCI_AD14		0x138
-#define IOCTL_PCI_AD13		0x13C
-#define IOCTL_PCI_AD12		0x140
-#define IOCTL_PCI_AD11		0x144
-#define IOCTL_PCI_AD10		0x148
-#define IOCTL_PCI_AD09		0x14C
-#define IOCTL_PCI_AD08		0x150
-#define IOCTL_PCI_AD07		0x154
-#define IOCTL_PCI_AD06		0x158
-#define IOCTL_PCI_AD05		0x15C
-#define IOCTL_PCI_AD04		0x160
-#define IOCTL_PCI_AD03		0x164
-#define IOCTL_PCI_AD02		0x168
-#define IOCTL_PCI_AD01		0x16C
-#define IOCTL_PCI_AD00		0x170
-#define IOCTL_PCI_CBE0		0x174
-#define IOCTL_PCI_CBE1		0x178
-#define IOCTL_PCI_CBE2		0x17C
-#define IOCTL_PCI_CBE3		0x180
-#define IOCTL_PCI_GNT2		0x184
-#define IOCTL_PCI_REQ2		0x188
-#define IOCTL_PCI_GNT1		0x18C
-#define IOCTL_PCI_REQ1		0x190
-#define IOCTL_PCI_GNT0		0x194
-#define IOCTL_PCI_REQ0		0x198
-#define IOCTL_PCI_INTA		0x19C
-#define IOCTL_PCI_CLK		0x1A0
-#define IOCTL_PCI_RST_OUT	0x1A4
-#define IOCTL_PCI_FRAME		0x1A8
-#define IOCTL_PCI_IDSEL		0x1AC
-#define IOCTL_PCI_DEVSEL	0x1B0
-#define IOCTL_PCI_IRDY		0x1B4
-#define IOCTL_PCI_TRDY		0x1B8
-#define IOCTL_PCI_STOP		0x1BC
-#define IOCTL_PCI_PAR		0x1C0
-#define IOCTL_PCI_PERR		0x1C4
-#define IOCTL_PCI_SERR		0x1C8
-#define IOCTL_SPDIF_TXCLK	0x1CC
-#define IOCTL_SPDIF_TX		0x1D0
-#define IOCTL_SPDIF_RX		0x1D4
-#define IOCTL_I2C0_SCL		0x1D8
-#define IOCTL_I2C0_SDA		0x1DC
-#define IOCTL_I2C1_SCL		0x1E0
-#define IOCTL_I2C1_SDA		0x1E4
-#define IOCTL_I2C2_SCL		0x1E8
-#define IOCTL_I2C2_SDA		0x1EC
-#define IOCTL_IRQ0		0x1F0
-#define IOCTL_IRQ1		0x1F4
-#define IOCTL_CAN1_TX		0x1F8
-#define IOCTL_CAN2_TX		0x1FC
-#define IOCTL_J1850_TX		0x200
-#define IOCTL_J1850_RX		0x204
-#define IOCTL_PSC_MCLK_IN	0x208
-#define IOCTL_PSC0_0		0x20C
-#define IOCTL_PSC0_1		0x210
-#define IOCTL_PSC0_2		0x214
-#define IOCTL_PSC0_3		0x218
-#define IOCTL_PSC0_4		0x21C
-#define IOCTL_PSC1_0		0x220
-#define IOCTL_PSC1_1		0x224
-#define IOCTL_PSC1_2		0x228
-#define IOCTL_PSC1_3		0x22C
-#define IOCTL_PSC1_4		0x230
-#define IOCTL_PSC2_0		0x234
-#define IOCTL_PSC2_1		0x238
-#define IOCTL_PSC2_2		0x23C
-#define IOCTL_PSC2_3		0x240
-#define IOCTL_PSC2_4		0x244
-#define IOCTL_PSC3_0		0x248
-#define IOCTL_PSC3_1		0x24C
-#define IOCTL_PSC3_2		0x250
-#define IOCTL_PSC3_3		0x254
-#define IOCTL_PSC3_4		0x258
-#define IOCTL_PSC4_0		0x25C
-#define IOCTL_PSC4_1		0x260
-#define IOCTL_PSC4_2		0x264
-#define IOCTL_PSC4_3		0x268
-#define IOCTL_PSC4_4		0x26C
-#define IOCTL_PSC5_0		0x270
-#define IOCTL_PSC5_1		0x274
-#define IOCTL_PSC5_2		0x278
-#define IOCTL_PSC5_3		0x27C
-#define IOCTL_PSC5_4		0x280
-#define IOCTL_PSC6_0		0x284
-#define IOCTL_PSC6_1		0x288
-#define IOCTL_PSC6_2		0x28C
-#define IOCTL_PSC6_3		0x290
-#define IOCTL_PSC6_4		0x294
-#define IOCTL_PSC7_0		0x298
-#define IOCTL_PSC7_1		0x29C
-#define IOCTL_PSC7_2		0x2A0
-#define IOCTL_PSC7_3		0x2A4
-#define IOCTL_PSC7_4		0x2A8
-#define IOCTL_PSC8_0		0x2AC
-#define IOCTL_PSC8_1		0x2B0
-#define IOCTL_PSC8_2		0x2B4
-#define IOCTL_PSC8_3		0x2B8
-#define IOCTL_PSC8_4		0x2BC
-#define IOCTL_PSC9_0		0x2C0
-#define IOCTL_PSC9_1		0x2C4
-#define IOCTL_PSC9_2		0x2C8
-#define IOCTL_PSC9_3		0x2CC
-#define IOCTL_PSC9_4		0x2D0
-#define IOCTL_PSC10_0		0x2D4
-#define IOCTL_PSC10_1		0x2D8
-#define IOCTL_PSC10_2		0x2DC
-#define IOCTL_PSC10_3		0x2E0
-#define IOCTL_PSC10_4		0x2E4
-#define IOCTL_PSC11_0		0x2E8
-#define IOCTL_PSC11_1		0x2EC
-#define IOCTL_PSC11_2		0x2F0
-#define IOCTL_PSC11_3		0x2F4
-#define IOCTL_PSC11_4		0x2F8
-#define IOCTL_HRESET		0x2FC
-#define IOCTL_SRESET		0x300
-#define IOCTL_CKSTP_OUT		0x304
-#define IOCTL_USB2_VBUS_PWR_FAULT	0x308
-#define IOCTL_USB2_VBUS_PWR_SELECT	0x30C
-#define IOCTL_USB2_PHY_DRVV_BUS		0x310
-
-/* Indexes in regs array */
-/* Set for DDR */
-#define IOCTRL_MUX_DDR		0x00000036
-
- /* Register Offset Base */
-#define MPC512X_FEC		(CONFIG_SYS_IMMR + 0x02800)
-#define MPC512X_PATA		(CONFIG_SYS_IMMR + 0x10200)
-
-/* IIM control */
-#define IIM_SET_UA(bk, f)	((bk << 3) | (f >> 5))
-#define IIM_SET_LA(f, bit)	(((f & 0x0000001f) << 3) | bit)
-#define IIM_STAT_BUSY		0x00000080
-#define IIM_STAT_PRGD		0x00000002
-#define IIM_STAT_SNSD		0x00000001
-#define IIM_ERR_WPE		0x00000040
-#define IIM_ERR_OPE		0x00000020
-#define IIM_ERR_RPE		0x00000010
-#define IIM_ERR_WLRE		0x00000008
-#define IIM_ERR_SNSE		0x00000004
-#define IIM_ERR_PARITYE		0x00000002
-#define IIM_PRG_P_SET		0x000000aa
-#define IIM_PRG_P_UNSET		0
-#define IIM_FCTL_PROG_PULSE	0x00000020
-#define IIM_FCTL_PROG		0x00000001
-#define IIM_FCTL_ESNS_N		0x00000008
-#define	IIM_FBAC_FBWP		0x00000080
-#define IIM_FBAC_FBOP		0x00000040
-#define IIM_FBAC_FBRP		0x00000020
-#define	IIM_FBAC_FBESP		0x00000008
-#define IIM_PROTECTION		0x000000e8
-#define IIM_FMAX			31
-
-/* PIWAR - PCI Inbound Windows Attributes Register
- */
-#define PIWAR_IWS_MASK			0x0000003F
-#define PIWAR_IWS_4K			0x0000000B
-#define PIWAR_IWS_8K			0x0000000C
-#define PIWAR_IWS_16K			0x0000000D
-#define PIWAR_IWS_32K			0x0000000E
-#define PIWAR_IWS_64K			0x0000000F
-#define PIWAR_IWS_128K			0x00000010
-#define PIWAR_IWS_256K			0x00000011
-#define PIWAR_IWS_512K			0x00000012
-#define PIWAR_IWS_1M			0x00000013
-#define PIWAR_IWS_2M			0x00000014
-#define PIWAR_IWS_4M			0x00000015
-#define PIWAR_IWS_8M			0x00000016
-#define PIWAR_IWS_16M			0x00000017
-#define PIWAR_IWS_32M			0x00000018
-#define PIWAR_IWS_64M			0x00000019
-#define PIWAR_IWS_128M			0x0000001A
-#define PIWAR_IWS_256M			0x0000001B
-#define PIWAR_IWS_512M			0x0000001C
-#define PIWAR_IWS_1G			0x0000001D
-#define PIWAR_IWS_2G			0x0000001E
-
-#endif	/* __MPC512X_H__ */
-- 
1.6.0.6



More information about the U-Boot mailing list