diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-18 19:52:16 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-01-20 19:10:15 -0700 |
| commit | 6cbf5de7082fdee0bdbc3dd5fe7ac4c84cbf9f7d (patch) | |
| tree | 40464aa7ca7f2d667e1543f9cea2e3e0397b3e6d | |
| parent | 1acafc73bfc7535c185f321012ac70821471b816 (diff) | |
| download | u-boot-imx-6cbf5de7082fdee0bdbc3dd5fe7ac4c84cbf9f7d.zip u-boot-imx-6cbf5de7082fdee0bdbc3dd5fe7ac4c84cbf9f7d.tar.gz u-boot-imx-6cbf5de7082fdee0bdbc3dd5fe7ac4c84cbf9f7d.tar.bz2 | |
dm: lcd: Avoid using the lcd.h header file with driver model
The LCD functions and definitions are not used with the driver model video
uclass. When all boards are converted over we can remove the file. For now,
use #ifdef to omit the contents.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | include/lcd.h | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/common/Makefile b/common/Makefile index 2a1d9f8..2492275 100644 --- a/common/Makefile +++ b/common/Makefile @@ -205,7 +205,9 @@ obj-$(CONFIG_I2C_EDID) += edid.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-y += splash.o obj-$(CONFIG_SPLASH_SOURCE) += splash_source.o +ifndef CONFIG_DM_VIDEO obj-$(CONFIG_LCD) += lcd.o lcd_console.o +endif obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o obj-$(CONFIG_LYNXKDI) += lynxkdi.o diff --git a/include/lcd.h b/include/lcd.h index 59202b7..d7651a8 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -18,6 +18,12 @@ #include <asm/byteorder.h> #endif +int bmp_display(ulong addr, int x, int y); +struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp, + void **alloc_addr); + +#ifndef CONFIG_DM_VIDEO + extern char lcd_is_enabled; extern int lcd_line_length; extern struct vidinfo panel_info; @@ -26,10 +32,6 @@ void lcd_ctrl_init(void *lcdbase); void lcd_enable(void); void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue); -struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp, - void **alloc_addr); -int bmp_display(ulong addr, int x, int y); - /** * Set whether we need to flush the dcache when changing the LCD image. This * defaults to off. @@ -209,4 +211,6 @@ void lcd_sync(void); #define PAGE_SIZE 4096 #endif +#endif /* !CONFIG_DM_VIDEO */ + #endif /* _LCD_H_ */ |