diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /include/pcmcia.h | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
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 /**********************************************************************/ |