Merge with /git/u-boot.git

[u-boot] / include / configs / RRvision.h

diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h
index a1327e75aacb1cfb9bfad3d4d552d4faec40eef8..7f2c8a474648d572151f7bdfbfc885d3c13f948b 100644 (file)
--- a/include/configs/RRvision.h
+++ b/include/configs/RRvision.h
@@ -100,13 +100,13 @@
 #define        CONFIG_RTC_MPC8xx               /* use internal RTC of MPC8xx   */
 
 
-#if 1
+#ifndef CONFIG_LCD
 #define CONFIG_VIDEO           1       /* To enable the video initialization */
 
 /* Video related */
 #define CONFIG_VIDEO_LOGO                      1       /* Show the logo */
-#define CONFIG_VIDEO_ENCODER_AD7176            1       /* Enable this encoder */
-#define CONFIG_VIDEO_ENCODER_AD7176_ADDR       0x2A    /* ALSB to ground */
+#define CONFIG_VIDEO_ENCODER_AD7179            1       /* Enable this encoder */
+#define CONFIG_VIDEO_ENCODER_AD7179_ADDR       0x2A    /* ALSB to ground */
 #endif
 
 /* enable I2C and select the hardware/software driver */
@@ -135,7 +135,6 @@
 #endif /* CONFIG_SOFT_I2C */
 
 
-
 #define CONFIG_COMMANDS            ( ( CONFIG_CMD_DFL  | \
                                CFG_CMD_DHCP    | \
                                CFG_CMD_I2C     | \
@@ -345,6 +344,7 @@
  *-----------------------------------------------------------------------
  *
  */
+/*#define      CFG_DER 0x2002000F*/
 #define CFG_DER        0
 
 /*