git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AMD IOMMU: add stats counter for domain tlb flushes
[safe/jmp/linux-2.6]
/
arch
/
powerpc
/
boot
/
cuboot-rainier.c
diff --git
a/arch/powerpc/boot/cuboot-rainier.c
b/arch/powerpc/boot/cuboot-rainier.c
index
6be15ca
..
0a3fdde
100644
(file)
--- a/
arch/powerpc/boot/cuboot-rainier.c
+++ b/
arch/powerpc/boot/cuboot-rainier.c
@@
-42,7
+42,8
@@
static void rainier_fixups(void)
ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
ibm4xx_denali_fixup_memsize();
ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
ibm4xx_denali_fixup_memsize();
- dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
+ dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
+ dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
}
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
}
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
@@
-51,6
+52,6
@@
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
CUBOOT_INIT();
platform_ops.fixups = rainier_fixups;
platform_ops.exit = ibm44x_dbcr_reset;
CUBOOT_INIT();
platform_ops.fixups = rainier_fixups;
platform_ops.exit = ibm44x_dbcr_reset;
- f
t_init(_dtb_start, 0, 32
);
+ f
dt_init(_dtb_start
);
serial_console_init();
}
serial_console_init();
}