Convert CONFIG_VIDEO to Kconfig

[people/ms/u-boot.git] / include / configs / MPC8536DS.h

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 03f17f9c35ab90c1417ab04e979a1b48e491844e..3d753adefc9cbff1f8fcbbc2c5628bc25486d2fa 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -11,13 +11,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_DISPLAY_BOARDINFO
 #include "../board/freescale/common/ics307_clk.h"
 
-#ifdef CONFIG_36BIT
-#define CONFIG_PHYS_64BIT      1
-#endif
-
 #ifdef CONFIG_SDCARD
 #define CONFIG_RAMBOOT_SDCARD          1
 #define CONFIG_SYS_TEXT_BASE   0xf8f40000
@@ -508,7 +503,6 @@
 /*#define VIDEO_IO_OFFSET      CONFIG_SYS_PCI1_IO_VIRT*/
 
 /* video */
-#define CONFIG_VIDEO
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
@@ -643,7 +637,6 @@
 #ifdef CONFIG_USB_EHCI
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
-#define CONFIG_USB_STORAGE
 #endif
 #endif
 
@@ -706,7 +699,6 @@
 /* default location for tftp and bootm */
 #define CONFIG_LOADADDR                1000000
 
-#define CONFIG_BOOTDELAY 10    /* -1 disables auto-boot */
 #undef  CONFIG_BOOTARGS                /* the boot command will set bootargs */
 
 #define CONFIG_BAUDRATE        115200
@@ -728,7 +720,7 @@
 "consoledev=ttyS0\0"                           \
 "ramdiskaddr=2000000\0"                        \
 "ramdiskfile=8536ds/ramdisk.uboot\0"           \
-"fdtaddr=c00000\0"                             \
+"fdtaddr=1e00000\0"                            \
 "fdtfile=8536ds/mpc8536ds.dtb\0"               \
 "bdev=sda3\0"                                  \
 "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0"