eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master' into next

Browse Source
This commit is contained in:
Wolfgang Denk
2010-03-21 22:45:36 +01:00
parent 3c950e2ebf daa989b472
commit b46b353b90
43 changed files with 65 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
cpu/arm926ejs/spear/Makefile Executable file → Normal file
View File

0
cpu/arm926ejs/spear/reset.c Executable file → Normal file
View File

0
cpu/arm926ejs/spear/timer.c Executable file → Normal file
View File

0
cpu/arm926ejs/versatile/timer.c Executable file → Normal file
View File

4
cpu/mpc512x/diu.c
View File

@@ -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);