summaryrefslogtreecommitdiffstats
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-03-21 22:45:36 +0100
committerWolfgang Denk <wd@denx.de>2010-03-21 22:45:36 +0100
commitb46b353b901a45ebe860f8bf874ca99f018cd410 (patch)
treee2d42c0f36b9d7b67c1a17fe97f4734552370a6b /cpu
parent3c950e2ebfde083084cc926b020e3a22a536bf85 (diff)
parentdaa989b47297c9f73426783599c286ef3a1f3f49 (diff)
downloadu-boot-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.gz
u-boot-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.xz
u-boot-b46b353b901a45ebe860f8bf874ca99f018cd410.zip
Merge remote branch 'origin/master' into next
Diffstat (limited to 'cpu')
-rw-r--r--[-rwxr-xr-x]cpu/arm926ejs/spear/Makefile0
-rw-r--r--[-rwxr-xr-x]cpu/arm926ejs/spear/reset.c0
-rw-r--r--[-rwxr-xr-x]cpu/arm926ejs/spear/timer.c0
-rw-r--r--[-rwxr-xr-x]cpu/arm926ejs/versatile/timer.c0
-rw-r--r--cpu/mpc512x/diu.c4
5 files changed, 2 insertions, 2 deletions
diff --git a/cpu/arm926ejs/spear/Makefile b/cpu/arm926ejs/spear/Makefile
index bf8dfa8c3c..bf8dfa8c3c 100755..100644
--- a/cpu/arm926ejs/spear/Makefile
+++ b/cpu/arm926ejs/spear/Makefile
diff --git a/cpu/arm926ejs/spear/reset.c b/cpu/arm926ejs/spear/reset.c
index 73ad86da30..73ad86da30 100755..100644
--- a/cpu/arm926ejs/spear/reset.c
+++ b/cpu/arm926ejs/spear/reset.c
diff --git a/cpu/arm926ejs/spear/timer.c b/cpu/arm926ejs/spear/timer.c
index 06858b4a13..06858b4a13 100755..100644
--- a/cpu/arm926ejs/spear/timer.c
+++ b/cpu/arm926ejs/spear/timer.c
diff --git a/cpu/arm926ejs/versatile/timer.c b/cpu/arm926ejs/versatile/timer.c
index 563db36548..563db36548 100755..100644
--- a/cpu/arm926ejs/versatile/timer.c
+++ b/cpu/arm926ejs/versatile/timer.c
diff --git a/cpu/mpc512x/diu.c b/cpu/mpc512x/diu.c
index a24f39510e..ca459a101e 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);