diff options
| author | wdenk <wdenk> | 2004-08-01 22:48:16 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-08-01 22:48:16 +0000 |
| commit | 281e00a3be453a169d854f824a460359d10f92bb (patch) | |
| tree | 43dab398f1d6f601bb44df108427f7e0c611d68d /common/cmd_bmp.c | |
| parent | cfca5e604d5692f081cc1a9185ca5dc6dc77599d (diff) | |
| download | talos-obmc-uboot-281e00a3be453a169d854f824a460359d10f92bb.tar.gz talos-obmc-uboot-281e00a3be453a169d854f824a460359d10f92bb.zip | |
* Code cleanup
* Patch by Sascha Hauer, 28 Jun:
- add generic support for Motorola i.MX architecture
- add support for mx1ads, mx1fs2 and scb9328 boards
* Patches by Marc Leeman, 23 Jul 2004:
- Add define for the PCI/Memory Buffer Configuration Register
- corrected comments in cpu/mpc824x/cpu_init.c
* Add support for multiple serial interfaces
(for example to allow modem dial-in / dial-out)
Diffstat (limited to 'common/cmd_bmp.c')
| -rw-r--r-- | common/cmd_bmp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index c1d4c0b90a..3a971334bb 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -123,14 +123,15 @@ static int bmp_info(ulong addr) */ static int bmp_display(ulong addr, int x, int y) { -#ifdef CONFIG_LCD - extern int lcd_display_bitmap (ulong, int, int); +#if defined(CONFIG_LCD) + extern int lcd_display_bitmap (ulong, int, int); return (lcd_display_bitmap (addr, x, y)); -#endif -#ifdef CONFIG_VIDEO +#elif defined(CONFIG_VIDEO) extern int video_display_bitmap (ulong, int, int); return (video_display_bitmap (addr, x, y)); +#else +# error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO #endif } |
