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
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
drivers
/
pcmcia
/
i82365.c
diff --git
a/drivers/pcmcia/i82365.c
b/drivers/pcmcia/i82365.c
index
1e2431e
..
1bcb3a5
100644
(file)
--- a/
drivers/pcmcia/i82365.c
+++ b/
drivers/pcmcia/i82365.c
@@
-909,8
+909,8
@@
int i82365_init (void)
mem.map = 0;
mem.flags = MAP_ATTRIB | MAP_ACTIVE;
mem.speed = 300;
mem.map = 0;
mem.flags = MAP_ATTRIB | MAP_ACTIVE;
mem.speed = 300;
- mem.sys_start = C
FG
_PCMCIA_MEM_ADDR;
- mem.sys_stop = C
FG_PCMCIA_MEM_ADDR + CFG
_PCMCIA_MEM_SIZE - 1;
+ mem.sys_start = C
ONFIG_SYS
_PCMCIA_MEM_ADDR;
+ mem.sys_stop = C
ONFIG_SYS_PCMCIA_MEM_ADDR + CONFIG_SYS
_PCMCIA_MEM_SIZE - 1;
mem.card_start = 0;
i365_set_mem_map (&socket, &mem);
mem.card_start = 0;
i365_set_mem_map (&socket, &mem);
@@
-918,8
+918,8
@@
int i82365_init (void)
mem.map = 1;
mem.flags = MAP_ACTIVE;
mem.speed = 300;
mem.map = 1;
mem.flags = MAP_ACTIVE;
mem.speed = 300;
- mem.sys_start = C
FG_PCMCIA_MEM_ADDR + CFG
_PCMCIA_MEM_SIZE;
- mem.sys_stop = C
FG_PCMCIA_MEM_ADDR + (2 * CFG
_PCMCIA_MEM_SIZE) - 1;
+ mem.sys_start = C
ONFIG_SYS_PCMCIA_MEM_ADDR + CONFIG_SYS
_PCMCIA_MEM_SIZE;
+ mem.sys_stop = C
ONFIG_SYS_PCMCIA_MEM_ADDR + (2 * CONFIG_SYS
_PCMCIA_MEM_SIZE) - 1;
mem.card_start = 0;
i365_set_mem_map (&socket, &mem);
mem.card_start = 0;
i365_set_mem_map (&socket, &mem);
@@
-988,8
+988,8
@@
static void i82365_dump_regions (pci_dev_t dev)
{
u_int tmp[2];
u_int *mem = (void *) socket.cb_phys;
{
u_int tmp[2];
u_int *mem = (void *) socket.cb_phys;
- u_char *cis = (void *) C
FG
_PCMCIA_MEM_ADDR;
- u_char *ide = (void *) (C
FG_ATA_BASE_ADDR + CFG
_ATA_REG_OFFSET);
+ u_char *cis = (void *) C
ONFIG_SYS
_PCMCIA_MEM_ADDR;
+ u_char *ide = (void *) (C
ONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS
_ATA_REG_OFFSET);
pci_read_config_dword (dev, 0x00, tmp + 0);
pci_read_config_dword (dev, 0x80, tmp + 1);
pci_read_config_dword (dev, 0x00, tmp + 0);
pci_read_config_dword (dev, 0x80, tmp + 1);