summaryrefslogtreecommitdiff
path: root/common/cmd_bootm.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2005-07-23 10:37:35 -0500
committerJon Loeliger <jdl@freescale.com>2005-07-23 10:37:35 -0500
commit9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5 (patch)
treece06516d3935e9f3e2dac253a78742c7d3c211df /common/cmd_bootm.c
parent2d5df63e4f596fe439405048fd85157cdff079dc (diff)
downloadu-boot-imx-9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5.zip
u-boot-imx-9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5.tar.gz
u-boot-imx-9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5.tar.bz2
* Patch by Jon Loeliger, Kumar Gala 2005-02-08
- Convert the CPM2 based functionality to use new CONFIG_CPM2 option rather than a myriad of CONFIG_MPC8560-like variants. Applies to MPC85xx and MPC8260 boards, includes stxgp3 and sbc8560. Eliminates the CONFIG_MPC8560 option entirely. Distributes the new CONFIG_CPM2 option to each 8260 board.
Diffstat (limited to 'common/cmd_bootm.c')
-rw-r--r--common/cmd_bootm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index a90735f..c200fd8 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -580,12 +580,12 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
kbd->bi_flbfreq /= 1000000L;
kbd->bi_vcofreq /= 1000000L;
#endif
-#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
kbd->bi_cpmfreq /= 1000000L;
kbd->bi_brgfreq /= 1000000L;
kbd->bi_sccfreq /= 1000000L;
kbd->bi_vco /= 1000000L;
-#endif /* CONFIG_8260 */
+#endif
#if defined(CONFIG_MPC5xxx)
kbd->bi_ipbfreq /= 1000000L;
kbd->bi_pcifreq /= 1000000L;