diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-12 03:47:20 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-19 23:49:31 +0300 |
| commit | 7e477755b12261e39b345c33bda4e89075ef9d32 (patch) | |
| tree | 0fdb482e53e0808e5a55bb0e38f701012eafa1ea | |
| parent | a5bee50720cbab7b1c1556639fd465c934f10697 (diff) | |
| download | u-boot-7e477755b12261e39b345c33bda4e89075ef9d32.tar.xz | |
pcmcia: Drop a bunch of unused CONFIG_SYS_PCMCIA_ macros
Last users of the following macros (for n = 0..7) were removed in
commit 5b8e76c35ec312a ("powerpc, 8xx: remove support for 8xx"):
CONFIG_SYS_PCMCIA_PBRn
CONFIG_SYS_PCMCIA_PORn
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
| -rw-r--r-- | include/pcmcia.h | 109 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 16 |
2 files changed, 0 insertions, 125 deletions
diff --git a/include/pcmcia.h b/include/pcmcia.h index 94b54c210d..8df90ee2b7 100644 --- a/include/pcmcia.h +++ b/include/pcmcia.h @@ -60,115 +60,6 @@ typedef struct { ulong or; } pcmcia_win_t; -/* - * Definitions for PCMCIA control registers to operate in IDE mode - * - * All timing related setup (PCMCIA_SHT, PCMCIA_SST, PCMCIA_SL) - * to be done later (depending on CPU clock) - */ - -/* Window 0: - * Base: 0xFE100000 CS1 - * Port Size: 2 Bytes - * Port Size: 16 Bit - * Common Memory Space - */ - -#define CONFIG_SYS_PCMCIA_PBR0 0xFE100000 -#define CONFIG_SYS_PCMCIA_POR0 ( PCMCIA_BSIZE_2 \ - | PCMCIA_PPS_16 \ - | PCMCIA_PRS_MEM \ - | PCMCIA_SLOT_x \ - | PCMCIA_PV \ - ) - -/* Window 1: - * Base: 0xFE100080 CS1 - * Port Size: 8 Bytes - * Port Size: 8 Bit - * Common Memory Space - */ - -#define CONFIG_SYS_PCMCIA_PBR1 0xFE100080 -#define CONFIG_SYS_PCMCIA_POR1 ( PCMCIA_BSIZE_8 \ - | PCMCIA_PPS_8 \ - | PCMCIA_PRS_MEM \ - | PCMCIA_SLOT_x \ - | PCMCIA_PV \ - ) - -/* Window 2: - * Base: 0xFE100100 CS2 - * Port Size: 8 Bytes - * Port Size: 8 Bit - * Common Memory Space - */ - -#define CONFIG_SYS_PCMCIA_PBR2 0xFE100100 -#define CONFIG_SYS_PCMCIA_POR2 ( PCMCIA_BSIZE_8 \ - | PCMCIA_PPS_8 \ - | PCMCIA_PRS_MEM \ - | PCMCIA_SLOT_x \ - | PCMCIA_PV \ - ) - -/* Window 3: - * not used - */ -#define CONFIG_SYS_PCMCIA_PBR3 0 -#define CONFIG_SYS_PCMCIA_POR3 0 - -/* Window 4: - * Base: 0xFE100C00 CS1 - * Port Size: 2 Bytes - * Port Size: 16 Bit - * Common Memory Space - */ - -#define CONFIG_SYS_PCMCIA_PBR4 0xFE100C00 -#define CONFIG_SYS_PCMCIA_POR4 ( PCMCIA_BSIZE_2 \ - | PCMCIA_PPS_16 \ - | PCMCIA_PRS_MEM \ - | PCMCIA_SLOT_x \ - | PCMCIA_PV \ - ) - -/* Window 5: - * Base: 0xFE100C80 CS1 - * Port Size: 8 Bytes - * Port Size: 8 Bit - * Common Memory Space - */ - -#define CONFIG_SYS_PCMCIA_PBR5 0xFE100C80 -#define CONFIG_SYS_PCMCIA_POR5 ( PCMCIA_BSIZE_8 \ - | PCMCIA_PPS_8 \ - | PCMCIA_PRS_MEM \ - | PCMCIA_SLOT_x \ - | PCMCIA_PV \ - ) - -/* Window 6: - * Base: 0xFE100D00 CS2 - * Port Size: 8 Bytes - * Port Size: 8 Bit - * Common Memory Space - */ - -#define CONFIG_SYS_PCMCIA_PBR6 0xFE100D00 -#define CONFIG_SYS_PCMCIA_POR6 ( PCMCIA_BSIZE_8 \ - | PCMCIA_PPS_8 \ - | PCMCIA_PRS_MEM \ - | PCMCIA_SLOT_x \ - | PCMCIA_PV \ - ) - -/* Window 7: - * not used - */ -#define CONFIG_SYS_PCMCIA_PBR7 0 -#define CONFIG_SYS_PCMCIA_POR7 0 - /**********************************************************************/ /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 394243b3d2..88b2143433 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4199,22 +4199,6 @@ CONFIG_SYS_PCMCIA_ATTR_BASE CONFIG_SYS_PCMCIA_IO_BASE CONFIG_SYS_PCMCIA_MEM_ADDR CONFIG_SYS_PCMCIA_MEM_SIZE -CONFIG_SYS_PCMCIA_PBR0 -CONFIG_SYS_PCMCIA_PBR1 -CONFIG_SYS_PCMCIA_PBR2 -CONFIG_SYS_PCMCIA_PBR3 -CONFIG_SYS_PCMCIA_PBR4 -CONFIG_SYS_PCMCIA_PBR5 -CONFIG_SYS_PCMCIA_PBR6 -CONFIG_SYS_PCMCIA_PBR7 -CONFIG_SYS_PCMCIA_POR0 -CONFIG_SYS_PCMCIA_POR1 -CONFIG_SYS_PCMCIA_POR2 -CONFIG_SYS_PCMCIA_POR3 -CONFIG_SYS_PCMCIA_POR4 -CONFIG_SYS_PCMCIA_POR5 -CONFIG_SYS_PCMCIA_POR6 -CONFIG_SYS_PCMCIA_POR7 CONFIG_SYS_PDCNT CONFIG_SYS_PEHLPAR CONFIG_SYS_PEPAR |