projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s3c4510b: move specific code to soc directory
[oweals/u-boot.git]
/
cpu
/
mpc8xx
/
video.c
diff --git
a/cpu/mpc8xx/video.c
b/cpu/mpc8xx/video.c
index ef91165602df3fcad7a1902eef8a7edb74d55484..4a59927436c34ce372aba8bac3e6dd67c91fa128 100644
(file)
--- a/
cpu/mpc8xx/video.c
+++ b/
cpu/mpc8xx/video.c
@@
-33,6
+33,7
@@
#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>
#include <i2c.h>
#include <linux/types.h>
#include <devices.h>
@@
-517,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;
@@
-808,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 */
@@
-856,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;
@@
-1174,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");
@@
-1235,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 */