projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Standardize command usage messages with cmd_usage()
[oweals/u-boot.git]
/
cpu
/
mpc8xx
/
video.c
diff --git
a/cpu/mpc8xx/video.c
b/cpu/mpc8xx/video.c
index ee60477ab8f18753450a25c15860dbd763725665..4a59927436c34ce372aba8bac3e6dd67c91fa128 100644
(file)
--- a/
cpu/mpc8xx/video.c
+++ b/
cpu/mpc8xx/video.c
@@
-33,12
+33,15
@@
#include <common.h>
#include <config.h>
#include <version.h>
#include <common.h>
#include <config.h>
#include <version.h>
+#include <timestamp.h>
#include <i2c.h>
#include <linux/types.h>
#include <devices.h>
#ifdef CONFIG_VIDEO
#include <i2c.h>
#include <linux/types.h>
#include <devices.h>
#ifdef CONFIG_VIDEO
+DECLARE_GLOBAL_DATA_PTR;
+
/************************************************************************/
/* ** DEBUG SETTINGS */
/************************************************************************/
/************************************************************************/
/* ** DEBUG SETTINGS */
/************************************************************************/
@@
-113,9
+116,9
@@
#define VIDEO_BURST_LEN (VIDEO_COLS/8)
#ifdef VIDEO_MODE_YUYV
#define VIDEO_BURST_LEN (VIDEO_COLS/8)
#ifdef VIDEO_MODE_YUYV
-#define VIDEO_BG_COL 0x80D880D8 /* Background color in YUYV format */
+#define VIDEO_BG_COL 0x80D880D8 /* Background color in YUYV format */
#else
#else
-#define VIDEO_BG_COL 0xF8F8F8F8 /* Background color in RGB format */
+#define VIDEO_BG_COL 0xF8F8F8F8 /* Background color in RGB format */
#endif
/************************************************************************/
#endif
/************************************************************************/
@@
-515,7
+518,7
@@
static void inline video_mode_addentry (VRAM * vr,
static int video_mode_generate (void)
{
static int video_mode_generate (void)
{
- immap_t *immap = (immap_t *) C
FG
_IMMR;
+ immap_t *immap = (immap_t *) C
ONFIG_SYS
_IMMR;
VRAM *vr = (VRAM *) (((void *) immap) + 0xb00); /* Pointer to the VRAM table */
int DX, X1, X2, DY, Y1, Y2, entry = 0, fifo;
VRAM *vr = (VRAM *) (((void *) immap) + 0xb00); /* Pointer to the VRAM table */
int DX, X1, X2, DY, Y1, Y2, entry = 0, fifo;
@@
-806,7
+809,7
@@
static void video_encoder_init (void)
/* Initialize the I2C */
debug ("[VIDEO ENCODER] Initializing I2C bus...\n");
/* Initialize the I2C */
debug ("[VIDEO ENCODER] Initializing I2C bus...\n");
- i2c_init (C
FG_I2C_SPEED, CFG
_I2C_SLAVE);
+ i2c_init (C
ONFIG_SYS_I2C_SPEED, CONFIG_SYS
_I2C_SLAVE);
#ifdef CONFIG_FADS
/* Reset ADV7176 chip */
#ifdef CONFIG_FADS
/* Reset ADV7176 chip */
@@
-831,10
+834,10
@@
static void video_encoder_init (void)
puts ("[VIDEO ENCODER] Configuring the encoder...\n");
puts ("[VIDEO ENCODER] Configuring the encoder...\n");
- printf ("Sending %
d bytes (@ %08lX) to I2C 0x%
X:\n ",
+ printf ("Sending %
zu bytes (@ %08lX) to I2C 0x%l
X:\n ",
sizeof(video_encoder_data),
(ulong)video_encoder_data,
sizeof(video_encoder_data),
(ulong)video_encoder_data,
- VIDEO_I2C_ADDR);
+
(ulong)
VIDEO_I2C_ADDR);
for (i=0; i<sizeof(video_encoder_data); ++i) {
printf(" %02X", video_encoder_data[i]);
}
for (i=0; i<sizeof(video_encoder_data); ++i) {
printf(" %02X", video_encoder_data[i]);
}
@@
-854,7
+857,7
@@
static void video_encoder_init (void)
static void video_ctrl_init (void *memptr)
{
static void video_ctrl_init (void *memptr)
{
- immap_t *immap = (immap_t *) C
FG
_IMMR;
+ immap_t *immap = (immap_t *) C
ONFIG_SYS
_IMMR;
video_fb_address = memptr;
video_fb_address = memptr;
@@
-1164,7
+1167,6
@@
static void *video_logo (void)
u16 *screen = video_fb_address, width = VIDEO_COLS;
#ifdef VIDEO_INFO
# ifndef CONFIG_FADS
u16 *screen = video_fb_address, width = VIDEO_COLS;
#ifdef VIDEO_INFO
# ifndef CONFIG_FADS
- DECLARE_GLOBAL_DATA_PTR;
char temp[32];
# endif
char info[80];
char temp[32];
# endif
char info[80];
@@
-1173,7
+1175,8
@@
static void *video_logo (void)
easylogo_plot (VIDEO_LOGO_ADDR, screen, width, 0, 0);
#ifdef VIDEO_INFO
easylogo_plot (VIDEO_LOGO_ADDR, screen, width, 0, 0);
#ifdef VIDEO_INFO
- sprintf (info, "%s (%s - %s) ", U_BOOT_VERSION, __DATE__, __TIME__);
+ sprintf (info, "%s (%s - %s) ",
+ U_BOOT_VERSION, U_BOOT_DATE, U_BOOT_TIME);
video_drawstring (VIDEO_INFO_X, VIDEO_INFO_Y, info);
sprintf (info, "(C) 2002 DENX Software Engineering");
video_drawstring (VIDEO_INFO_X, VIDEO_INFO_Y, info);
sprintf (info, "(C) 2002 DENX Software Engineering");
@@
-1234,13
+1237,13
@@
static int video_init (void *videobase)
video_setpalette (CONSOLE_COLOR_GREY2, 0xF8, 0xF8, 0xF8);
video_setpalette (CONSOLE_COLOR_WHITE, 0xFF, 0xFF, 0xFF);
video_setpalette (CONSOLE_COLOR_GREY2, 0xF8, 0xF8, 0xF8);
video_setpalette (CONSOLE_COLOR_WHITE, 0xFF, 0xFF, 0xFF);
-#ifndef C
FG
_WHITE_ON_BLACK
+#ifndef C
ONFIG_SYS
_WHITE_ON_BLACK
video_setfgcolor (CONSOLE_COLOR_BLACK);
video_setbgcolor (CONSOLE_COLOR_GREY2);
#else
video_setfgcolor (CONSOLE_COLOR_GREY2);
video_setbgcolor (CONSOLE_COLOR_BLACK);
video_setfgcolor (CONSOLE_COLOR_BLACK);
video_setbgcolor (CONSOLE_COLOR_GREY2);
#else
video_setfgcolor (CONSOLE_COLOR_GREY2);
video_setbgcolor (CONSOLE_COLOR_BLACK);
-#endif /* C
FG
_WHITE_ON_BLACK */
+#endif /* C
ONFIG_SYS
_WHITE_ON_BLACK */
#ifdef CONFIG_VIDEO_LOGO
/* Paint the logo and retrieve tv base address */
#ifdef CONFIG_VIDEO_LOGO
/* Paint the logo and retrieve tv base address */
@@
-1282,8
+1285,6
@@
static int video_init (void *videobase)
int drv_video_init (void)
{
int drv_video_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
int error, devices = 1;
device_t videodev;
int error, devices = 1;
device_t videodev;