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 with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
board
/
esd
/
pf5200
/
pf5200.c
diff --git
a/board/esd/pf5200/pf5200.c
b/board/esd/pf5200/pf5200.c
index
1f30d45
..
48b80bf
100644
(file)
--- a/
board/esd/pf5200/pf5200.c
+++ b/
board/esd/pf5200/pf5200.c
@@
-191,13
+191,12
@@
static struct pci_controller hose;
extern void pci_mpc5xxx_init(struct pci_controller *);
extern void pci_mpc5xxx_init(struct pci_controller *);
-void pci_init_board(void
- ) {
+void pci_init_board(void) {
pci_mpc5xxx_init(&hose);
}
#endif
pci_mpc5xxx_init(&hose);
}
#endif
-#if defined
(CFG_CMD_IDE) && defined
(CONFIG_IDE_RESET)
+#if defined
(CONFIG_CMD_IDE) && defined
(CONFIG_IDE_RESET)
void init_ide_reset(void)
{
void init_ide_reset(void)
{
@@
-218,7
+217,7
@@
void ide_set_reset(int idereset)
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
-#endif
/* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
+#endif
#define MPC5XXX_SIMPLEIO_GPIO_ENABLE (MPC5XXX_GPIO + 0x0004)
#define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C)
#define MPC5XXX_SIMPLEIO_GPIO_ENABLE (MPC5XXX_GPIO + 0x0004)
#define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C)