projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc86xx
[oweals/u-boot.git]
/
cpu
/
mpc86xx
/
fdt.c
diff --git
a/cpu/mpc86xx/fdt.c
b/cpu/mpc86xx/fdt.c
index 379306ea4f302ff51d5371a73e531b9bcbb48d94..1fef94f5db54190b4783a82a61e3644c52fbefbb 100644
(file)
--- a/
cpu/mpc86xx/fdt.c
+++ b/
cpu/mpc86xx/fdt.c
@@
-25,11
+25,11
@@
void ft_cpu_setup(void *blob, bd_t *bd)
#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) \
|| defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3)
#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) \
|| defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3)
- fdt_fixup_ethernet(blob
, bd
);
+ fdt_fixup_ethernet(blob);
#endif
#endif
-#ifdef C
FG
_NS16550
+#ifdef C
ONFIG_SYS
_NS16550
do_fixup_by_compat_u32(blob, "ns16550",
do_fixup_by_compat_u32(blob, "ns16550",
- "clock-frequency",
bd->bi_busfreq
, 1);
+ "clock-frequency",
CONFIG_SYS_NS16550_CLK
, 1);
#endif
}
#endif
}