summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-26 00:07:26 +0200
committerWolfgang Denk <wd@denx.de>2008-04-26 00:07:26 +0200
commit57533b881ed55eb676c56f458c1a1e84b79cd4ee (patch)
tree7cae853acd2ca5a5838d43451683633c94d57613 /cpu
parentfe06d43b504af9ebc6c9bfe511853de6e42f257e (diff)
parentb2115757403beef0ac6bc2c6c3b24f31256a75d2 (diff)
downloadu-boot-imx-57533b881ed55eb676c56f458c1a1e84b79cd4ee.zip
u-boot-imx-57533b881ed55eb676c56f458c1a1e84b79cd4ee.tar.gz
u-boot-imx-57533b881ed55eb676c56f458c1a1e84b79cd4ee.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc83xx/fdt.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/cpu/mpc83xx/fdt.c b/cpu/mpc83xx/fdt.c
index b39f678..02c4d05 100644
--- a/cpu/mpc83xx/fdt.c
+++ b/cpu/mpc83xx/fdt.c
@@ -63,13 +63,5 @@ void ft_cpu_setup(void *blob, bd_t *bd)
"clock-frequency", bd->bi_busfreq, 1);
#endif
-#ifdef CONFIG_CPM2
- do_fixup_by_compat_u32(blob, "fsl,cpm2-scc-uart",
- "current-speed", bd->bi_baudrate, 1);
-
- do_fixup_by_compat_u32(blob, "fsl,cpm2-brg",
- "clock-frequency", bd->bi_brgfreq, 1);
-#endif
-
fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
}