diff options
| author | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
| commit | f61f1e150c84f5b9347fca79a4bc5f2286c545d2 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/pcmcia.h | |
| parent | ec081c2c190148b374e86a795fb6b1c49caeb549 (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.xz olio-uboot-2014.01-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.zip | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/pcmcia.h')
| -rw-r--r-- | include/pcmcia.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/include/pcmcia.h b/include/pcmcia.h index 7305805e4..b60323d3c 100644 --- a/include/pcmcia.h +++ b/include/pcmcia.h @@ -138,8 +138,8 @@ typedef struct { * Common Memory Space */ -#define CFG_PCMCIA_PBR0 0xFE100000 -#define CFG_PCMCIA_POR0 ( PCMCIA_BSIZE_2 \ +#define CONFIG_SYS_PCMCIA_PBR0 0xFE100000 +#define CONFIG_SYS_PCMCIA_POR0 ( PCMCIA_BSIZE_2 \ | PCMCIA_PPS_16 \ | PCMCIA_PRS_MEM \ | PCMCIA_SLOT_x \ @@ -153,8 +153,8 @@ typedef struct { * Common Memory Space */ -#define CFG_PCMCIA_PBR1 0xFE100080 -#define CFG_PCMCIA_POR1 ( PCMCIA_BSIZE_8 \ +#define CONFIG_SYS_PCMCIA_PBR1 0xFE100080 +#define CONFIG_SYS_PCMCIA_POR1 ( PCMCIA_BSIZE_8 \ | PCMCIA_PPS_8 \ | PCMCIA_PRS_MEM \ | PCMCIA_SLOT_x \ @@ -168,8 +168,8 @@ typedef struct { * Common Memory Space */ -#define CFG_PCMCIA_PBR2 0xFE100100 -#define CFG_PCMCIA_POR2 ( PCMCIA_BSIZE_8 \ +#define CONFIG_SYS_PCMCIA_PBR2 0xFE100100 +#define CONFIG_SYS_PCMCIA_POR2 ( PCMCIA_BSIZE_8 \ | PCMCIA_PPS_8 \ | PCMCIA_PRS_MEM \ | PCMCIA_SLOT_x \ @@ -179,8 +179,8 @@ typedef struct { /* Window 3: * not used */ -#define CFG_PCMCIA_PBR3 0 -#define CFG_PCMCIA_POR3 0 +#define CONFIG_SYS_PCMCIA_PBR3 0 +#define CONFIG_SYS_PCMCIA_POR3 0 /* Window 4: * Base: 0xFE100C00 CS1 @@ -189,8 +189,8 @@ typedef struct { * Common Memory Space */ -#define CFG_PCMCIA_PBR4 0xFE100C00 -#define CFG_PCMCIA_POR4 ( PCMCIA_BSIZE_2 \ +#define CONFIG_SYS_PCMCIA_PBR4 0xFE100C00 +#define CONFIG_SYS_PCMCIA_POR4 ( PCMCIA_BSIZE_2 \ | PCMCIA_PPS_16 \ | PCMCIA_PRS_MEM \ | PCMCIA_SLOT_x \ @@ -204,8 +204,8 @@ typedef struct { * Common Memory Space */ -#define CFG_PCMCIA_PBR5 0xFE100C80 -#define CFG_PCMCIA_POR5 ( PCMCIA_BSIZE_8 \ +#define CONFIG_SYS_PCMCIA_PBR5 0xFE100C80 +#define CONFIG_SYS_PCMCIA_POR5 ( PCMCIA_BSIZE_8 \ | PCMCIA_PPS_8 \ | PCMCIA_PRS_MEM \ | PCMCIA_SLOT_x \ @@ -219,8 +219,8 @@ typedef struct { * Common Memory Space */ -#define CFG_PCMCIA_PBR6 0xFE100D00 -#define CFG_PCMCIA_POR6 ( PCMCIA_BSIZE_8 \ +#define CONFIG_SYS_PCMCIA_PBR6 0xFE100D00 +#define CONFIG_SYS_PCMCIA_POR6 ( PCMCIA_BSIZE_8 \ | PCMCIA_PPS_8 \ | PCMCIA_PRS_MEM \ | PCMCIA_SLOT_x \ @@ -230,8 +230,8 @@ typedef struct { /* Window 7: * not used */ -#define CFG_PCMCIA_PBR7 0 -#define CFG_PCMCIA_POR7 0 +#define CONFIG_SYS_PCMCIA_PBR7 0 +#define CONFIG_SYS_PCMCIA_POR7 0 /**********************************************************************/ |