Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / board / Marvell / db64460 / mpsc.c

diff --git a/board/Marvell/db64460/mpsc.c b/board/Marvell/db64460/mpsc.c
index b783aff8d1c585bebc8f7b1afc178879ee70250a..45e13b8fe27f495f97e34fa960f4010923c08765 100644 (file)
--- a/board/Marvell/db64460/mpsc.c
+++ b/board/Marvell/db64460/mpsc.c
@@ -425,8 +425,8 @@ void mpsc_sdma_init (void)
                         (MV64460_SDMA_WIN_ACCESS_FULL <<
                          (MV64460_CUNIT_BASE_ADDR_WIN_0_BIT * 2)));
 
-/* Setup MPSC internal address space base address      */
-       GT_REG_WRITE (CUNIT_INTERNAL_SPACE_BASE_ADDR_REG, CFG_GT_REGS);
+/* Setup MPSC internal address space base address      */
+       GT_REG_WRITE (CUNIT_INTERNAL_SPACE_BASE_ADDR_REG, CONFIG_SYS_GT_REGS);
 
 /* no high address remap*/
        GT_REG_WRITE (CUNIT_HIGH_ADDR_REMAP_REG0, 0x00);
@@ -516,9 +516,9 @@ int galbrg_set_baudrate (int channel, int rate)
 
 #ifdef ZUMA_NTL
        /* from tclk */
-       clock = (CFG_TCLK / (16 * rate)) - 1;
+       clock = (CONFIG_SYS_TCLK / (16 * rate)) - 1;
 #else
-       clock = (CFG_TCLK / (16 * rate)) - 1;
+       clock = (CONFIG_SYS_TCLK / (16 * rate)) - 1;
 #endif
 
        galbrg_set_CDV (channel, clock);        /* set timer Reg. for BRG */
@@ -966,7 +966,7 @@ static int galmpsc_set_snoop (int mpsc, int value)
 *       None.
 *
 * RETURN:
-*       True for success, false otherwise.
+*       true for success, false otherwise.
 *
 *******************************************************************************/