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]
/
board
/
sc520_cdp
/
sc520_cdp.c
diff --git
a/board/sc520_cdp/sc520_cdp.c
b/board/sc520_cdp/sc520_cdp.c
index
99debde
..
779f957
100644
(file)
--- a/
board/sc520_cdp/sc520_cdp.c
+++ b/
board/sc520_cdp/sc520_cdp.c
@@
-87,7
+87,7
@@
static void irq_init(void)
write_mmcr_byte(SC520_ICEMAP, SC520_IRQ1); /* Set ICE Debug Serielport INT to IRQ1 */
write_mmcr_byte(SC520_FERRMAP,SC520_IRQ13); /* Set FP error INT to IRQ13 */
write_mmcr_byte(SC520_ICEMAP, SC520_IRQ1); /* Set ICE Debug Serielport INT to IRQ1 */
write_mmcr_byte(SC520_FERRMAP,SC520_IRQ13); /* Set FP error INT to IRQ13 */
- if (C
FG
_USE_SIO_UART) {
+ if (C
ONFIG_SYS
_USE_SIO_UART) {
write_mmcr_byte(SC520_UART1MAP, SC520_IRQ_DISABLED); /* disable internal UART1 INT */
write_mmcr_byte(SC520_UART2MAP, SC520_IRQ_DISABLED); /* disable internal UART2 INT */
write_mmcr_byte(SC520_GP3IMAP, SC520_IRQ3); /* Set GPIRQ3 (ISA IRQ3) to IRQ3 */
write_mmcr_byte(SC520_UART1MAP, SC520_IRQ_DISABLED); /* disable internal UART1 INT */
write_mmcr_byte(SC520_UART2MAP, SC520_IRQ_DISABLED); /* disable internal UART2 INT */
write_mmcr_byte(SC520_GP3IMAP, SC520_IRQ3); /* Set GPIRQ3 (ISA IRQ3) to IRQ3 */
@@
-122,10
+122,10
@@
static void pci_sc520_cdp_fixup_irq(struct pci_controller *hose, pci_dev_t dev)
* when we need one (a board with more pci interrupt pins
* would use a larger table */
static int irq_list[] = {
* when we need one (a board with more pci interrupt pins
* would use a larger table */
static int irq_list[] = {
- C
FG
_FIRST_PCI_IRQ,
- C
FG
_SECOND_PCI_IRQ,
- C
FG
_THIRD_PCI_IRQ,
- C
FG
_FORTH_PCI_IRQ
+ C
ONFIG_SYS
_FIRST_PCI_IRQ,
+ C
ONFIG_SYS
_SECOND_PCI_IRQ,
+ C
ONFIG_SYS
_THIRD_PCI_IRQ,
+ C
ONFIG_SYS
_FORTH_PCI_IRQ
};
static int next_irq_index=0;
};
static int next_irq_index=0;
@@
-279,7
+279,7
@@
static void bus_init(void)
asm ("wbinvd\n"); /* Flush cache, req. after setting the unchached attribute ona PAR */
asm ("wbinvd\n"); /* Flush cache, req. after setting the unchached attribute ona PAR */
- if (C
FG
_USE_SIO_UART) {
+ if (C
ONFIG_SYS
_USE_SIO_UART) {
write_mmcr_byte(SC520_ADDDECCTL, read_mmcr_byte(SC520_ADDDECCTL) | UART2_DIS|UART1_DIS);
setup_ali_sio(1);
} else {
write_mmcr_byte(SC520_ADDDECCTL, read_mmcr_byte(SC520_ADDDECCTL) | UART2_DIS|UART1_DIS);
setup_ali_sio(1);
} else {