diff options
author | Minkyu Kang <mk7.kang@samsung.com> | 2010-03-23 19:09:13 +0900 |
---|---|---|
committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-03-23 19:09:13 +0900 |
commit | 45e565337a90bbca0c1bb712b5e008b7c0b18bd5 (patch) | |
tree | 8bcaee16cda9d8f90f5b596566ad2122c6d8d86b /cpu/mpc512x | |
parent | 995a4b1d83a08223c82c1e15778b02e85e5bba51 (diff) | |
parent | d650da2dd4af99967aabc43cccbd8f160eb4cea6 (diff) | |
download | u-boot-imx-45e565337a90bbca0c1bb712b5e008b7c0b18bd5.zip u-boot-imx-45e565337a90bbca0c1bb712b5e008b7c0b18bd5.tar.gz u-boot-imx-45e565337a90bbca0c1bb712b5e008b7c0b18bd5.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm920t/ep93xx/timer.c
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'cpu/mpc512x')
-rw-r--r-- | cpu/mpc512x/diu.c | 4 |
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); |