projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPEAr : Adding basic SPEAr architecture support.
[oweals/u-boot.git]
/
common
/
cmd_pcmcia.c
diff --git
a/common/cmd_pcmcia.c
b/common/cmd_pcmcia.c
index b1a594f18be47dd234ba42aa1b7c784d98c3bd90..e576b0c5979ced71173a689be88cbe41883270d1 100644
(file)
--- a/
common/cmd_pcmcia.c
+++ b/
common/cmd_pcmcia.c
@@
-61,7
+61,7
@@
/* -------------------------------------------------------------------- */
/* -------------------------------------------------------------------- */
-#if
(CONFIG_COMMANDS & CF
G_CMD_PCMCIA)
+#if
defined(CONFI
G_CMD_PCMCIA)
extern int pcmcia_on (void);
extern int pcmcia_off (void);
extern int pcmcia_on (void);
extern int pcmcia_off (void);
@@
-88,18
+88,18
@@
int do_pinit (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
pinit, 2, 0, do_pinit,
U_BOOT_CMD(
pinit, 2, 0, do_pinit,
- "
pinit - PCMCIA sub-system\n
",
+ "
PCMCIA sub-system
",
"on - power on PCMCIA socket\n"
"on - power on PCMCIA socket\n"
-
"pinit off - power off PCMCIA socket\n
"
-
);
+
"pinit off - power off PCMCIA socket
"
+);
-#endif
/* CONFIG_COMMANDS & CFG_CMD_PCMCIA */
+#endif
/* -------------------------------------------------------------------- */
#undef CHECK_IDE_DEVICE
/* -------------------------------------------------------------------- */
#undef CHECK_IDE_DEVICE
-#if
(CONFIG_COMMANDS & CF
G_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
+#if
defined(CONFI
G_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#define CHECK_IDE_DEVICE
#endif
#define CHECK_IDE_DEVICE
#endif
@@
-278,8
+278,8
@@
int check_ide_device (int slot)
int found = 0;
int i;
int found = 0;
int i;
- addr = (volatile uchar *)(C
FG
_PCMCIA_MEM_ADDR +
- C
FG
_PCMCIA_MEM_SIZE * (slot * 4));
+ addr = (volatile uchar *)(C
ONFIG_SYS
_PCMCIA_MEM_ADDR +
+ C
ONFIG_SYS
_PCMCIA_MEM_SIZE * (slot * 4));
debug ("PCMCIA MEM: %08lX\n", (ulong)addr);
start = p = (volatile uchar *) addr;
debug ("PCMCIA MEM: %08lX\n", (ulong)addr);
start = p = (volatile uchar *) addr;