2004-10-09 23:25:58 +00:00
|
|
|
/*
|
|
|
|
* Common LCD routines for supported CPUs
|
|
|
|
*
|
|
|
|
* (C) Copyright 2001-2002
|
|
|
|
* Wolfgang Denk, DENX Software Engineering -- wd@denx.de
|
|
|
|
*
|
2013-10-07 11:07:26 +00:00
|
|
|
* SPDX-License-Identifier: GPL-2.0+
|
2004-10-09 23:25:58 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
/* ** HEADER FILES */
|
|
|
|
/************************************************************************/
|
|
|
|
|
|
|
|
/* #define DEBUG */
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
|
|
|
#include <stdarg.h>
|
2013-02-24 21:28:43 +00:00
|
|
|
#include <search.h>
|
|
|
|
#include <env_callback.h>
|
2004-10-09 23:25:58 +00:00
|
|
|
#include <linux/types.h>
|
2009-05-16 10:14:54 +00:00
|
|
|
#include <stdio_dev.h>
|
2004-10-09 23:25:58 +00:00
|
|
|
#if defined(CONFIG_POST)
|
|
|
|
#include <post.h>
|
|
|
|
#endif
|
|
|
|
#include <lcd.h>
|
2005-04-03 23:11:38 +00:00
|
|
|
#include <watchdog.h>
|
2014-01-22 10:24:13 +00:00
|
|
|
#include <asm/unaligned.h>
|
2013-06-17 18:31:29 +00:00
|
|
|
#include <splash.h>
|
2014-02-27 20:26:19 +00:00
|
|
|
#include <asm/io.h>
|
|
|
|
#include <asm/unaligned.h>
|
2014-11-19 12:53:27 +00:00
|
|
|
#include <fdt_support.h>
|
2013-06-17 18:31:29 +00:00
|
|
|
|
2011-11-26 06:20:07 +00:00
|
|
|
#if defined(CONFIG_CPU_PXA25X) || defined(CONFIG_CPU_PXA27X) || \
|
|
|
|
defined(CONFIG_CPU_MONAHANS)
|
2004-10-09 23:25:58 +00:00
|
|
|
#include <asm/byteorder.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(CONFIG_MPC823)
|
|
|
|
#include <lcdvideo.h>
|
|
|
|
#endif
|
|
|
|
|
2008-05-09 19:57:18 +00:00
|
|
|
#if defined(CONFIG_ATMEL_LCD)
|
|
|
|
#include <atmel_lcdc.h>
|
|
|
|
#endif
|
|
|
|
|
2013-05-27 18:31:17 +00:00
|
|
|
#if defined(CONFIG_LCD_DT_SIMPLEFB)
|
|
|
|
#include <libfdt.h>
|
|
|
|
#endif
|
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
/************************************************************************/
|
|
|
|
/* ** FONT DATA */
|
|
|
|
/************************************************************************/
|
|
|
|
#include <video_font.h> /* Get font data, width and height */
|
|
|
|
|
2005-07-04 00:03:16 +00:00
|
|
|
/************************************************************************/
|
|
|
|
/* ** LOGO DATA */
|
|
|
|
/************************************************************************/
|
|
|
|
#ifdef CONFIG_LCD_LOGO
|
|
|
|
# include <bmp_logo.h> /* Get logo data, width and height */
|
2011-10-20 23:04:20 +00:00
|
|
|
# include <bmp_logo_data.h>
|
2010-03-13 16:44:08 +00:00
|
|
|
# if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) && (LCD_BPP != LCD_COLOR16)
|
2005-07-04 00:03:16 +00:00
|
|
|
# error Default Color Map overlaps with Logo Color Map
|
|
|
|
# endif
|
|
|
|
#endif
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2014-02-27 20:26:19 +00:00
|
|
|
#ifdef CONFIG_SANDBOX
|
|
|
|
#include <asm/sdl.h>
|
|
|
|
#endif
|
|
|
|
|
2012-10-17 13:24:54 +00:00
|
|
|
#ifndef CONFIG_LCD_ALIGNMENT
|
|
|
|
#define CONFIG_LCD_ALIGNMENT PAGE_SIZE
|
|
|
|
#endif
|
|
|
|
|
2012-10-17 13:24:59 +00:00
|
|
|
/* By default we scroll by a single line */
|
|
|
|
#ifndef CONFIG_CONSOLE_SCROLL_LINES
|
|
|
|
#define CONFIG_CONSOLE_SCROLL_LINES 1
|
|
|
|
#endif
|
|
|
|
|
2013-01-12 12:07:59 +00:00
|
|
|
/************************************************************************/
|
|
|
|
/* ** CONSOLE DEFINITIONS & FUNCTIONS */
|
|
|
|
/************************************************************************/
|
|
|
|
#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
|
|
|
|
# define CONSOLE_ROWS ((panel_info.vl_row-BMP_LOGO_HEIGHT) \
|
|
|
|
/ VIDEO_FONT_HEIGHT)
|
|
|
|
#else
|
|
|
|
# define CONSOLE_ROWS (panel_info.vl_row / VIDEO_FONT_HEIGHT)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define CONSOLE_COLS (panel_info.vl_col / VIDEO_FONT_WIDTH)
|
|
|
|
#define CONSOLE_ROW_SIZE (VIDEO_FONT_HEIGHT * lcd_line_length)
|
|
|
|
#define CONSOLE_ROW_FIRST lcd_console_address
|
|
|
|
#define CONSOLE_ROW_SECOND (lcd_console_address + CONSOLE_ROW_SIZE)
|
|
|
|
#define CONSOLE_ROW_LAST (lcd_console_address + CONSOLE_SIZE \
|
|
|
|
- CONSOLE_ROW_SIZE)
|
|
|
|
#define CONSOLE_SIZE (CONSOLE_ROW_SIZE * CONSOLE_ROWS)
|
|
|
|
#define CONSOLE_SCROLL_SIZE (CONSOLE_SIZE - CONSOLE_ROW_SIZE)
|
2006-03-31 16:32:53 +00:00
|
|
|
|
2013-01-12 12:07:59 +00:00
|
|
|
#if LCD_BPP == LCD_MONOCHROME
|
|
|
|
# define COLOR_MASK(c) ((c) | (c) << 1 | (c) << 2 | (c) << 3 | \
|
|
|
|
(c) << 4 | (c) << 5 | (c) << 6 | (c) << 7)
|
2014-03-07 17:55:40 +00:00
|
|
|
#elif (LCD_BPP == LCD_COLOR8) || (LCD_BPP == LCD_COLOR16) || \
|
|
|
|
(LCD_BPP == LCD_COLOR32)
|
2013-01-12 12:07:59 +00:00
|
|
|
# define COLOR_MASK(c) (c)
|
|
|
|
#else
|
|
|
|
# error Unsupported LCD BPP.
|
|
|
|
#endif
|
|
|
|
|
2006-03-31 16:32:53 +00:00
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static void lcd_drawchars(ushort x, ushort y, uchar *str, int count);
|
|
|
|
static inline void lcd_putc_xy(ushort x, ushort y, uchar c);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static int lcd_init(void *lcdbase);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2013-01-12 12:07:56 +00:00
|
|
|
static void *lcd_logo(void);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static void lcd_setfgcolor(int color);
|
|
|
|
static void lcd_setbgcolor(int color);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2013-01-05 09:45:48 +00:00
|
|
|
static int lcd_color_fg;
|
|
|
|
static int lcd_color_bg;
|
2013-01-22 10:44:11 +00:00
|
|
|
int lcd_line_length;
|
2013-01-05 09:45:48 +00:00
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
char lcd_is_enabled = 0;
|
|
|
|
|
2013-01-22 10:44:11 +00:00
|
|
|
static short console_col;
|
|
|
|
static short console_row;
|
2012-10-30 13:40:18 +00:00
|
|
|
|
2013-01-22 10:44:11 +00:00
|
|
|
static void *lcd_console_address;
|
2013-01-22 10:44:12 +00:00
|
|
|
static void *lcd_base; /* Start of framebuffer memory */
|
2012-10-30 13:40:18 +00:00
|
|
|
|
|
|
|
static char lcd_flush_dcache; /* 1 to flush dcache after each lcd update */
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
|
2012-10-30 13:40:18 +00:00
|
|
|
/* Flush LCD activity to the caches */
|
|
|
|
void lcd_sync(void)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* flush_dcache_range() is declared in common.h but it seems that some
|
|
|
|
* architectures do not actually implement it. Is there a way to find
|
|
|
|
* out whether it exists? For now, ARM is safe.
|
|
|
|
*/
|
|
|
|
#if defined(CONFIG_ARM) && !defined(CONFIG_SYS_DCACHE_OFF)
|
|
|
|
int line_length;
|
|
|
|
|
|
|
|
if (lcd_flush_dcache)
|
|
|
|
flush_dcache_range((u32)lcd_base,
|
|
|
|
(u32)(lcd_base + lcd_get_size(&line_length)));
|
2014-02-27 20:26:19 +00:00
|
|
|
#elif defined(CONFIG_SANDBOX) && defined(CONFIG_VIDEO_SANDBOX_SDL)
|
|
|
|
static ulong last_sync;
|
|
|
|
|
|
|
|
if (get_timer(last_sync) > 10) {
|
|
|
|
sandbox_sdl_sync(lcd_base);
|
|
|
|
last_sync = get_timer(0);
|
|
|
|
}
|
2012-10-30 13:40:18 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void lcd_set_flush_dcache(int flush)
|
|
|
|
{
|
|
|
|
lcd_flush_dcache = (flush != 0);
|
|
|
|
}
|
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static void console_scrollup(void)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
2012-10-17 13:24:59 +00:00
|
|
|
const int rows = CONFIG_CONSOLE_SCROLL_LINES;
|
|
|
|
|
|
|
|
/* Copy up rows ignoring those that will be overwritten */
|
|
|
|
memcpy(CONSOLE_ROW_FIRST,
|
|
|
|
lcd_console_address + CONSOLE_ROW_SIZE * rows,
|
|
|
|
CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows);
|
|
|
|
|
|
|
|
/* Clear the last rows */
|
2014-03-07 17:55:40 +00:00
|
|
|
#if (LCD_BPP != LCD_COLOR32)
|
2012-10-17 13:24:59 +00:00
|
|
|
memset(lcd_console_address + CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows,
|
|
|
|
COLOR_MASK(lcd_color_bg),
|
2013-01-12 12:07:56 +00:00
|
|
|
CONSOLE_ROW_SIZE * rows);
|
2014-03-07 17:55:40 +00:00
|
|
|
#else
|
|
|
|
u32 *ppix = lcd_console_address +
|
|
|
|
CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows;
|
|
|
|
u32 i;
|
|
|
|
for (i = 0;
|
|
|
|
i < (CONSOLE_ROW_SIZE * rows) / NBYTES(panel_info.vl_bpix);
|
|
|
|
i++) {
|
|
|
|
*ppix++ = COLOR_MASK(lcd_color_bg);
|
|
|
|
}
|
|
|
|
#endif
|
2012-10-30 13:40:18 +00:00
|
|
|
lcd_sync();
|
2012-10-17 13:24:59 +00:00
|
|
|
console_row -= rows;
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static inline void console_back(void)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
|
|
|
if (--console_col < 0) {
|
|
|
|
console_col = CONSOLE_COLS-1 ;
|
2013-01-12 12:07:56 +00:00
|
|
|
if (--console_row < 0)
|
2004-10-09 23:25:58 +00:00
|
|
|
console_row = 0;
|
|
|
|
}
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
lcd_putc_xy(console_col * VIDEO_FONT_WIDTH,
|
|
|
|
console_row * VIDEO_FONT_HEIGHT, ' ');
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static inline void console_newline(void)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
|
|
|
console_col = 0;
|
|
|
|
|
|
|
|
/* Check if we need to scroll the terminal */
|
2013-01-12 12:07:56 +00:00
|
|
|
if (++console_row >= CONSOLE_ROWS)
|
2012-05-24 01:42:38 +00:00
|
|
|
console_scrollup();
|
2013-01-12 12:07:56 +00:00
|
|
|
else
|
2012-10-30 13:40:18 +00:00
|
|
|
lcd_sync();
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
|
2014-07-23 12:54:59 +00:00
|
|
|
static void lcd_stub_putc(struct stdio_dev *dev, const char c)
|
|
|
|
{
|
|
|
|
lcd_putc(c);
|
|
|
|
}
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
void lcd_putc(const char c)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
|
|
|
if (!lcd_is_enabled) {
|
|
|
|
serial_putc(c);
|
2012-05-24 01:42:38 +00:00
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (c) {
|
2012-05-24 01:42:38 +00:00
|
|
|
case '\r':
|
|
|
|
console_col = 0;
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
return;
|
|
|
|
case '\n':
|
|
|
|
console_newline();
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
return;
|
2004-10-09 23:25:58 +00:00
|
|
|
case '\t': /* Tab (8 chars alignment) */
|
2012-05-24 01:42:38 +00:00
|
|
|
console_col += 8;
|
|
|
|
console_col &= ~7;
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
if (console_col >= CONSOLE_COLS)
|
|
|
|
console_newline();
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
return;
|
|
|
|
case '\b':
|
|
|
|
console_back();
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
return;
|
|
|
|
default:
|
|
|
|
lcd_putc_xy(console_col * VIDEO_FONT_WIDTH,
|
|
|
|
console_row * VIDEO_FONT_HEIGHT, c);
|
|
|
|
if (++console_col >= CONSOLE_COLS)
|
|
|
|
console_newline();
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
|
2014-07-23 12:54:59 +00:00
|
|
|
static void lcd_stub_puts(struct stdio_dev *dev, const char *s)
|
|
|
|
{
|
|
|
|
lcd_puts(s);
|
|
|
|
}
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
void lcd_puts(const char *s)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
|
|
|
if (!lcd_is_enabled) {
|
2012-05-24 01:42:38 +00:00
|
|
|
serial_puts(s);
|
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-01-12 12:07:56 +00:00
|
|
|
while (*s)
|
2012-05-24 01:42:38 +00:00
|
|
|
lcd_putc(*s++);
|
2013-01-12 12:07:56 +00:00
|
|
|
|
2012-10-30 13:40:18 +00:00
|
|
|
lcd_sync();
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
2008-09-01 14:21:20 +00:00
|
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
void lcd_printf(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
char buf[CONFIG_SYS_PBSIZE];
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
|
|
vsprintf(buf, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
lcd_puts(buf);
|
|
|
|
}
|
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
/************************************************************************/
|
|
|
|
/* ** Low-Level Graphics Routines */
|
|
|
|
/************************************************************************/
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static void lcd_drawchars(ushort x, ushort y, uchar *str, int count)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
|
|
|
uchar *dest;
|
2011-09-26 00:26:04 +00:00
|
|
|
ushort row;
|
|
|
|
|
2012-04-27 04:41:16 +00:00
|
|
|
#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
|
|
|
|
y += BMP_LOGO_HEIGHT;
|
|
|
|
#endif
|
|
|
|
|
2011-09-26 00:26:04 +00:00
|
|
|
#if LCD_BPP == LCD_MONOCHROME
|
|
|
|
ushort off = x * (1 << LCD_BPP) % 8;
|
|
|
|
#endif
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2014-03-07 17:55:40 +00:00
|
|
|
dest = (uchar *)(lcd_base + y * lcd_line_length + x * NBITS(LCD_BPP)/8);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
for (row = 0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) {
|
2004-10-09 23:25:58 +00:00
|
|
|
uchar *s = str;
|
|
|
|
int i;
|
2010-03-13 16:44:08 +00:00
|
|
|
#if LCD_BPP == LCD_COLOR16
|
|
|
|
ushort *d = (ushort *)dest;
|
2014-03-07 17:55:40 +00:00
|
|
|
#elif LCD_BPP == LCD_COLOR32
|
|
|
|
u32 *d = (u32 *)dest;
|
2010-03-13 16:44:08 +00:00
|
|
|
#else
|
|
|
|
uchar *d = dest;
|
|
|
|
#endif
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
#if LCD_BPP == LCD_MONOCHROME
|
2013-01-12 12:07:56 +00:00
|
|
|
uchar rest = *d & -(1 << (8 - off));
|
2004-10-09 23:25:58 +00:00
|
|
|
uchar sym;
|
|
|
|
#endif
|
2012-05-24 01:42:38 +00:00
|
|
|
for (i = 0; i < count; ++i) {
|
2004-10-09 23:25:58 +00:00
|
|
|
uchar c, bits;
|
|
|
|
|
|
|
|
c = *s++;
|
|
|
|
bits = video_fontdata[c * VIDEO_FONT_HEIGHT + row];
|
|
|
|
|
|
|
|
#if LCD_BPP == LCD_MONOCHROME
|
|
|
|
sym = (COLOR_MASK(lcd_color_fg) & bits) |
|
2012-05-24 01:42:38 +00:00
|
|
|
(COLOR_MASK(lcd_color_bg) & ~bits);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
*d++ = rest | (sym >> off);
|
|
|
|
rest = sym << (8-off);
|
2014-12-08 15:14:36 +00:00
|
|
|
#else /* LCD_BPP == LCD_COLOR8 or LCD_COLOR16 or LCD_COLOR32 */
|
2014-03-07 17:55:40 +00:00
|
|
|
for (c = 0; c < 8; ++c) {
|
|
|
|
*d++ = (bits & 0x80) ?
|
|
|
|
lcd_color_fg : lcd_color_bg;
|
|
|
|
bits <<= 1;
|
|
|
|
}
|
2004-10-09 23:25:58 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#if LCD_BPP == LCD_MONOCHROME
|
2013-01-12 12:07:56 +00:00
|
|
|
*d = rest | (*d & ((1 << (8 - off)) - 1));
|
2004-10-09 23:25:58 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static inline void lcd_putc_xy(ushort x, ushort y, uchar c)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
2012-04-27 04:41:16 +00:00
|
|
|
lcd_drawchars(x, y, &c, 1);
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
/** Small utility to check that you got the colours right */
|
|
|
|
/************************************************************************/
|
|
|
|
#ifdef LCD_TEST_PATTERN
|
|
|
|
|
|
|
|
#define N_BLK_VERT 2
|
|
|
|
#define N_BLK_HOR 3
|
|
|
|
|
2013-01-12 12:07:56 +00:00
|
|
|
static int test_colors[N_BLK_HOR * N_BLK_VERT] = {
|
2004-10-09 23:25:58 +00:00
|
|
|
CONSOLE_COLOR_RED, CONSOLE_COLOR_GREEN, CONSOLE_COLOR_YELLOW,
|
|
|
|
CONSOLE_COLOR_BLUE, CONSOLE_COLOR_MAGENTA, CONSOLE_COLOR_CYAN,
|
|
|
|
};
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static void test_pattern(void)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
|
|
|
ushort v_max = panel_info.vl_row;
|
|
|
|
ushort h_max = panel_info.vl_col;
|
|
|
|
ushort v_step = (v_max + N_BLK_VERT - 1) / N_BLK_VERT;
|
|
|
|
ushort h_step = (h_max + N_BLK_HOR - 1) / N_BLK_HOR;
|
|
|
|
ushort v, h;
|
|
|
|
uchar *pix = (uchar *)lcd_base;
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
printf("[LCD] Test Pattern: %d x %d [%d x %d]\n",
|
2004-10-09 23:25:58 +00:00
|
|
|
h_max, v_max, h_step, v_step);
|
|
|
|
|
|
|
|
/* WARNING: Code silently assumes 8bit/pixel */
|
2012-05-24 01:42:38 +00:00
|
|
|
for (v = 0; v < v_max; ++v) {
|
2004-10-09 23:25:58 +00:00
|
|
|
uchar iy = v / v_step;
|
2012-05-24 01:42:38 +00:00
|
|
|
for (h = 0; h < h_max; ++h) {
|
2013-01-12 12:07:56 +00:00
|
|
|
uchar ix = N_BLK_HOR * iy + h / h_step;
|
2004-10-09 23:25:58 +00:00
|
|
|
*pix++ = test_colors[ix];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* LCD_TEST_PATTERN */
|
|
|
|
|
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
/* ** GENERIC Initialization Routines */
|
|
|
|
/************************************************************************/
|
2013-11-09 10:00:09 +00:00
|
|
|
/*
|
|
|
|
* With most lcd drivers the line length is set up
|
|
|
|
* by calculating it from panel_info parameters. Some
|
|
|
|
* drivers need to calculate the line length differently,
|
|
|
|
* so make the function weak to allow overriding it.
|
|
|
|
*/
|
|
|
|
__weak int lcd_get_size(int *line_length)
|
2012-10-17 13:24:54 +00:00
|
|
|
{
|
|
|
|
*line_length = (panel_info.vl_col * NBITS(panel_info.vl_bpix)) / 8;
|
|
|
|
return *line_length * panel_info.vl_row;
|
|
|
|
}
|
|
|
|
|
2013-01-12 12:07:56 +00:00
|
|
|
int drv_lcd_init(void)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
2009-05-16 10:14:54 +00:00
|
|
|
struct stdio_dev lcddev;
|
2004-10-09 23:25:58 +00:00
|
|
|
int rc;
|
|
|
|
|
2014-02-27 20:26:19 +00:00
|
|
|
lcd_base = map_sysmem(gd->fb_base, 0);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
lcd_init(lcd_base); /* LCD initialization */
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
/* Device initialization */
|
2012-05-24 01:42:38 +00:00
|
|
|
memset(&lcddev, 0, sizeof(lcddev));
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
strcpy(lcddev.name, "lcd");
|
2004-10-09 23:25:58 +00:00
|
|
|
lcddev.ext = 0; /* No extensions */
|
|
|
|
lcddev.flags = DEV_FLAGS_OUTPUT; /* Output only */
|
2014-07-23 12:54:59 +00:00
|
|
|
lcddev.putc = lcd_stub_putc; /* 'putc' function */
|
|
|
|
lcddev.puts = lcd_stub_puts; /* 'puts' function */
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2013-01-12 12:07:56 +00:00
|
|
|
rc = stdio_register(&lcddev);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
return (rc == 0) ? 1 : rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------------*/
|
2011-10-20 23:07:03 +00:00
|
|
|
void lcd_clear(void)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
|
|
|
#if LCD_BPP == LCD_MONOCHROME
|
|
|
|
/* Setting the palette */
|
|
|
|
lcd_initcolregs();
|
|
|
|
|
|
|
|
#elif LCD_BPP == LCD_COLOR8
|
|
|
|
/* Setting the palette */
|
2012-05-24 01:42:38 +00:00
|
|
|
lcd_setcolreg(CONSOLE_COLOR_BLACK, 0, 0, 0);
|
|
|
|
lcd_setcolreg(CONSOLE_COLOR_RED, 0xFF, 0, 0);
|
|
|
|
lcd_setcolreg(CONSOLE_COLOR_GREEN, 0, 0xFF, 0);
|
|
|
|
lcd_setcolreg(CONSOLE_COLOR_YELLOW, 0xFF, 0xFF, 0);
|
|
|
|
lcd_setcolreg(CONSOLE_COLOR_BLUE, 0, 0, 0xFF);
|
|
|
|
lcd_setcolreg(CONSOLE_COLOR_MAGENTA, 0xFF, 0, 0xFF);
|
|
|
|
lcd_setcolreg(CONSOLE_COLOR_CYAN, 0, 0xFF, 0xFF);
|
|
|
|
lcd_setcolreg(CONSOLE_COLOR_GREY, 0xAA, 0xAA, 0xAA);
|
|
|
|
lcd_setcolreg(CONSOLE_COLOR_WHITE, 0xFF, 0xFF, 0xFF);
|
2004-10-09 23:25:58 +00:00
|
|
|
#endif
|
|
|
|
|
2008-10-16 13:01:15 +00:00
|
|
|
#ifndef CONFIG_SYS_WHITE_ON_BLACK
|
2012-05-24 01:42:38 +00:00
|
|
|
lcd_setfgcolor(CONSOLE_COLOR_BLACK);
|
|
|
|
lcd_setbgcolor(CONSOLE_COLOR_WHITE);
|
2004-10-09 23:25:58 +00:00
|
|
|
#else
|
2012-05-24 01:42:38 +00:00
|
|
|
lcd_setfgcolor(CONSOLE_COLOR_WHITE);
|
|
|
|
lcd_setbgcolor(CONSOLE_COLOR_BLACK);
|
2008-10-16 13:01:15 +00:00
|
|
|
#endif /* CONFIG_SYS_WHITE_ON_BLACK */
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
#ifdef LCD_TEST_PATTERN
|
|
|
|
test_pattern();
|
|
|
|
#else
|
|
|
|
/* set framebuffer to background color */
|
2014-03-07 17:55:40 +00:00
|
|
|
#if (LCD_BPP != LCD_COLOR32)
|
2012-05-24 01:42:38 +00:00
|
|
|
memset((char *)lcd_base,
|
2014-03-07 17:45:20 +00:00
|
|
|
COLOR_MASK(lcd_color_bg),
|
2013-01-12 12:07:56 +00:00
|
|
|
lcd_line_length * panel_info.vl_row);
|
2014-03-07 17:55:40 +00:00
|
|
|
#else
|
|
|
|
u32 *ppix = lcd_base;
|
|
|
|
u32 i;
|
|
|
|
for (i = 0;
|
|
|
|
i < (lcd_line_length * panel_info.vl_row)/NBYTES(panel_info.vl_bpix);
|
|
|
|
i++) {
|
|
|
|
*ppix++ = COLOR_MASK(lcd_color_bg);
|
|
|
|
}
|
|
|
|
#endif
|
2004-10-09 23:25:58 +00:00
|
|
|
#endif
|
|
|
|
/* Paint the logo and retrieve LCD base address */
|
2012-05-24 01:42:38 +00:00
|
|
|
debug("[LCD] Drawing the logo...\n");
|
2013-01-12 12:07:56 +00:00
|
|
|
lcd_console_address = lcd_logo();
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
console_col = 0;
|
|
|
|
console_row = 0;
|
2012-10-30 13:40:18 +00:00
|
|
|
lcd_sync();
|
|
|
|
}
|
|
|
|
|
|
|
|
static int do_lcd_clear(cmd_tbl_t *cmdtp, int flag, int argc,
|
|
|
|
char *const argv[])
|
|
|
|
{
|
|
|
|
lcd_clear();
|
|
|
|
return 0;
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
U_BOOT_CMD(
|
2011-10-20 23:07:03 +00:00
|
|
|
cls, 1, 1, do_lcd_clear,
|
2009-01-28 00:03:12 +00:00
|
|
|
"clear screen",
|
2009-05-24 15:06:54 +00:00
|
|
|
""
|
2004-10-09 23:25:58 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static int lcd_init(void *lcdbase)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
|
|
|
/* Initialize the lcd controller */
|
2012-05-24 01:42:38 +00:00
|
|
|
debug("[LCD] Initializing LCD frambuffer at %p\n", lcdbase);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
lcd_ctrl_init(lcdbase);
|
2013-03-29 13:00:13 +00:00
|
|
|
|
|
|
|
/*
|
2014-11-20 03:41:03 +00:00
|
|
|
* lcd_ctrl_init() of some drivers (i.e. bcm2835 on rpi) ignores
|
2013-03-29 13:00:13 +00:00
|
|
|
* the 'lcdbase' argument and uses custom lcd base address
|
|
|
|
* by setting up gd->fb_base. Check for this condition and fixup
|
|
|
|
* 'lcd_base' address.
|
|
|
|
*/
|
2014-02-27 20:26:19 +00:00
|
|
|
if (map_to_sysmem(lcdbase) != gd->fb_base)
|
|
|
|
lcd_base = map_sysmem(gd->fb_base, 0);
|
2013-03-29 13:00:13 +00:00
|
|
|
|
|
|
|
debug("[LCD] Using LCD frambuffer at %p\n", lcd_base);
|
|
|
|
|
2013-01-29 16:37:38 +00:00
|
|
|
lcd_get_size(&lcd_line_length);
|
2008-09-01 14:21:21 +00:00
|
|
|
lcd_is_enabled = 1;
|
2011-10-20 23:07:03 +00:00
|
|
|
lcd_clear();
|
2013-01-12 12:07:56 +00:00
|
|
|
lcd_enable();
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
/* Initialize the console */
|
|
|
|
console_col = 0;
|
2005-07-04 00:03:16 +00:00
|
|
|
#ifdef CONFIG_LCD_INFO_BELOW_LOGO
|
2004-10-09 23:25:58 +00:00
|
|
|
console_row = 7 + BMP_LOGO_HEIGHT / VIDEO_FONT_HEIGHT;
|
|
|
|
#else
|
|
|
|
console_row = 1; /* leave 1 blank line below logo */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
/* ** ROM capable initialization part - needed to reserve FB memory */
|
|
|
|
/************************************************************************/
|
|
|
|
/*
|
|
|
|
* This is called early in the system initialization to grab memory
|
|
|
|
* for the LCD controller.
|
|
|
|
* Returns new address for monitor, after reserving LCD buffer memory
|
|
|
|
*
|
|
|
|
* Note that this is running from ROM, so no write access to global data.
|
|
|
|
*/
|
2012-05-24 01:42:38 +00:00
|
|
|
ulong lcd_setmem(ulong addr)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
|
|
|
ulong size;
|
2012-10-17 13:24:54 +00:00
|
|
|
int line_length;
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
debug("LCD panel info: %d x %d, %d bit/pix\n", panel_info.vl_col,
|
|
|
|
panel_info.vl_row, NBITS(panel_info.vl_bpix));
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-10-17 13:24:54 +00:00
|
|
|
size = lcd_get_size(&line_length);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-10-17 13:24:54 +00:00
|
|
|
/* Round up to nearest full page, or MMU section if defined */
|
|
|
|
size = ALIGN(size, CONFIG_LCD_ALIGNMENT);
|
|
|
|
addr = ALIGN(addr - CONFIG_LCD_ALIGNMENT + 1, CONFIG_LCD_ALIGNMENT);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
/* Allocate pages for the frame buffer. */
|
|
|
|
addr -= size;
|
|
|
|
|
2013-01-12 12:07:56 +00:00
|
|
|
debug("Reserving %ldk for LCD Framebuffer at: %08lx\n",
|
|
|
|
size >> 10, addr);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
return addr;
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static void lcd_setfgcolor(int color)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
2008-05-09 19:57:18 +00:00
|
|
|
lcd_color_fg = color;
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static void lcd_setbgcolor(int color)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
2008-05-09 19:57:18 +00:00
|
|
|
lcd_color_bg = color;
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
/* ** Chipset depending Bitmap / Logo stuff... */
|
|
|
|
/************************************************************************/
|
2012-08-09 00:14:52 +00:00
|
|
|
static inline ushort *configuration_get_cmap(void)
|
|
|
|
{
|
|
|
|
#if defined CONFIG_CPU_PXA
|
|
|
|
struct pxafb_info *fbi = &panel_info.pxa;
|
|
|
|
return (ushort *)fbi->palette;
|
|
|
|
#elif defined(CONFIG_MPC823)
|
|
|
|
immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
|
|
|
|
cpm8xx_t *cp = &(immr->im_cpm);
|
|
|
|
return (ushort *)&(cp->lcd_cmap[255 * sizeof(ushort)]);
|
|
|
|
#elif defined(CONFIG_ATMEL_LCD)
|
|
|
|
return (ushort *)(panel_info.mmio + ATMEL_LCDC_LUT(0));
|
2012-09-22 06:55:53 +00:00
|
|
|
#elif !defined(CONFIG_ATMEL_HLCD) && !defined(CONFIG_EXYNOS_FB)
|
|
|
|
return panel_info.cmap;
|
2013-01-12 12:07:56 +00:00
|
|
|
#elif defined(CONFIG_LCD_LOGO)
|
2012-09-22 06:55:53 +00:00
|
|
|
return bmp_logo_palette;
|
|
|
|
#else
|
|
|
|
return NULL;
|
|
|
|
#endif
|
2012-08-09 00:14:52 +00:00
|
|
|
}
|
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
#ifdef CONFIG_LCD_LOGO
|
2012-05-24 01:42:38 +00:00
|
|
|
void bitmap_plot(int x, int y)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
2008-05-09 19:57:18 +00:00
|
|
|
#ifdef CONFIG_ATMEL_LCD
|
2012-08-09 00:14:52 +00:00
|
|
|
uint *cmap = (uint *)bmp_logo_palette;
|
2008-05-09 19:57:18 +00:00
|
|
|
#else
|
2012-08-09 00:14:52 +00:00
|
|
|
ushort *cmap = (ushort *)bmp_logo_palette;
|
2008-05-09 19:57:18 +00:00
|
|
|
#endif
|
2004-10-09 23:25:58 +00:00
|
|
|
ushort i, j;
|
|
|
|
uchar *bmap;
|
|
|
|
uchar *fb;
|
|
|
|
ushort *fb16;
|
2012-08-09 00:14:52 +00:00
|
|
|
#if defined(CONFIG_MPC823)
|
|
|
|
immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
|
|
|
|
cpm8xx_t *cp = &(immr->im_cpm);
|
2004-10-09 23:25:58 +00:00
|
|
|
#endif
|
2013-02-13 17:48:00 +00:00
|
|
|
unsigned bpix = NBITS(panel_info.vl_bpix);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
debug("Logo: width %d height %d colors %d cmap %d\n",
|
2004-10-09 23:25:58 +00:00
|
|
|
BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS,
|
2012-04-27 04:41:06 +00:00
|
|
|
ARRAY_SIZE(bmp_logo_palette));
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
bmap = &bmp_logo_bitmap[0];
|
2013-02-13 17:48:00 +00:00
|
|
|
fb = (uchar *)(lcd_base + y * lcd_line_length + x * bpix / 8);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2013-02-13 17:48:00 +00:00
|
|
|
if (bpix < 12) {
|
2012-08-09 00:14:52 +00:00
|
|
|
/* Leave room for default color map
|
|
|
|
* default case: generic system with no cmap (most likely 16bpp)
|
|
|
|
* cmap was set to the source palette, so no change is done.
|
|
|
|
* This avoids even more ifdefs in the next stanza
|
|
|
|
*/
|
|
|
|
#if defined(CONFIG_MPC823)
|
2012-05-24 01:42:38 +00:00
|
|
|
cmap = (ushort *) &(cp->lcd_cmap[BMP_LOGO_OFFSET * sizeof(ushort)]);
|
2008-05-09 19:57:18 +00:00
|
|
|
#elif defined(CONFIG_ATMEL_LCD)
|
2012-08-09 00:14:52 +00:00
|
|
|
cmap = (uint *)configuration_get_cmap();
|
2010-03-13 16:44:08 +00:00
|
|
|
#else
|
2012-08-09 00:14:52 +00:00
|
|
|
cmap = configuration_get_cmap();
|
2004-10-09 23:25:58 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
WATCHDOG_RESET();
|
|
|
|
|
|
|
|
/* Set color map */
|
2012-04-27 04:41:06 +00:00
|
|
|
for (i = 0; i < ARRAY_SIZE(bmp_logo_palette); ++i) {
|
2004-10-09 23:25:58 +00:00
|
|
|
ushort colreg = bmp_logo_palette[i];
|
2008-05-09 19:57:18 +00:00
|
|
|
#ifdef CONFIG_ATMEL_LCD
|
|
|
|
uint lut_entry;
|
|
|
|
#ifdef CONFIG_ATMEL_LCD_BGR555
|
|
|
|
lut_entry = ((colreg & 0x000F) << 11) |
|
2012-05-24 01:42:38 +00:00
|
|
|
((colreg & 0x00F0) << 2) |
|
|
|
|
((colreg & 0x0F00) >> 7);
|
2008-05-09 19:57:18 +00:00
|
|
|
#else /* CONFIG_ATMEL_LCD_RGB565 */
|
|
|
|
lut_entry = ((colreg & 0x000F) << 1) |
|
2012-05-24 01:42:38 +00:00
|
|
|
((colreg & 0x00F0) << 3) |
|
|
|
|
((colreg & 0x0F00) << 4);
|
2008-05-09 19:57:18 +00:00
|
|
|
#endif
|
|
|
|
*(cmap + BMP_LOGO_OFFSET) = lut_entry;
|
|
|
|
cmap++;
|
|
|
|
#else /* !CONFIG_ATMEL_LCD */
|
2004-10-09 23:25:58 +00:00
|
|
|
*cmap++ = colreg;
|
2008-05-09 19:57:18 +00:00
|
|
|
#endif /* CONFIG_ATMEL_LCD */
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
WATCHDOG_RESET();
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
for (i = 0; i < BMP_LOGO_HEIGHT; ++i) {
|
|
|
|
memcpy(fb, bmap, BMP_LOGO_WIDTH);
|
2004-10-09 23:25:58 +00:00
|
|
|
bmap += BMP_LOGO_WIDTH;
|
2013-01-12 12:07:56 +00:00
|
|
|
fb += panel_info.vl_col;
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else { /* true color mode */
|
2010-03-13 16:44:08 +00:00
|
|
|
u16 col16;
|
2013-02-13 17:48:00 +00:00
|
|
|
fb16 = (ushort *)fb;
|
2012-05-24 01:42:38 +00:00
|
|
|
for (i = 0; i < BMP_LOGO_HEIGHT; ++i) {
|
|
|
|
for (j = 0; j < BMP_LOGO_WIDTH; j++) {
|
2010-03-13 16:44:08 +00:00
|
|
|
col16 = bmp_logo_palette[(bmap[j]-16)];
|
|
|
|
fb16[j] =
|
|
|
|
((col16 & 0x000F) << 1) |
|
|
|
|
((col16 & 0x00F0) << 3) |
|
|
|
|
((col16 & 0x0F00) << 4);
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
bmap += BMP_LOGO_WIDTH;
|
|
|
|
fb16 += panel_info.vl_col;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
WATCHDOG_RESET();
|
2012-10-30 13:40:18 +00:00
|
|
|
lcd_sync();
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
2012-04-27 04:41:27 +00:00
|
|
|
#else
|
|
|
|
static inline void bitmap_plot(int x, int y) {}
|
2004-10-09 23:25:58 +00:00
|
|
|
#endif /* CONFIG_LCD_LOGO */
|
|
|
|
|
|
|
|
/*----------------------------------------------------------------------*/
|
2007-07-08 23:10:08 +00:00
|
|
|
#if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
|
2004-10-09 23:25:58 +00:00
|
|
|
/*
|
|
|
|
* Display the BMP file located at address bmp_image.
|
|
|
|
* Only uncompressed.
|
|
|
|
*/
|
2009-07-09 14:07:30 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
|
|
|
#define BMP_ALIGN_CENTER 0x7FFF
|
2012-08-09 00:14:51 +00:00
|
|
|
|
|
|
|
static void splash_align_axis(int *axis, unsigned long panel_size,
|
|
|
|
unsigned long picture_size)
|
|
|
|
{
|
|
|
|
unsigned long panel_picture_delta = panel_size - picture_size;
|
|
|
|
unsigned long axis_alignment;
|
|
|
|
|
|
|
|
if (*axis == BMP_ALIGN_CENTER)
|
|
|
|
axis_alignment = panel_picture_delta / 2;
|
|
|
|
else if (*axis < 0)
|
|
|
|
axis_alignment = panel_picture_delta + *axis + 1;
|
|
|
|
else
|
|
|
|
return;
|
|
|
|
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
*axis = max(0, (int)axis_alignment);
|
2012-08-09 00:14:51 +00:00
|
|
|
}
|
2009-07-09 14:07:30 +00:00
|
|
|
#endif
|
|
|
|
|
2012-09-28 15:11:16 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_LCD_BMP_RLE8
|
|
|
|
|
|
|
|
#define BMP_RLE8_ESCAPE 0
|
|
|
|
#define BMP_RLE8_EOL 0
|
|
|
|
#define BMP_RLE8_EOBMP 1
|
|
|
|
#define BMP_RLE8_DELTA 2
|
|
|
|
|
|
|
|
static void draw_unencoded_bitmap(ushort **fbp, uchar *bmap, ushort *cmap,
|
|
|
|
int cnt)
|
|
|
|
{
|
|
|
|
while (cnt > 0) {
|
|
|
|
*(*fbp)++ = cmap[*bmap++];
|
|
|
|
cnt--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void draw_encoded_bitmap(ushort **fbp, ushort c, int cnt)
|
|
|
|
{
|
|
|
|
ushort *fb = *fbp;
|
|
|
|
int cnt_8copy = cnt >> 3;
|
|
|
|
|
|
|
|
cnt -= cnt_8copy << 3;
|
|
|
|
while (cnt_8copy > 0) {
|
|
|
|
*fb++ = c;
|
|
|
|
*fb++ = c;
|
|
|
|
*fb++ = c;
|
|
|
|
*fb++ = c;
|
|
|
|
*fb++ = c;
|
|
|
|
*fb++ = c;
|
|
|
|
*fb++ = c;
|
|
|
|
*fb++ = c;
|
|
|
|
cnt_8copy--;
|
|
|
|
}
|
|
|
|
while (cnt > 0) {
|
|
|
|
*fb++ = c;
|
|
|
|
cnt--;
|
|
|
|
}
|
2013-01-12 12:07:56 +00:00
|
|
|
*fbp = fb;
|
2012-09-28 15:11:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2013-01-12 12:07:56 +00:00
|
|
|
* Do not call this function directly, must be called from lcd_display_bitmap.
|
2012-09-28 15:11:16 +00:00
|
|
|
*/
|
|
|
|
static void lcd_display_rle8_bitmap(bmp_image_t *bmp, ushort *cmap, uchar *fb,
|
|
|
|
int x_off, int y_off)
|
|
|
|
{
|
|
|
|
uchar *bmap;
|
|
|
|
ulong width, height;
|
|
|
|
ulong cnt, runlen;
|
|
|
|
int x, y;
|
|
|
|
int decode = 1;
|
|
|
|
|
2014-01-22 10:24:13 +00:00
|
|
|
width = get_unaligned_le32(&bmp->header.width);
|
|
|
|
height = get_unaligned_le32(&bmp->header.height);
|
|
|
|
bmap = (uchar *)bmp + get_unaligned_le32(&bmp->header.data_offset);
|
2012-09-28 15:11:16 +00:00
|
|
|
|
|
|
|
x = 0;
|
|
|
|
y = height - 1;
|
|
|
|
|
|
|
|
while (decode) {
|
|
|
|
if (bmap[0] == BMP_RLE8_ESCAPE) {
|
|
|
|
switch (bmap[1]) {
|
|
|
|
case BMP_RLE8_EOL:
|
|
|
|
/* end of line */
|
|
|
|
bmap += 2;
|
|
|
|
x = 0;
|
|
|
|
y--;
|
|
|
|
/* 16bpix, 2-byte per pixel, width should *2 */
|
|
|
|
fb -= (width * 2 + lcd_line_length);
|
|
|
|
break;
|
|
|
|
case BMP_RLE8_EOBMP:
|
|
|
|
/* end of bitmap */
|
|
|
|
decode = 0;
|
|
|
|
break;
|
|
|
|
case BMP_RLE8_DELTA:
|
|
|
|
/* delta run */
|
|
|
|
x += bmap[2];
|
|
|
|
y -= bmap[3];
|
|
|
|
/* 16bpix, 2-byte per pixel, x should *2 */
|
|
|
|
fb = (uchar *) (lcd_base + (y + y_off - 1)
|
|
|
|
* lcd_line_length + (x + x_off) * 2);
|
|
|
|
bmap += 4;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* unencoded run */
|
|
|
|
runlen = bmap[1];
|
|
|
|
bmap += 2;
|
|
|
|
if (y < height) {
|
|
|
|
if (x < width) {
|
|
|
|
if (x + runlen > width)
|
|
|
|
cnt = width - x;
|
|
|
|
else
|
|
|
|
cnt = runlen;
|
|
|
|
draw_unencoded_bitmap(
|
|
|
|
(ushort **)&fb,
|
|
|
|
bmap, cmap, cnt);
|
|
|
|
}
|
|
|
|
x += runlen;
|
|
|
|
}
|
|
|
|
bmap += runlen;
|
|
|
|
if (runlen & 1)
|
|
|
|
bmap++;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* encoded run */
|
|
|
|
if (y < height) {
|
|
|
|
runlen = bmap[0];
|
|
|
|
if (x < width) {
|
|
|
|
/* aggregate the same code */
|
|
|
|
while (bmap[0] == 0xff &&
|
|
|
|
bmap[2] != BMP_RLE8_ESCAPE &&
|
|
|
|
bmap[1] == bmap[3]) {
|
|
|
|
runlen += bmap[2];
|
|
|
|
bmap += 2;
|
|
|
|
}
|
|
|
|
if (x + runlen > width)
|
|
|
|
cnt = width - x;
|
|
|
|
else
|
|
|
|
cnt = runlen;
|
|
|
|
draw_encoded_bitmap((ushort **)&fb,
|
|
|
|
cmap[bmap[1]], cnt);
|
|
|
|
}
|
|
|
|
x += runlen;
|
|
|
|
}
|
|
|
|
bmap += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-11-11 13:46:05 +00:00
|
|
|
#if defined(CONFIG_MPC823)
|
2012-08-09 00:14:53 +00:00
|
|
|
#define FB_PUT_BYTE(fb, from) *(fb)++ = (255 - *(from)++)
|
2012-09-22 06:55:53 +00:00
|
|
|
#else
|
|
|
|
#define FB_PUT_BYTE(fb, from) *(fb)++ = *(from)++
|
2012-08-09 00:14:53 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(CONFIG_BMP_16BPP)
|
|
|
|
#if defined(CONFIG_ATMEL_LCD_BGR555)
|
|
|
|
static inline void fb_put_word(uchar **fb, uchar **from)
|
|
|
|
{
|
|
|
|
*(*fb)++ = (((*from)[0] & 0x1f) << 2) | ((*from)[1] & 0x03);
|
|
|
|
*(*fb)++ = ((*from)[0] & 0xe0) | (((*from)[1] & 0x7c) >> 2);
|
|
|
|
*from += 2;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void fb_put_word(uchar **fb, uchar **from)
|
|
|
|
{
|
|
|
|
*(*fb)++ = *(*from)++;
|
|
|
|
*(*fb)++ = *(*from)++;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif /* CONFIG_BMP_16BPP */
|
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
int lcd_display_bitmap(ulong bmp_image, int x, int y)
|
|
|
|
{
|
2009-02-25 19:28:13 +00:00
|
|
|
ushort *cmap = NULL;
|
|
|
|
ushort *cmap_base = NULL;
|
2004-10-09 23:25:58 +00:00
|
|
|
ushort i, j;
|
|
|
|
uchar *fb;
|
2014-02-27 20:26:19 +00:00
|
|
|
bmp_image_t *bmp = (bmp_image_t *)map_sysmem(bmp_image, 0);
|
2004-10-09 23:25:58 +00:00
|
|
|
uchar *bmap;
|
2012-09-28 15:11:14 +00:00
|
|
|
ushort padded_width;
|
2009-02-06 09:37:53 +00:00
|
|
|
unsigned long width, height, byte_width;
|
2006-08-30 21:09:00 +00:00
|
|
|
unsigned long pwidth = panel_info.vl_col;
|
2009-02-06 09:37:53 +00:00
|
|
|
unsigned colors, bpix, bmp_bpix;
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2013-01-12 12:07:56 +00:00
|
|
|
if (!bmp || !(bmp->header.signature[0] == 'B' &&
|
|
|
|
bmp->header.signature[1] == 'M')) {
|
2012-05-24 01:42:38 +00:00
|
|
|
printf("Error: no valid bmp image at %lx\n", bmp_image);
|
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
return 1;
|
2009-02-06 09:37:53 +00:00
|
|
|
}
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2014-01-22 10:24:13 +00:00
|
|
|
width = get_unaligned_le32(&bmp->header.width);
|
|
|
|
height = get_unaligned_le32(&bmp->header.height);
|
|
|
|
bmp_bpix = get_unaligned_le16(&bmp->header.bit_count);
|
|
|
|
|
2009-02-06 09:37:53 +00:00
|
|
|
colors = 1 << bmp_bpix;
|
2004-10-09 23:25:58 +00:00
|
|
|
|
|
|
|
bpix = NBITS(panel_info.vl_bpix);
|
|
|
|
|
2013-01-12 12:07:56 +00:00
|
|
|
if (bpix != 1 && bpix != 8 && bpix != 16 && bpix != 32) {
|
2009-02-06 09:37:53 +00:00
|
|
|
printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n",
|
|
|
|
bpix, bmp_bpix);
|
2012-05-24 01:42:38 +00:00
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2014-07-15 14:28:46 +00:00
|
|
|
/*
|
|
|
|
* We support displaying 8bpp BMPs on 16bpp LCDs
|
|
|
|
* and displaying 24bpp BMPs on 32bpp LCDs
|
|
|
|
* */
|
|
|
|
if (bpix != bmp_bpix &&
|
|
|
|
!(bmp_bpix == 8 && bpix == 16) &&
|
|
|
|
!(bmp_bpix == 24 && bpix == 32)) {
|
2004-10-09 23:25:58 +00:00
|
|
|
printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n",
|
2014-01-22 10:24:13 +00:00
|
|
|
bpix, get_unaligned_le16(&bmp->header.bit_count));
|
2004-10-09 23:25:58 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
debug("Display-bmp: %d x %d with %d colors\n",
|
2004-10-09 23:25:58 +00:00
|
|
|
(int)width, (int)height, (int)colors);
|
|
|
|
|
2009-02-06 09:37:53 +00:00
|
|
|
if (bmp_bpix == 8) {
|
2012-08-09 00:14:52 +00:00
|
|
|
cmap = configuration_get_cmap();
|
2009-02-06 09:37:53 +00:00
|
|
|
cmap_base = cmap;
|
|
|
|
|
2004-10-09 23:25:58 +00:00
|
|
|
/* Set color map */
|
2012-05-24 01:42:38 +00:00
|
|
|
for (i = 0; i < colors; ++i) {
|
2004-10-09 23:25:58 +00:00
|
|
|
bmp_color_table_entry_t cte = bmp->color_table[i];
|
2008-08-01 08:48:29 +00:00
|
|
|
#if !defined(CONFIG_ATMEL_LCD)
|
2004-10-09 23:25:58 +00:00
|
|
|
ushort colreg =
|
|
|
|
( ((cte.red) << 8) & 0xf800) |
|
2005-09-21 13:24:52 +00:00
|
|
|
( ((cte.green) << 3) & 0x07e0) |
|
|
|
|
( ((cte.blue) >> 3) & 0x001f) ;
|
2004-12-10 11:40:40 +00:00
|
|
|
*cmap = colreg;
|
2009-02-06 09:37:53 +00:00
|
|
|
#if defined(CONFIG_MPC823)
|
2004-12-10 11:40:40 +00:00
|
|
|
cmap--;
|
2009-02-06 09:37:53 +00:00
|
|
|
#else
|
|
|
|
cmap++;
|
2008-08-01 08:48:29 +00:00
|
|
|
#endif
|
|
|
|
#else /* CONFIG_ATMEL_LCD */
|
|
|
|
lcd_setcolreg(i, cte.red, cte.green, cte.blue);
|
2004-10-09 23:25:58 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
2006-08-30 21:09:00 +00:00
|
|
|
|
2013-01-12 12:07:56 +00:00
|
|
|
padded_width = (width & 0x3 ? (width & ~0x3) + 4 : width);
|
2009-07-09 14:07:30 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
2012-08-09 00:14:51 +00:00
|
|
|
splash_align_axis(&x, pwidth, width);
|
|
|
|
splash_align_axis(&y, panel_info.vl_row, height);
|
2009-07-09 14:07:30 +00:00
|
|
|
#endif /* CONFIG_SPLASH_SCREEN_ALIGN */
|
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
if ((x + width) > pwidth)
|
2006-08-30 21:09:00 +00:00
|
|
|
width = pwidth - x;
|
2012-05-24 01:42:38 +00:00
|
|
|
if ((y + height) > panel_info.vl_row)
|
2004-10-09 23:25:58 +00:00
|
|
|
height = panel_info.vl_row - y;
|
|
|
|
|
2014-01-22 10:24:13 +00:00
|
|
|
bmap = (uchar *)bmp + get_unaligned_le32(&bmp->header.data_offset);
|
|
|
|
fb = (uchar *)(lcd_base +
|
2011-01-11 07:29:58 +00:00
|
|
|
(y + height - 1) * lcd_line_length + x * bpix / 8);
|
2009-02-06 09:37:49 +00:00
|
|
|
|
2009-02-06 09:37:53 +00:00
|
|
|
switch (bmp_bpix) {
|
2009-02-06 09:37:49 +00:00
|
|
|
case 1: /* pass through */
|
2014-10-15 10:53:04 +00:00
|
|
|
case 8: {
|
2012-09-28 15:11:16 +00:00
|
|
|
#ifdef CONFIG_LCD_BMP_RLE8
|
2014-01-22 10:24:13 +00:00
|
|
|
u32 compression = get_unaligned_le32(&bmp->header.compression);
|
|
|
|
if (compression == BMP_BI_RLE8) {
|
2012-09-28 15:11:16 +00:00
|
|
|
if (bpix != 16) {
|
|
|
|
/* TODO implement render code for bpix != 16 */
|
|
|
|
printf("Error: only support 16 bpix");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
lcd_display_rle8_bitmap(bmp, cmap_base, fb, x, y);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-02-06 09:37:53 +00:00
|
|
|
if (bpix != 16)
|
|
|
|
byte_width = width;
|
|
|
|
else
|
|
|
|
byte_width = width * 2;
|
|
|
|
|
2009-02-06 09:37:49 +00:00
|
|
|
for (i = 0; i < height; ++i) {
|
|
|
|
WATCHDOG_RESET();
|
2009-02-06 09:37:53 +00:00
|
|
|
for (j = 0; j < width; j++) {
|
|
|
|
if (bpix != 16) {
|
2012-08-09 00:14:53 +00:00
|
|
|
FB_PUT_BYTE(fb, bmap);
|
2009-02-06 09:37:53 +00:00
|
|
|
} else {
|
|
|
|
*(uint16_t *)fb = cmap_base[*(bmap++)];
|
|
|
|
fb += sizeof(uint16_t) / sizeof(*fb);
|
|
|
|
}
|
|
|
|
}
|
2012-09-28 15:11:14 +00:00
|
|
|
bmap += (padded_width - width);
|
2013-01-12 12:07:56 +00:00
|
|
|
fb -= byte_width + lcd_line_length;
|
2009-02-06 09:37:49 +00:00
|
|
|
}
|
|
|
|
break;
|
2014-10-15 10:53:04 +00:00
|
|
|
}
|
2009-02-06 09:37:49 +00:00
|
|
|
#if defined(CONFIG_BMP_16BPP)
|
|
|
|
case 16:
|
|
|
|
for (i = 0; i < height; ++i) {
|
|
|
|
WATCHDOG_RESET();
|
2012-08-09 00:14:53 +00:00
|
|
|
for (j = 0; j < width; j++)
|
|
|
|
fb_put_word(&fb, &bmap);
|
|
|
|
|
2012-09-28 15:11:14 +00:00
|
|
|
bmap += (padded_width - width) * 2;
|
2013-01-12 12:07:56 +00:00
|
|
|
fb -= width * 2 + lcd_line_length;
|
2009-02-06 09:37:49 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif /* CONFIG_BMP_16BPP */
|
2014-07-15 14:28:46 +00:00
|
|
|
#if defined(CONFIG_BMP_24BMP)
|
|
|
|
case 24:
|
|
|
|
for (i = 0; i < height; ++i) {
|
|
|
|
for (j = 0; j < width; j++) {
|
|
|
|
*(fb++) = *(bmap++);
|
|
|
|
*(fb++) = *(bmap++);
|
|
|
|
*(fb++) = *(bmap++);
|
|
|
|
*(fb++) = 0;
|
|
|
|
}
|
|
|
|
fb -= lcd_line_length + width * (bpix / 8);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif /* CONFIG_BMP_24BMP */
|
2012-05-09 19:23:37 +00:00
|
|
|
#if defined(CONFIG_BMP_32BPP)
|
|
|
|
case 32:
|
|
|
|
for (i = 0; i < height; ++i) {
|
|
|
|
for (j = 0; j < width; j++) {
|
|
|
|
*(fb++) = *(bmap++);
|
|
|
|
*(fb++) = *(bmap++);
|
|
|
|
*(fb++) = *(bmap++);
|
|
|
|
*(fb++) = *(bmap++);
|
|
|
|
}
|
2013-01-12 12:07:56 +00:00
|
|
|
fb -= lcd_line_length + width * (bpix / 8);
|
2012-05-09 19:23:37 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif /* CONFIG_BMP_32BPP */
|
2009-02-06 09:37:49 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
};
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-10-30 13:40:18 +00:00
|
|
|
lcd_sync();
|
2012-05-24 01:42:38 +00:00
|
|
|
return 0;
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
2007-07-08 23:10:08 +00:00
|
|
|
#endif
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2012-05-24 01:42:38 +00:00
|
|
|
static void *lcd_logo(void)
|
2004-10-09 23:25:58 +00:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_SPLASH_SCREEN
|
|
|
|
char *s;
|
|
|
|
ulong addr;
|
|
|
|
static int do_splash = 1;
|
|
|
|
|
|
|
|
if (do_splash && (s = getenv("splashimage")) != NULL) {
|
2009-07-09 14:07:30 +00:00
|
|
|
int x = 0, y = 0;
|
2004-10-09 23:25:58 +00:00
|
|
|
do_splash = 0;
|
|
|
|
|
2013-01-30 21:39:57 +00:00
|
|
|
if (splash_screen_prepare())
|
2013-06-17 18:31:29 +00:00
|
|
|
return (void *)lcd_base;
|
2013-01-30 21:39:57 +00:00
|
|
|
|
2009-07-09 14:07:30 +00:00
|
|
|
addr = simple_strtoul (s, NULL, 16);
|
2013-07-01 22:04:05 +00:00
|
|
|
|
|
|
|
splash_get_pos(&x, &y);
|
2009-07-09 14:07:30 +00:00
|
|
|
|
2012-08-09 00:14:50 +00:00
|
|
|
if (bmp_display(addr, x, y) == 0)
|
2012-05-24 01:42:38 +00:00
|
|
|
return (void *)lcd_base;
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
#endif /* CONFIG_SPLASH_SCREEN */
|
|
|
|
|
2012-04-27 04:41:27 +00:00
|
|
|
bitmap_plot(0, 0);
|
2004-10-09 23:25:58 +00:00
|
|
|
|
2008-09-01 14:21:22 +00:00
|
|
|
#ifdef CONFIG_LCD_INFO
|
|
|
|
console_col = LCD_INFO_X / VIDEO_FONT_WIDTH;
|
|
|
|
console_row = LCD_INFO_Y / VIDEO_FONT_HEIGHT;
|
|
|
|
lcd_show_board_info();
|
|
|
|
#endif /* CONFIG_LCD_INFO */
|
2008-05-09 19:57:18 +00:00
|
|
|
|
2005-07-04 00:03:16 +00:00
|
|
|
#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
|
2012-05-24 01:42:38 +00:00
|
|
|
return (void *)((ulong)lcd_base + BMP_LOGO_HEIGHT * lcd_line_length);
|
2004-10-09 23:25:58 +00:00
|
|
|
#else
|
2012-05-24 01:42:38 +00:00
|
|
|
return (void *)lcd_base;
|
2013-01-12 12:07:56 +00:00
|
|
|
#endif /* CONFIG_LCD_LOGO && !defined(CONFIG_LCD_INFO_BELOW_LOGO) */
|
2004-10-09 23:25:58 +00:00
|
|
|
}
|
|
|
|
|
2013-02-24 21:28:43 +00:00
|
|
|
#ifdef CONFIG_SPLASHIMAGE_GUARD
|
|
|
|
static int on_splashimage(const char *name, const char *value, enum env_op op,
|
|
|
|
int flags)
|
|
|
|
{
|
|
|
|
ulong addr;
|
|
|
|
int aligned;
|
|
|
|
|
|
|
|
if (op == env_op_delete)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
addr = simple_strtoul(value, NULL, 16);
|
|
|
|
/* See README.displaying-bmps */
|
|
|
|
aligned = (addr % 4 == 2);
|
|
|
|
if (!aligned) {
|
|
|
|
printf("Invalid splashimage value. Value must be 16 bit aligned, but not 32 bit aligned\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
U_BOOT_ENV_CALLBACK(splashimage, on_splashimage);
|
|
|
|
#endif
|
|
|
|
|
2012-09-28 15:11:13 +00:00
|
|
|
void lcd_position_cursor(unsigned col, unsigned row)
|
|
|
|
{
|
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
2014-11-06 18:03:31 +00:00
|
|
|
console_col = min_t(short, col, CONSOLE_COLS - 1);
|
|
|
|
console_row = min_t(short, row, CONSOLE_ROWS - 1);
|
2012-09-28 15:11:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int lcd_get_pixel_width(void)
|
|
|
|
{
|
|
|
|
return panel_info.vl_col;
|
|
|
|
}
|
|
|
|
|
|
|
|
int lcd_get_pixel_height(void)
|
|
|
|
{
|
|
|
|
return panel_info.vl_row;
|
|
|
|
}
|
|
|
|
|
|
|
|
int lcd_get_screen_rows(void)
|
|
|
|
{
|
|
|
|
return CONSOLE_ROWS;
|
|
|
|
}
|
|
|
|
|
|
|
|
int lcd_get_screen_columns(void)
|
|
|
|
{
|
|
|
|
return CONSOLE_COLS;
|
|
|
|
}
|
2013-05-27 18:31:17 +00:00
|
|
|
|
|
|
|
#if defined(CONFIG_LCD_DT_SIMPLEFB)
|
|
|
|
static int lcd_dt_simplefb_configure_node(void *blob, int off)
|
|
|
|
{
|
|
|
|
#if LCD_BPP == LCD_COLOR16
|
2014-11-19 12:53:27 +00:00
|
|
|
return fdt_setup_simplefb_node(blob, off, gd->fb_base,
|
|
|
|
panel_info.vl_col, panel_info.vl_row,
|
|
|
|
panel_info.vl_col * 2, "r5g6b5");
|
2013-05-27 18:31:17 +00:00
|
|
|
#else
|
2014-11-19 12:53:27 +00:00
|
|
|
return -1;
|
2013-05-27 18:31:17 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
int lcd_dt_simplefb_add_node(void *blob)
|
|
|
|
{
|
2013-06-13 23:13:11 +00:00
|
|
|
static const char compat[] = "simple-framebuffer";
|
|
|
|
static const char disabled[] = "disabled";
|
2013-05-27 18:31:17 +00:00
|
|
|
int off, ret;
|
|
|
|
|
|
|
|
off = fdt_add_subnode(blob, 0, "framebuffer");
|
|
|
|
if (off < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
ret = fdt_setprop(blob, off, "status", disabled, sizeof(disabled));
|
|
|
|
if (ret < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
ret = fdt_setprop(blob, off, "compatible", compat, sizeof(compat));
|
|
|
|
if (ret < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return lcd_dt_simplefb_configure_node(blob, off);
|
|
|
|
}
|
|
|
|
|
|
|
|
int lcd_dt_simplefb_enable_existing_node(void *blob)
|
|
|
|
{
|
|
|
|
int off;
|
|
|
|
|
|
|
|
off = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer");
|
|
|
|
if (off < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return lcd_dt_simplefb_configure_node(blob, off);
|
|
|
|
}
|
|
|
|
#endif
|