diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-10-31 16:13:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-10-31 16:13:18 +0100 |
| commit | d793b6bb1e37ccaba702bac088bfc0d0e91ac734 (patch) | |
| tree | 9367f4cf04b7e978ad39ae22453963ab03056c19 /drivers/video/cfb_console.c | |
| parent | 08ea550eef310e9d59d83f3cfd57a902373bf17f (diff) | |
| parent | 229b6dce675c729ee0ea2d7b61fbcda89b23b6b8 (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot-video into next
Diffstat (limited to 'drivers/video/cfb_console.c')
| -rw-r--r-- | drivers/video/cfb_console.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index fbc4df9f69..16d6689f22 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -146,9 +146,11 @@ CONFIG_VIDEO_HW_CURSOR: - Uses the hardware cursor capability of the #ifdef CONFIG_VIDEO_CORALP #define VIDEO_FB_LITTLE_ENDIAN #endif +#ifdef CONFIG_VIDEO_MB862xx_ACCEL #define VIDEO_HW_RECTFILL #define VIDEO_HW_BITBLT #endif +#endif /*****************************************************************************/ /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc */ @@ -319,7 +321,7 @@ void console_cursor (int state); #else #define SWAP16(x) (x) #define SWAP32(x) (x) -#if defined(VIDEO_FB_16BPP_PIXEL_SWAP) +#if defined(VIDEO_FB_16BPP_WORD_SWAP) #define SHORTSWAP32(x) ( ((x) >> 16) | ((x) << 16) ) #else #define SHORTSWAP32(x) (x) |