summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2010-03-16 17:10:08 +0100
committerWolfgang Denk <wd@denx.de>2010-03-21 22:22:53 +0100
commit51c2ac9bb574c1420b993615268392b0c1f829f6 (patch)
treebe3431c235bda7db79256dc0c946efeb1cde6c1f /cpu
parenta74908161a1b37d780d3a826a86807bbc50a3857 (diff)
downloadu-boot-imx-51c2ac9bb574c1420b993615268392b0c1f829f6.zip
u-boot-imx-51c2ac9bb574c1420b993615268392b0c1f829f6.tar.gz
u-boot-imx-51c2ac9bb574c1420b993615268392b0c1f829f6.tar.bz2
mpc5121: cpu/mpc512x/diu.c: fix warnings
Fix warnings while compiling with CONFIG_VIDEO enabled: diu.c: In function 'video_hw_init': diu.c:158: warning: 'return' with no value, in function returning non-void diu.c:162: warning: format '%ld' expects type 'long int', but argument 6 has type 'int' diu.c:162: warning: format '%ld' expects type 'long int', but argument 7 has type 'int' Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc512x/diu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc512x/diu.c b/cpu/mpc512x/diu.c
index a24f395..ca459a1 100644
--- a/cpu/mpc512x/diu.c
+++ b/cpu/mpc512x/diu.c
@@ -145,10 +145,10 @@ void *video_hw_init(void)
struct fb_info *info;
if (mpc5121_diu_init() < 0)
- return;
+ return NULL;
/* fill in Graphic device struct */
- sprintf(pGD->modeIdent, "%dx%dx%d %ldkHz %ldHz",
+ sprintf(pGD->modeIdent, "%dx%dx%d %dkHz %dHz",
xres, yres, 32, 64, 60);
pGD->frameAdrs = (unsigned int)fsl_fb_open(&info);