projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next'
[platform/kernel/u-boot.git]
/
include
/
pcmcia.h
diff --git
a/include/pcmcia.h
b/include/pcmcia.h
index
43d4510
..
ca0bf22
100644
(file)
--- a/
include/pcmcia.h
+++ b/
include/pcmcia.h
@@
-31,8
+31,8
@@
* Allow configuration to select PCMCIA slot,
* or try to generate a useful default
*/
* Allow configuration to select PCMCIA slot,
* or try to generate a useful default
*/
-#if
( CONFIG_COMMANDS & CF
G_CMD_PCMCIA) || \
- (
(CONFIG_COMMANDS & CF
G_CMD_IDE) && \
+#if
defined(CONFI
G_CMD_PCMCIA) || \
+ (
defined(CONFI
G_CMD_IDE) && \
(defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) ) )
#if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B)
(defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) ) )
#if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B)
@@
-138,8
+138,8
@@
typedef struct {
* Common Memory Space
*/
* Common Memory Space
*/
-#define C
FG_PCMCIA_PBR0
0xFE100000
-#define C
FG_PCMCIA_POR0
( PCMCIA_BSIZE_2 \
+#define C
ONFIG_SYS_PCMCIA_PBR0
0xFE100000
+#define C
ONFIG_SYS_PCMCIA_POR0
( PCMCIA_BSIZE_2 \
| PCMCIA_PPS_16 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
| PCMCIA_PPS_16 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
@@
-153,8
+153,8
@@
typedef struct {
* Common Memory Space
*/
* Common Memory Space
*/
-#define C
FG_PCMCIA_PBR1
0xFE100080
-#define C
FG_PCMCIA_POR1
( PCMCIA_BSIZE_8 \
+#define C
ONFIG_SYS_PCMCIA_PBR1
0xFE100080
+#define C
ONFIG_SYS_PCMCIA_POR1
( PCMCIA_BSIZE_8 \
| PCMCIA_PPS_8 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
| PCMCIA_PPS_8 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
@@
-168,8
+168,8
@@
typedef struct {
* Common Memory Space
*/
* Common Memory Space
*/
-#define C
FG_PCMCIA_PBR2
0xFE100100
-#define C
FG_PCMCIA_POR2
( PCMCIA_BSIZE_8 \
+#define C
ONFIG_SYS_PCMCIA_PBR2
0xFE100100
+#define C
ONFIG_SYS_PCMCIA_POR2
( PCMCIA_BSIZE_8 \
| PCMCIA_PPS_8 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
| PCMCIA_PPS_8 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
@@
-179,8
+179,8
@@
typedef struct {
/* Window 3:
* not used
*/
/* Window 3:
* not used
*/
-#define C
FG_PCMCIA_PBR3
0
-#define C
FG_PCMCIA_POR3
0
+#define C
ONFIG_SYS_PCMCIA_PBR3
0
+#define C
ONFIG_SYS_PCMCIA_POR3
0
/* Window 4:
* Base: 0xFE100C00 CS1
/* Window 4:
* Base: 0xFE100C00 CS1
@@
-189,8
+189,8
@@
typedef struct {
* Common Memory Space
*/
* Common Memory Space
*/
-#define C
FG_PCMCIA_PBR4
0xFE100C00
-#define C
FG_PCMCIA_POR4
( PCMCIA_BSIZE_2 \
+#define C
ONFIG_SYS_PCMCIA_PBR4
0xFE100C00
+#define C
ONFIG_SYS_PCMCIA_POR4
( PCMCIA_BSIZE_2 \
| PCMCIA_PPS_16 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
| PCMCIA_PPS_16 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
@@
-204,8
+204,8
@@
typedef struct {
* Common Memory Space
*/
* Common Memory Space
*/
-#define C
FG_PCMCIA_PBR5
0xFE100C80
-#define C
FG_PCMCIA_POR5
( PCMCIA_BSIZE_8 \
+#define C
ONFIG_SYS_PCMCIA_PBR5
0xFE100C80
+#define C
ONFIG_SYS_PCMCIA_POR5
( PCMCIA_BSIZE_8 \
| PCMCIA_PPS_8 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
| PCMCIA_PPS_8 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
@@
-219,8
+219,8
@@
typedef struct {
* Common Memory Space
*/
* Common Memory Space
*/
-#define C
FG_PCMCIA_PBR6
0xFE100D00
-#define C
FG_PCMCIA_POR6
( PCMCIA_BSIZE_8 \
+#define C
ONFIG_SYS_PCMCIA_PBR6
0xFE100D00
+#define C
ONFIG_SYS_PCMCIA_POR6
( PCMCIA_BSIZE_8 \
| PCMCIA_PPS_8 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
| PCMCIA_PPS_8 \
| PCMCIA_PRS_MEM \
| PCMCIA_SLOT_x \
@@
-230,8
+230,8
@@
typedef struct {
/* Window 7:
* not used
*/
/* Window 7:
* not used
*/
-#define C
FG_PCMCIA_PBR7
0
-#define C
FG_PCMCIA_POR7
0
+#define C
ONFIG_SYS_PCMCIA_PBR7
0
+#define C
ONFIG_SYS_PCMCIA_POR7
0
/**********************************************************************/
/**********************************************************************/
@@
-306,6
+306,15
@@
typedef struct {
#define CISTPL_IDE_HAS_INDEX 0x20
#define CISTPL_IDE_IOIS16 0x40
#define CISTPL_IDE_HAS_INDEX 0x20
#define CISTPL_IDE_IOIS16 0x40
-#endif /* CFG_CMD_PCMCIA || CFG_CMD_IDE && (CONFIG_IDE_8xx_PCCARD || CONFIG_IDE_8xx_DIRECT) */
+#endif
+
+#ifdef CONFIG_8xx
+extern u_int *pcmcia_pgcrx[];
+#define PCMCIA_PGCRX(slot) (*pcmcia_pgcrx[slot])
+#endif
+
+#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
+extern int check_ide_device(int slot);
+#endif
#endif /* _PCMCIA_H */
#endif /* _PCMCIA_H */