]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
ColdFire: Fix compile warning messages
authorTsiChung Liew <tsicliew@gmail.com>
Wed, 22 Jul 2009 18:42:45 +0000 (18:42 +0000)
committerTsiChung Liew <Tsi-Chung.Liew@freescale.com>
Wed, 26 Aug 2009 08:44:31 +0000 (03:44 -0500)
Change %08lX to %08X in board.c. Remove unused variable
'oscillator' in mcf5227x/cpu_init.c and 'scm2' in
mcf532x/cpu_init.c. Provide argument type cast in
drivers/dma/MCD_dmaApi.c.

Signed-off-by: TsiChung Liew <tsicliew@gmail.com>
cpu/mcf5227x/cpu_init.c
cpu/mcf532x/cpu_init.c
drivers/dma/MCD_dmaApi.c

index d8bcf375c115e938f0f4633d8fa6a66a5b0762a6..e160ee1aff57601f1b56c187d8f43714c3690e09 100644 (file)
@@ -117,7 +117,6 @@ int cpu_init_r(void)
 #ifdef CONFIG_MCFRTC
        volatile rtc_t *rtc = (volatile rtc_t *)(CONFIG_SYS_MCFRTC_BASE);
        volatile rtcex_t *rtcex = (volatile rtcex_t *)&rtc->extended;
-       u32 oscillator = CONFIG_SYS_RTC_OSCILLATOR;
 
        rtcex->gocu = (CONFIG_SYS_RTC_OSCILLATOR >> 16) & 0xFFFF;
        rtcex->gocl = CONFIG_SYS_RTC_OSCILLATOR & 0xFFFF;
index 687c7e42ec4135873939a4e3ff8fd027a4f6c71f..4f1695cef861327b678fbda9c2b5618eeaf46d01 100644 (file)
@@ -39,7 +39,6 @@
 void cpu_init_f(void)
 {
        volatile scm1_t *scm1 = (scm1_t *) MMAP_SCM1;
-       volatile scm2_t *scm2 = (scm2_t *) MMAP_SCM2;
        volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
        volatile fbcs_t *fbcs = (fbcs_t *) MMAP_FBCS;
 
index 5c95651d5805fc562cb665e53ae504bc1dcf1a1f..0dd38168f337b58fa01a4a734c8e5cde263b4b8a 100644 (file)
@@ -486,7 +486,8 @@ int MCD_startDma(int channel, s8 * srcAddr, s16 srcIncr, s8 * destAddr,
                    MCD_modelTaskTable[TASK_FECTX].TDTstart;
                MCD_taskTable[channel].TDTend =
                    MCD_modelTaskTable[TASK_FECTX].TDTend;
-               MCD_startDmaENetXmit(srcAddr, srcAddr, destAddr, MCD_taskTable,
+               MCD_startDmaENetXmit((char *)srcAddr, (char *)srcAddr,
+                                    (char *)destAddr, MCD_taskTable,
                                     channel);
        } else if (flags & MCD_FECRX_DMA) {
                /* TDTStart and TDTEnd */
@@ -494,7 +495,8 @@ int MCD_startDma(int channel, s8 * srcAddr, s16 srcIncr, s8 * destAddr,
                    MCD_modelTaskTable[TASK_FECRX].TDTstart;
                MCD_taskTable[channel].TDTend =
                    MCD_modelTaskTable[TASK_FECRX].TDTend;
-               MCD_startDmaENetRcv(srcAddr, srcAddr, destAddr, MCD_taskTable,
+               MCD_startDmaENetRcv((char *)srcAddr, (char *)srcAddr,
+                                   (char *)destAddr, MCD_taskTable,
                                    channel);
        } else if (flags & MCD_SINGLE_DMA) {
                /* this buffer descriptor is used for storing off initial
@@ -532,8 +534,9 @@ int MCD_startDma(int channel, s8 * srcAddr, s16 srcIncr, s8 * destAddr,
                            MCD_modelTaskTable[TASK_SINGLENOEU].TDTstart;
                        MCD_taskTable[channel].TDTend =
                            MCD_modelTaskTable[TASK_SINGLENOEU].TDTend;
-                       MCD_startDmaSingleNoEu(srcAddr, srcIncr, destAddr,
-                                              destIncr, dmaSize, xferSizeIncr,
+                       MCD_startDmaSingleNoEu((char *)srcAddr, srcIncr,
+                                              (char *)destAddr, destIncr,
+                                              (int)dmaSize, xferSizeIncr,
                                               flags, (int *)
                                               &(MCD_relocBuffDesc[channel]),
                                               cSave, MCD_taskTable, channel);
@@ -543,8 +546,9 @@ int MCD_startDma(int channel, s8 * srcAddr, s16 srcIncr, s8 * destAddr,
                            MCD_modelTaskTable[TASK_SINGLEEU].TDTstart;
                        MCD_taskTable[channel].TDTend =
                            MCD_modelTaskTable[TASK_SINGLEEU].TDTend;
-                       MCD_startDmaSingleEu(srcAddr, srcIncr, destAddr,
-                                            destIncr, dmaSize, xferSizeIncr,
+                       MCD_startDmaSingleEu((char *)srcAddr, srcIncr,
+                                            (char *)destAddr, destIncr,
+                                            (int)dmaSize, xferSizeIncr,
                                             flags, (int *)
                                             &(MCD_relocBuffDesc[channel]),
                                             cSave, MCD_taskTable, channel);