Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[pandora-u-boot.git] / include / configs / P1022DS.h

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 362abe8..a118975 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -204,6 +204,8 @@
 #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* Video */
+#define CONFIG_FSL_DIU_FB
+
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x10000)
 #define CONFIG_VIDEO
@@ -221,7 +223,7 @@
 #undef CONFIG_SYS_FLASH_EMPTY_INFO
 #endif
 
-#ifndef CONFIG_DIU
+#ifndef CONFIG_FSL_DIU_FB
 #define CONFIG_ATI
 #endif
 
@@ -522,9 +524,7 @@
        "diuregs=md e002c000 1d\0"                                      \
        "dium=mw e002c01c\0"                                            \
        "diuerr=md e002c014 1\0"                                        \
-       "othbootargs=diufb=15M video=fslfb:1280x1024-32@60,monitor=0 tty0\0" \
-       "hwconfig=esdhc;audclk:12\0"                                    \
-       "monitor=0-DVI\0"
+       "hwconfig=esdhc;audclk:12\0"
 
 #define CONFIG_HDBOOT                                  \
        "setenv bootargs root=/dev/$bdev rw "           \